Merge pull request #1658 from lucbv/kokkos_deprecate_ALL_t

Kokkos moves ALL_t out of Impl namespace
kokkos · Jan 31, 2023 · 78833d6 · 78833d6
2 parents dade970 + d2f273c
commit 78833d6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -72,6 +72,7 @@ jobs:
           -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
           -DKokkos_ENABLE_DEBUG_BOUNDS_CHECK:BOOL=${{ matrix.debug_bounds_check }} \
           -DKokkos_ENABLE_DEPRECATED_CODE_3=OFF \
+          -DKokkos_ENABLE_DEPRECATED_CODE_4=OFF \
           -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
           -DCMAKE_INSTALL_PREFIX=$PWD/../install \
           ..

diff --git a/batched/KokkosBatched_Util.hpp b/batched/KokkosBatched_Util.hpp
@@ -627,8 +627,7 @@ KOKKOS_INLINE_FUNCTION auto subview_wrapper(ViewType v, IdxType1 i1,
 }
 template <class ViewType, class IdxType1>
 KOKKOS_INLINE_FUNCTION auto subview_wrapper(ViewType v, IdxType1 i1,
-                                            Kokkos::Impl::ALL_t i2,
-                                            Kokkos::Impl::ALL_t i3,
+                                            Kokkos::ALL_t i2, Kokkos::ALL_t i3,
                                             const BatchLayout::Left &layout_tag,
                                             const Trans::Transpose) {
   auto sv_nt = subview_wrapper(v, i1, i3, i2, layout_tag);
@@ -660,7 +659,7 @@ KOKKOS_INLINE_FUNCTION auto subview_wrapper(
 }
 template <class ViewType, class IdxType1>
 KOKKOS_INLINE_FUNCTION auto subview_wrapper(
-    ViewType v, IdxType1 i1, Kokkos::Impl::ALL_t i2, Kokkos::Impl::ALL_t i3,
+    ViewType v, IdxType1 i1, Kokkos::ALL_t i2, Kokkos::ALL_t i3,
     const BatchLayout::Right &layout_tag, const Trans::Transpose &) {
   auto sv_nt = subview_wrapper(v, i1, i3, i2, layout_tag);
 

diff --git a/perf_test/Benchmark_Context.hpp b/perf_test/Benchmark_Context.hpp
@@ -17,7 +17,7 @@
 */
 
 #ifndef KOKKOSKERNELS_PERFTEST_BENCHMARK_CONTEXT_HPP
-#define KOKKOSKENERLS_PERFTEST_BENCHMARK_CONTEXT_HPP
+#define KOKKOSKERNELS_PERFTEST_BENCHMARK_CONTEXT_HPP
 
 #include <string>