From 97c51a439ae7aea36767904f19ffbbfe3dcd2d26 Mon Sep 17 00:00:00 2001
From: Chris Siefert <csiefer@sandia.gov>
Date: Wed, 18 Oct 2023 09:16:42 -0600
Subject: [PATCH] Tpetra: Experimental::HIP* -> HIP* fixes

---
 .../core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.cpp  | 2 +-
 .../core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp  | 2 +-
 packages/tpetra/core/test/Comm/gpuAwareMpi.cpp                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.cpp b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.cpp
index d974f46fff83..057102d8f13f 100644
--- a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.cpp
+++ b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.cpp
@@ -34,7 +34,7 @@ namespace KokkosCompat {
 
 #ifdef KOKKOS_ENABLE_HIP
     template<>
-    std::string KokkosDeviceWrapperNode<Kokkos::HIP, Kokkos::Experimental::HIPSpace>::name() {
+    std::string KokkosDeviceWrapperNode<Kokkos::HIP, Kokkos::HIPSpace>::name() {
       return std::string("HIP/Wrapper");
     }
 #endif // KOKKOS_ENABLE_HIP
diff --git a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp
index 47dfc973260c..d8d146bb3348 100644
--- a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp
+++ b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp
@@ -55,7 +55,7 @@ class KokkosDeviceWrapperNode {
 #endif
 
 #ifdef KOKKOS_ENABLE_HIP
-  typedef KokkosDeviceWrapperNode<::Kokkos::HIP, ::Kokkos::Experimental::HIPSpace> KokkosHIPWrapperNode;
+  typedef KokkosDeviceWrapperNode<::Kokkos::HIP, ::Kokkos::HIPSpace> KokkosHIPWrapperNode;
 #endif
 
 #ifdef KOKKOS_ENABLE_CUDA
diff --git a/packages/tpetra/core/test/Comm/gpuAwareMpi.cpp b/packages/tpetra/core/test/Comm/gpuAwareMpi.cpp
index c6c041aa0b66..ae747e94194c 100644
--- a/packages/tpetra/core/test/Comm/gpuAwareMpi.cpp
+++ b/packages/tpetra/core/test/Comm/gpuAwareMpi.cpp
@@ -78,7 +78,7 @@ namespace { // (anonymous)
   typedef Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace> test_device_type;
   typedef Tpetra::KokkosCompat::KokkosCudaWrapperNode test_node_type;
 #elif defined(KOKKOS_ENABLE_HIP)
-  typedef Kokkos::Device<Kokkos::HIP, Kokkos::Experimental::HIPSpace> test_device_type;
+  typedef Kokkos::Device<Kokkos::HIP, Kokkos::HIPSpace> test_device_type;
   typedef Tpetra::KokkosCompat::KokkosHIPWrapperNode test_node_type;
 #elif defined(KOKKOS_ENABLE_SYCL)
   typedef Kokkos::Device<Kokkos::Experimental::SYCL, Kokkos::Experimental::SYCLSpace> test_device_type;