[Refactor] move popc to under util (#2394)

Authors: - rhdong (https://github.com/rhdong) Approvers: - Corey J. Nolet (https://github.com/cjnolet) - Divye Gala (https://github.com/divyegala) URL: #2394
rapidsai · Jul 25, 2024 · e75bac6 · e75bac6
1 parent 7004a8e
commit e75bac6
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/cpp/bench/prims/CMakeLists.txt b/cpp/bench/prims/CMakeLists.txt
@@ -80,7 +80,14 @@ if(BUILD_PRIMS_BENCH)
     PATH
     core/bitset.cu
     core/copy.cu
-    core/popc.cu
+    main.cpp
+  )
+
+  ConfigureBench(
+    NAME
+    UTIL_BENCH
+    PATH
+    util/popc.cu
     main.cpp
   )
 

diff --git a/cpp/bench/prims/core/popc.cu → cpp/bench/prims/util/popc.cu b/cpp/bench/prims/core/popc.cu → cpp/bench/prims/util/popc.cu
@@ -16,7 +16,7 @@
 
 #include <common/benchmark.hpp>
 
-#include <raft/core/popc.hpp>
+#include <raft/util/popc.cuh>
 
 namespace raft::bench::core {
 

diff --git a/cpp/include/raft/core/bitset.cuh b/cpp/include/raft/core/bitset.cuh
@@ -19,12 +19,12 @@
 #include <raft/core/bitset.hpp>
 #include <raft/core/device_container_policy.hpp>
 #include <raft/core/device_mdarray.hpp>
-#include <raft/core/popc.hpp>
 #include <raft/core/resource/thrust_policy.hpp>
 #include <raft/core/resources.hpp>
 #include <raft/linalg/map.cuh>
 #include <raft/linalg/reduce.cuh>
 #include <raft/util/device_atomics.cuh>
+#include <raft/util/popc.cuh>
 
 #include <thrust/for_each.h>
 

diff --git a/cpp/include/raft/sparse/linalg/detail/masked_matmul.cuh b/cpp/include/raft/sparse/linalg/detail/masked_matmul.cuh
@@ -16,7 +16,6 @@
 #pragma once
 
 #include <raft/core/bitmap.cuh>
-#include <raft/core/detail/popc.cuh>
 #include <raft/core/device_csr_matrix.hpp>
 #include <raft/core/device_mdarray.hpp>
 #include <raft/core/device_mdspan.hpp>

diff --git a/cpp/include/raft/core/detail/popc.cuh → cpp/include/raft/util/detail/popc.cuh b/cpp/include/raft/core/detail/popc.cuh → cpp/include/raft/util/detail/popc.cuh
diff --git a/cpp/include/raft/core/popc.hpp → cpp/include/raft/util/popc.cuh b/cpp/include/raft/core/popc.hpp → cpp/include/raft/util/popc.cuh
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <raft/core/detail/popc.cuh>
+#include <raft/util/detail/popc.cuh>
 namespace raft {
 
 /**

diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt
@@ -122,7 +122,6 @@ if(BUILD_TESTS)
     core/math_host.cpp
     core/operators_device.cu
     core/operators_host.cpp
-    core/popc.cu
     core/handle.cpp
     core/interruptible.cu
     core/nvtx.cpp
@@ -509,6 +508,7 @@ if(BUILD_TESTS)
     util/integer_utils.cpp
     util/integer_utils.cu
     util/memory_type_dispatcher.cu
+    util/popc.cu
     util/pow2_utils.cu
     util/reduction.cu
   )

diff --git a/cpp/test/core/popc.cu → cpp/test/util/popc.cu b/cpp/test/core/popc.cu → cpp/test/util/popc.cu
@@ -19,10 +19,10 @@
 #include <raft/core/device_mdarray.hpp>
 #include <raft/core/device_mdspan.hpp>
 #include <raft/core/host_mdspan.hpp>
-#include <raft/core/popc.hpp>
 #include <raft/core/resource/cuda_stream.hpp>
 #include <raft/core/resources.hpp>
 #include <raft/util/cuda_utils.cuh>
+#include <raft/util/popc.cuh>
 
 #include <gtest/gtest.h>