Adapt interface to KMM 0.3

NLeSC-COMPAS · Nov 27, 2024 · c4bcb8f · c4bcb8f
1 parent 27254cc
commit c4bcb8f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/include/compas/core/view.h b/include/compas/core/view.h
@@ -18,18 +18,18 @@ template<typename T, size_t N = 1>
 using host_view_mut = kmm::view_mut<T, N>;
 
 template<typename T, size_t N = 1>
-using cuda_view = kmm::cuda_view<T, N>;
+using gpu_view = kmm::gpu_view<T, N>;
 
 template<typename T, size_t N = 1>
-using cuda_view_mut = kmm::cuda_view_mut<T, N>;
+using gpu_view_mut = kmm::gpu_view_mut<T, N>;
 
 template<typename T, size_t N = 1>
-using cuda_subview_mut = kmm::cuda_subview_mut<T, N>;
+using gpu_subview_mut = kmm::gpu_subview_mut<T, N>;
 
 template<typename T, size_t N = 1>
-using cuda_strided_view = kmm::cuda_strided_view<T, N>;
+using gpu_strided_view = kmm::gpu_strided_view<T, N>;
 
 template<typename T, size_t N = 1>
-using cuda_strided_view_mut = kmm::cuda_strided_view_mut<T, N>;
+using gpu_strided_view_mut = kmm::gpu_strided_view_mut<T, N>;
 
 }  // namespace compas
diff --git a/include/compas/parameters/tissue_view.cuh b/include/compas/parameters/tissue_view.cuh
@@ -39,7 +39,7 @@ struct TissueVoxel {
  * Device-side representation of `TissueParameters`
  */
 struct TissueParametersView {
-    cuda_view<float, 2> parameters;
+    gpu_view<float, 2> parameters;
     int nvoxels;
     bool has_z;
     bool has_b0;

diff --git a/include/compas/sequences/fisp_view.h b/include/compas/sequences/fisp_view.h
@@ -7,11 +7,11 @@ namespace compas {
 struct FISPSequenceView {
     // Vector with flip angle for each TR with abs.(RF_train) the RF flip angles in degrees and
     // angle.(RF_train) should be the RF phases in degrees.
-    cuda_view<cfloat> RF_train;
+    gpu_view<cfloat> RF_train;
 
     // Matrix with RF scaling factors (a.u.) to simulate slice profile effects.
     // Each column represents the (flip angle dependent) scaling factors for one position along the slice direction.
-    cuda_view<cfloat, 2> sliceprofiles;
+    gpu_view<cfloat, 2> sliceprofiles;
 
     // Repetition time in seconds, assumed constant during the sequence
     float TR;

diff --git a/include/compas/sequences/pssfp_view.h b/include/compas/sequences/pssfp_view.h
@@ -16,19 +16,19 @@ struct pSSFPSequenceView {
 
     // Vector with flip angle for each TR with abs.(RF_train) the RF flip angles in degrees and
     // angle.(RF_train) should be the RF phases in degrees.
-    cuda_view<cfloat> RF_train;
+    gpu_view<cfloat> RF_train;
 
     // Repetition time in seconds, assumed constant during the sequence
     float TR;
 
     // Time-discretized RF waveform, normalized to flip angle of 1 degree
-    cuda_view<cfloat> gamma_dt_RF;
+    gpu_view<cfloat> gamma_dt_RF;
 
     // Time intervals
     RepetitionData dt;  // Δt
     RepetitionData gamma_dt_GRz;  // γΔtGRz
 
     // Vector with different positions along the slice direction.
-    cuda_view<float> z;
+    gpu_view<float> z;
 };
 }  // namespace compas
diff --git a/include/compas/simulate/fisp.h b/include/compas/simulate/fisp.h
@@ -21,7 +21,7 @@ Array<cfloat, 2> simulate_magnetization(
 
 void simulate_magnetization_kernel(
     const kmm::DeviceContext& context,
-    cuda_view_mut<cfloat, 2> echos,
+    gpu_view_mut<cfloat, 2> echos,
     TissueParametersView parameters,
     FISPSequenceView sequence);
 

diff --git a/include/compas/simulate/pssfp.h b/include/compas/simulate/pssfp.h
@@ -21,7 +21,7 @@ Array<cfloat, 2> simulate_magnetization(
 
 void simulate_magnetization_kernel(
     const kmm::DeviceContext& context,
-    cuda_view_mut<cfloat, 2> echos,
+    gpu_view_mut<cfloat, 2> echos,
     TissueParametersView parameters,
     pSSFPSequenceView sequence);
 }  // namespace compas
diff --git a/include/compas/trajectories/cartesian_view.cuh b/include/compas/trajectories/cartesian_view.cuh
@@ -39,7 +39,7 @@ struct CartesianTrajectoryView {
     int nreadouts;
     int samples_per_readout;
     float delta_t;
-    cuda_view<cfloat> k_start;
+    gpu_view<cfloat> k_start;
     cfloat delta_k;
 
     /**

diff --git a/include/compas/trajectories/spiral_view.cuh b/include/compas/trajectories/spiral_view.cuh
@@ -11,8 +11,8 @@ struct SpiralTrajectoryView {
     int nreadouts;
     int samples_per_readout;
     float delta_t;
-    cuda_view<cfloat> k_start;
-    cuda_view<cfloat> delta_k;
+    gpu_view<cfloat> k_start;
+    gpu_view<cfloat> delta_k;
 
     COMPAS_DEVICE
     cfloat to_sample_point_factor(index_t readout_idx, cfloat m, TissueVoxel p) const {