diff --git a/packages/tpetra/core/src/Tpetra_Details_Random.cpp b/packages/tpetra/core/src/Tpetra_Details_Random.cpp index 63f794165cb2..a07ecaa42554 100644 --- a/packages/tpetra/core/src/Tpetra_Details_Random.cpp +++ b/packages/tpetra/core/src/Tpetra_Details_Random.cpp @@ -83,7 +83,7 @@ void finalize_hip_pool() { #endif // KOKKOS_ENABLE_HIP #ifdef KOKKOS_ENABLE_SYCL -Kokkos::Random_XorShift64_Pool * sycl_pool_=nullptr; +Kokkos::Random_XorShift64_Pool * sycl_pool_=nullptr; void finalize_sycl_pool() { if(sycl_pool_ != nullptr) { @@ -183,9 +183,9 @@ getPool() { /********************************************************************************/ #ifdef KOKKOS_ENABLE_SYCL void -Static_Random_XorShift64_Pool:: +Static_Random_XorShift64_Pool:: resetPool(int mpi_rank) { - using pool_type = Kokkos::Random_XorShift64_Pool; + using pool_type = Kokkos::Random_XorShift64_Pool; if(isSet()) delete sycl_pool_; @@ -196,13 +196,13 @@ resetPool(int mpi_rank) { } bool -Static_Random_XorShift64_Pool:: +Static_Random_XorShift64_Pool:: isSet() { return sycl_pool_!=nullptr; } -Kokkos::Random_XorShift64_Pool & -Static_Random_XorShift64_Pool:: +Kokkos::Random_XorShift64_Pool & +Static_Random_XorShift64_Pool:: getPool() { TEUCHOS_TEST_FOR_EXCEPTION(!isSet(),std::runtime_error,"Tpetra::Details::Static_Random_XorShift64_Pool: resetPool() must be called before getPool"); return *sycl_pool_; diff --git a/packages/tpetra/core/src/Tpetra_Details_Random.hpp b/packages/tpetra/core/src/Tpetra_Details_Random.hpp index 7c55c6260a6f..e15237221fe3 100644 --- a/packages/tpetra/core/src/Tpetra_Details_Random.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_Random.hpp @@ -86,11 +86,11 @@ class Static_Random_XorShift64_Pool #ifdef KOKKOS_ENABLE_SYCL template<> -class Static_Random_XorShift64_Pool { +class Static_Random_XorShift64_Pool { public: static void resetPool(int mpi_rank); static bool isSet(); - static Kokkos::Random_XorShift64_Pool & getPool(); + static Kokkos::Random_XorShift64_Pool & getPool(); }; #endif // KOKKOS_ENABLE_SYCL diff --git a/packages/tpetra/core/src/Tpetra_Import_Util2.hpp b/packages/tpetra/core/src/Tpetra_Import_Util2.hpp index ceaceca6e90b..c59ece298128 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util2.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util2.hpp @@ -1054,7 +1054,6 @@ lowCommunicationMakeColMapAndReindexKokkos (const Teuchos::ArrayView