Protect HIP and CUDA sketching kernels with namespaces.

ORNL · Mar 11, 2024 · f952e0a · f952e0a
1 parent 9738a16
commit f952e0a
Show file tree

Hide file tree

Showing 10 changed files with 587 additions and 573 deletions.
diff --git a/resolve/cuda/cudaSketchingKernels.cu b/resolve/cuda/cudaSketchingKernels.cu
diff --git a/resolve/cuda/cudaSketchingKernels.h b/resolve/cuda/cudaSketchingKernels.h
@@ -11,26 +11,28 @@
 
 #include <resolve/Common.hpp>
 
-namespace ReSolve {
+namespace ReSolve
+{
+  namespace cuda
+  {
+    // needed for rand solver
+    void  count_sketch_theta(index_type n,
+                            index_type k,
+                            const index_type* labels,
+                            const index_type* flip,
+                            const real_type* input,
+                            real_type* output);
 
-  // needed for rand solver
-  void  count_sketch_theta(index_type n,
-                           index_type k,
-                           const index_type* labels,
-                           const index_type* flip,
-                           const real_type* input,
-                           real_type* output);
+    void FWHT_select(index_type k,
+                    const index_type* perm,
+                    const real_type* input,
+                    real_type* output);
 
-  void FWHT_select(index_type k,
-                   const index_type* perm,
-                   const real_type* input,
-                   real_type* output);
-
-  void FWHT_scaleByD(index_type n,
-                     const index_type* D,
-                     const real_type* x,
-                     real_type* y);
-
-  void FWHT(index_type M, index_type log2N, real_type* d_Data); 
+    void FWHT_scaleByD(index_type n,
+                      const index_type* D,
+                      const real_type* x,
+                      real_type* y);
 
+    void FWHT(index_type M, index_type log2N, real_type* d_Data); 
+  }
 } // namespace ReSolve
diff --git a/resolve/cuda/cudaVectorKernels.cu b/resolve/cuda/cudaVectorKernels.cu
@@ -12,9 +12,10 @@
 #include <resolve/cuda/cudaVectorKernels.h>
 
 
-namespace ReSolve {
-
-  namespace kernels {
+namespace ReSolve
+{
+  namespace kernels
+  {
 
     /**
      * @brief CUDA kernel that sets values of an array to a constant.
@@ -44,5 +45,4 @@ namespace ReSolve {
     num_blocks = (n + block_size - 1) / block_size;
     kernels::set_const<<<num_blocks, block_size>>>(n, val, arr);
   }
-
 } // namespace ReSolve
diff --git a/resolve/hip/hipSketchingKernels.h b/resolve/hip/hipSketchingKernels.h
@@ -12,25 +12,28 @@
 
 #include <resolve/Common.hpp>
 
-namespace ReSolve {
-  // needed for rand solver
-  void  count_sketch_theta(index_type n,
-                           index_type k,
-                           index_type* labels,
-                           index_type* flip,
-                           real_type* input,
-                           real_type* output);
+namespace ReSolve
+{
+  namespace hip
+  {
+    // needed for rand solver
+    void  count_sketch_theta(index_type n,
+                            index_type k,
+                            index_type* labels,
+                            index_type* flip,
+                            real_type* input,
+                            real_type* output);
 
-  void FWHT_select(index_type k,
-                   index_type* perm,
-                   real_type* input,
-                   real_type* output);
+    void FWHT_select(index_type k,
+                    index_type* perm,
+                    real_type* input,
+                    real_type* output);
 
-  void FWHT_scaleByD(index_type n,
-                     index_type* D,
-                     real_type* x,
-                     real_type* y);
-
-  void FWHT(index_type M, index_type log2N, real_type* d_Data); 
+    void FWHT_scaleByD(index_type n,
+                      index_type* D,
+                      real_type* x,
+                      real_type* y);
 
+    void FWHT(index_type M, index_type log2N, real_type* d_Data); 
+  } // namespace hip
 } // namespace ReSolve