From 33772c8dfd34c5a9461acdeb85fa07bf0904f274 Mon Sep 17 00:00:00 2001 From: Nicolas Morales Date: Mon, 30 Oct 2023 10:44:41 -0700 Subject: [PATCH] replace uses of KokkosEx::submdspan with Kokkos::submdspan --- benchmarks/fill.hpp | 2 +- benchmarks/sum/sum_submdspan_right.cpp | 6 +++--- comp_bench/cbench_submdspan.cpp.erb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/benchmarks/fill.hpp b/benchmarks/fill.hpp index cefa0602..cc79fa70 100644 --- a/benchmarks/fill.hpp +++ b/benchmarks/fill.hpp @@ -77,7 +77,7 @@ void _do_fill_random( ) { for(SizeT i = 0; i < s.extent(0); ++i) { - _do_fill_random(KokkosEx::submdspan(s, i, _repeated_with(Kokkos::full_extent)...), gen, dist); + _do_fill_random(Kokkos::submdspan(s, i, _repeated_with(Kokkos::full_extent)...), gen, dist); } } diff --git a/benchmarks/sum/sum_submdspan_right.cpp b/benchmarks/sum/sum_submdspan_right.cpp index e21a89da..684da2a4 100644 --- a/benchmarks/sum/sum_submdspan_right.cpp +++ b/benchmarks/sum/sum_submdspan_right.cpp @@ -49,9 +49,9 @@ void BM_MDSpan_Sum_Subspan_3D_right(benchmark::State& state, MDSpan, DynSizes... value_type sum = 0; using index_type = typename MDSpan::index_type; for(index_type i = 0; i < s.extent(0); ++i) { - auto sub_i = KokkosEx::submdspan(s, i, Kokkos::full_extent, Kokkos::full_extent); + auto sub_i = Kokkos::submdspan(s, i, Kokkos::full_extent, Kokkos::full_extent); for (index_type j = 0; j < s.extent(1); ++j) { - auto sub_i_j = KokkosEx::submdspan(sub_i, j, Kokkos::full_extent); + auto sub_i_j = Kokkos::submdspan(sub_i, j, Kokkos::full_extent); for (index_type k = 0; k < s.extent(2); ++k) { sum += sub_i_j(k); } @@ -134,7 +134,7 @@ _MDSPAN_CONSTEXPR_14 void _do_sum_submdspan( ) { for(index_type i = 0; i < s.extent(0); ++i) { - _impl::_do_sum_submdspan(sum, KokkosEx::submdspan( + _impl::_do_sum_submdspan(sum, Kokkos::submdspan( s, i, _repeated_with(Kokkos::full_extent)...) ); } diff --git a/comp_bench/cbench_submdspan.cpp.erb b/comp_bench/cbench_submdspan.cpp.erb index b81d9409..1f789dad 100644 --- a/comp_bench/cbench_submdspan.cpp.erb +++ b/comp_bench/cbench_submdspan.cpp.erb @@ -15,7 +15,7 @@ int test(int* data) { > >(data); <% n.times do |i| %> - auto <%= "sub#{i+1}_#{k}" %> = KokkosEx::submdspan( + auto <%= "sub#{i+1}_#{k}" %> = Kokkos::submdspan( <%= "sub#{i}_#{k}" %>, 1 <%= ", Kokkos::full_extent" * (n - i - 1) %>