Move raw_pointer_cast to constructor of Array2D

Author: horizon-blue

genmetaballs/src/cuda/core/utils.cuh

@@ -5,6 +5,8 @@
 #include <cuda/std/mdspan>
 #include <cuda/std/span>
 #include <cuda_runtime.h>
+#include <memory>
+#include <thrust/memory.h>
 
 #define CUDA_CALLABLE __host__ __device__
 
@@ -29,8 +31,9 @@ private:
 
 public:
     // constructor
-    CUDA_CALLABLE constexpr Array2D(T* data_ptr, uint32_t rows, uint32_t cols)
-        : data_view_(data_ptr, rows, cols) {}
+    template <typename Pointer>
+    CUDA_CALLABLE constexpr Array2D(Pointer data_ptr, uint32_t rows, uint32_t cols)
+        : data_view_(thrust::raw_pointer_cast(data_ptr), rows, cols) {}
 
     // getting a 1D view of a specific row
     // this supports array2d[row][col] access pattern and range-based for loops
@@ -54,3 +57,10 @@ public:
         return data_view_.size();
     }
 }; // class Array2D
+
+// Type deduction guide
+// if initialized with (Pointer, int, int), deduce T by looking at what raw_pointer_cast returns
+// so we can write Array2D(array_ptr, rows, cols) instead of Array2D<Type>(array_ptr, rows, cols)
+template <typename Pointer>
+Array2D(Pointer, uint32_t, uint32_t)
+    -> Array2D<typename std::pointer_traits<Pointer>::element_type>;

tests/cpp_tests/test_utils.cu

@@ -121,7 +121,7 @@ TYPED_TEST(Array2DTestFixture, CreateAndAccessArray2D) {
 
     auto data = TypeParam(rows * cols);
     // create 2D view into the underlying data on host or device
-    auto array2d = Array2D(thrust::raw_pointer_cast(data.data()), rows, cols);
+    auto array2d = Array2D(data.data(), rows, cols);
 
     if constexpr (std::is_same_v<TypeParam, std::vector<float>>) {
         for (auto i = 0; i < rows - 1; i++) {
@@ -164,7 +164,7 @@ TYPED_TEST(Array2DTestFixture, ViewModifiesUnderlyingData) {
         uint32_t rows = 3;
         uint32_t cols = 4;
         auto data = TypeParam(rows * cols, 0.0f);
-        auto array2d = Array2D(thrust::raw_pointer_cast(data.data()), rows, cols);
+        auto array2d = Array2D(data.data(), rows, cols);
 
         // Modify through view
         array2d[1][2] = 42.5f;
@@ -184,8 +184,8 @@ TYPED_TEST(Array2DTestFixture, MultipleViewsOfSameData) {
         uint32_t rows = 2;
         uint32_t cols = 3;
         auto data = TypeParam(rows * cols, 0.0f);
-        auto view1 = Array2D(thrust::raw_pointer_cast(data.data()), rows, cols);
-        auto view2 = Array2D(thrust::raw_pointer_cast(data.data()), rows, cols);
+        auto view1 = Array2D(data.data(), rows, cols);
+        auto view2 = Array2D(data.data(), rows, cols);
 
         // Modify through view1
         view1[0][0] = 100.0f;