Rename DeviceType -> MemoryLocation due to changes in Array2D

Author: horizon-blue

genmetaballs/src/cuda/core/camera.cuh

@@ -20,12 +20,12 @@ struct Intrinsics {
 
     // Returns a 2D array of ray directions in camera frame in the specified pixel range
     // and store them in the provided buffer. By default, the full image is used
-    template <DeviceType device>
-    CUDA_CALLABLE Array2D<Vec3D, device>& get_ray_directions(Array2D<Vec3D, device> buffer,
-                                                             uint32_t px_start = 0,
-                                                             uint32_t px_end = UINT32_MAX,
-                                                             uint32_t py_start = 0,
-                                                             uint32_t py_end = UINT32_MAX) const {
+    template <MemoryLocation location>
+    CUDA_CALLABLE Array2D<Vec3D, location>& get_ray_directions(Array2D<Vec3D, location> buffer,
+                                                               uint32_t px_start = 0,
+                                                               uint32_t px_end = UINT32_MAX,
+                                                               uint32_t py_start = 0,
+                                                               uint32_t py_end = UINT32_MAX) const {
         for (auto i = max(0, px_start); i < min(height, px_end); ++i) {
             for (auto j = max(0, py_start); j < min(width, py_end); ++j) {
                 buffer[i][j] = get_ray_direction(j, i);

tests/cpp_tests/test_camera.cu

@@ -14,7 +14,7 @@ namespace test_camera_gpu {
 // CUDA kernel to call get_ray_directions on device with multiple threads
 // Each thread processes one row of the image
 __global__ void get_ray_directions_kernel(Intrinsics intrinsics,
-                                          Array2D<Vec3D, DeviceType::GPU> ray_buffer) {
+                                          Array2D<Vec3D, MemoryLocation::DEVICE> ray_buffer) {
     uint32_t row_start = threadIdx.x * 2;
     uint32_t row_end = max(row_start + 2, intrinsics.height);
     uint32_t col_start = threadIdx.y * 2;
@@ -31,7 +31,8 @@ TEST(CameraTest, GetRayDirectionsDevice) {
 
     // Create Array2D buffer on device
     thrust::device_vector<Vec3D> data(intrinsics.height * intrinsics.width);
-    Array2D<Vec3D, DeviceType::GPU> ray_buffer(data.data(), intrinsics.height, intrinsics.width);
+    Array2D<Vec3D, MemoryLocation::DEVICE> ray_buffer(data.data(), intrinsics.height,
+                                                      intrinsics.width);
 
     // Launch kernel with multiple threads -- divide into 2x2 tiles
     test_camera_gpu::