cuda_device_id → gpu_device_id

Author: janden

include/cufinufft_opts.h

@@ -21,8 +21,8 @@ typedef struct cufinufft_opts {   // see cufinufft_default_opts() for defaults
 
 	int gpu_spreadinterponly; // 0: NUFFT, 1: spread or interpolation only
 
-        /* multi-gpu support */
-        int cuda_device_id;
+	/* multi-gpu support */
+	int gpu_device_id;
 } cufinufft_opts;
 
 #endif

python/cufinufft/_cufinufft.py

@@ -89,7 +89,7 @@ def _get_NufftOpts():
         ('gpu_nstreams', c_int),
         ('gpu_kerevalmeth', c_int),
         ('gpu_spreadinterponly', c_int),
-        ('cuda_device_id', c_int)]
+        ('gpu_device_id', c_int)]
     return fields
 
 

src/cufinufft.cu

@@ -106,7 +106,7 @@ int CUFINUFFT_MAKEPLAN(int type, int dim, int *nmodes, int iflag,
             // 0 by default
             cudaSetDevice(0);
         } else {
-            cudaSetDevice(opts->cuda_device_id);
+            cudaSetDevice(opts->gpu_device_id);
         }
 
 	cudaEvent_t start, stop;
@@ -307,7 +307,7 @@ int CUFINUFFT_SETPTS(int M, FLT* d_kx, FLT* d_ky, FLT* d_kz, int N, FLT *d_s,
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 
 	int nf1 = d_plan->nf1;
@@ -456,7 +456,7 @@ int CUFINUFFT_EXECUTE(CUCPX* d_c, CUCPX* d_fk, CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 	int ier;
 	int type=d_plan->type;
@@ -507,7 +507,7 @@ int CUFINUFFT_DESTROY(CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 	cudaEvent_t start, stop;
 	cudaEventCreate(&start);
@@ -631,7 +631,7 @@ int CUFINUFFT_DEFAULT_OPTS(int type, int dim, cufinufft_opts *opts)
 	}
 
         // By default, only use device 0
-        opts->cuda_device_id = 0;
+        opts->gpu_device_id = 0;
 
 	return 0;
 }

src/memtransfer_wrapper.cu

@@ -15,7 +15,7 @@ int ALLOCGPUMEM2D_PLAN(CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 	int nf1 = d_plan->nf1;
 	int nf2 = d_plan->nf2;
@@ -101,7 +101,7 @@ int ALLOCGPUMEM2D_NUPTS(CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 	int M = d_plan->M;
 	//int maxbatchsize = d_plan->maxbatchsize;
@@ -139,7 +139,7 @@ void FREEGPUMEMORY2D(CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 	if(!d_plan->opts.gpu_spreadinterponly){
 		checkCudaErrors(cudaFree(d_plan->fw));
@@ -212,7 +212,7 @@ int ALLOCGPUMEM3D_PLAN(CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 	//int ms = d_plan->ms;
 	//int mt = d_plan->mt;
@@ -308,7 +308,7 @@ int ALLOCGPUMEM3D_NUPTS(CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 	int M = d_plan->M;
 	// int maxbatchsize = d_plan->maxbatchsize;
@@ -350,7 +350,7 @@ void FREEGPUMEMORY3D(CUFINUFFT_PLAN d_plan)
 */
 {
         // Mult-GPU support: set the CUDA Device ID:
-        cudaSetDevice(d_plan->opts.cuda_device_id);
+        cudaSetDevice(d_plan->opts.gpu_device_id);
 
 
 	if(!d_plan->opts.gpu_spreadinterponly){