From 11be16b616294dfd3d29e9d27fd1ba98fee48b7a Mon Sep 17 00:00:00 2001
From: Luc Berger-Vergiat <lberge@sandia.gov>
Date: Mon, 30 Jan 2023 17:26:41 -0700
Subject: [PATCH 1/4] Fixing deprecated usage of Kokkos::Impl::ALL_t in favore
 of Kokkos::ALL_t

---
 batched/KokkosBatched_Util.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/batched/KokkosBatched_Util.hpp b/batched/KokkosBatched_Util.hpp
index 3e97c97d72..c848d7acda 100644
--- a/batched/KokkosBatched_Util.hpp
+++ b/batched/KokkosBatched_Util.hpp
@@ -612,8 +612,8 @@ 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);
@@ -645,7 +645,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);
 

From 215c6beb0ab75613405db9d2da21714a2392d52b Mon Sep 17 00:00:00 2001
From: Luc Berger-Vergiat <lberge@sandia.gov>
Date: Mon, 30 Jan 2023 17:27:21 -0700
Subject: [PATCH 2/4] Benchmarks: for some reason the current version fails to
 build

I suspect an invisible character was added on the modified line
by the author's text editor... In any case this version now
compiles fine.
---
 perf_test/Benchmark_Context.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perf_test/Benchmark_Context.hpp b/perf_test/Benchmark_Context.hpp
index 8e356841de..4bd02321dd 100644
--- a/perf_test/Benchmark_Context.hpp
+++ b/perf_test/Benchmark_Context.hpp
@@ -43,7 +43,7 @@
 */
 
 #ifndef KOKKOSKERNELS_PERFTEST_BENCHMARK_CONTEXT_HPP
-#define KOKKOSKENERLS_PERFTEST_BENCHMARK_CONTEXT_HPP
+#define KOKKOSKERNELS_PERFTEST_BENCHMARK_CONTEXT_HPP
 
 #include <string>
 

From 6c5744fd6ae3e4fbb89a6b515b8a9ee7ff8071e9 Mon Sep 17 00:00:00 2001
From: Luc Berger-Vergiat <lberge@sandia.gov>
Date: Mon, 30 Jan 2023 17:30:26 -0700
Subject: [PATCH 3/4] Applying clang-format

---
 batched/KokkosBatched_Util.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/batched/KokkosBatched_Util.hpp b/batched/KokkosBatched_Util.hpp
index c848d7acda..35125cdd98 100644
--- a/batched/KokkosBatched_Util.hpp
+++ b/batched/KokkosBatched_Util.hpp
@@ -612,8 +612,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::ALL_t i2,
-                                            Kokkos::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);

From d2f273c02b9f3dfd93ccb09c25768449641d51e1 Mon Sep 17 00:00:00 2001
From: Luc Berger-Vergiat <lberge@sandia.gov>
Date: Tue, 31 Jan 2023 08:47:59 -0700
Subject: [PATCH 4/4] osx-ci: adding option to disable deprecated_code_4 in
 Kokkos

This will eliminate some of the build warning that we currently
see in our CI builds of Kokkos Core.
---
 .github/workflows/osx.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index f8b014587b..d1504158c9 100644
--- 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 \
           ..