Move Kokkos_SYCL_Scan.hpp

nliber · Jul 27, 2023 · d47f9ec · d47f9ec
1 parent 7ec0abe
commit d47f9ec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/core/src/SYCL/Kokkos_SYCL_Parallel_Scan.hpp → ...c/SYCL/Kokkos_SYCL_ParallelScan_Range.hpp b/core/src/SYCL/Kokkos_SYCL_Parallel_Scan.hpp → ...c/SYCL/Kokkos_SYCL_ParallelScan_Range.hpp
@@ -14,16 +14,14 @@
 //
 //@HEADER
 
-#ifndef KOKKO_SYCL_PARALLEL_SCAN_HPP
-#define KOKKO_SYCL_PARALLEL_SCAN_HPP
+#ifndef KOKKO_SYCL_PARALLEL_SCAN_RANGE_HPP
+#define KOKKO_SYCL_PARALLEL_SCAN_RANGE_HPP
 
 #include <Kokkos_Macros.hpp>
 #include <memory>
 #include <vector>
-#if defined(KOKKOS_ENABLE_SYCL)
 
-namespace Kokkos {
-namespace Impl {
+namespace Kokkos::Impl {
 
 // Perform a scan over a workgroup.
 // At the end of this function, the subgroup scans are stored in the local array
@@ -358,9 +356,11 @@ class ParallelScanSYCLBase {
                                  ->m_mutexScratchSpace) {}
 };
 
+}  // namespace Kokkos::Impl
+
 template <class FunctorType, class... Traits>
-class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
-                   Kokkos::Experimental::SYCL>
+class Kokkos::Impl::ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                                 Kokkos::Experimental::SYCL>
     : private ParallelScanSYCLBase<FunctorType, void, Traits...> {
  public:
   using Base = ParallelScanSYCLBase<FunctorType, void, Traits...>;
@@ -377,8 +377,9 @@ class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
 //----------------------------------------------------------------------------
 
 template <class FunctorType, class ReturnType, class... Traits>
-class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
-                            ReturnType, Kokkos::Experimental::SYCL>
+class Kokkos::Impl::ParallelScanWithTotal<
+    FunctorType, Kokkos::RangePolicy<Traits...>, ReturnType,
+    Kokkos::Experimental::SYCL>
     : public ParallelScanSYCLBase<FunctorType, ReturnType, Traits...> {
  public:
   using Base = ParallelScanSYCLBase<FunctorType, ReturnType, Traits...>;
@@ -408,9 +409,4 @@ class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
         m_exec(arg_policy.space()) {}
 };
 
-}  // namespace Impl
-}  // namespace Kokkos
-
-#endif
-
 #endif
diff --git a/core/src/decl/Kokkos_Declare_SYCL.hpp b/core/src/decl/Kokkos_Declare_SYCL.hpp
@@ -27,7 +27,7 @@
 #include <SYCL/Kokkos_SYCL_ParallelFor_MDRange.hpp>
 #include <SYCL/Kokkos_SYCL_ParallelReduce_Range.hpp>
 #include <SYCL/Kokkos_SYCL_ParallelReduce_MDRange.hpp>
-#include <SYCL/Kokkos_SYCL_Parallel_Scan.hpp>
+#include <SYCL/Kokkos_SYCL_ParallelScan_Range.hpp>
 #include <SYCL/Kokkos_SYCL_Parallel_Team.hpp>
 #include <SYCL/Kokkos_SYCL_UniqueToken.hpp>
 #include <SYCL/Kokkos_SYCL_ZeroMemset.hpp>