gpuNUFFT 0.7.2__tar.gz → 0.7.3__tar.gz

{gpuNUFFT-0.7.2 → gpuNUFFT-0.7.3}/CUDA/src/gpu/python/gpuNUFFT_operator_python_factory.cpp

@@ -107,6 +107,7 @@ class GpuNUFFTPythonOperator
     gpuNUFFT::GpuNUFFTOperatorFactory factory;
     gpuNUFFT::GpuNUFFTOperator *gpuNUFFTOp;
     int trajectory_length, n_coils, dimension;
+    float osr;
     bool has_sense_data;
     gpuNUFFT::Dimensions imgDims;
     // sensitivity maps
@@ -129,7 +130,7 @@ class GpuNUFFTPythonOperator
     public:
     GpuNUFFTPythonOperator(py::array_t<DType> kspace_loc, py::array_t<int> image_size, int num_coils,
     py::array_t<std::complex<DType>> sense_maps,  py::array_t<DType> density_comp, int kernel_width=3,
-    int sector_width=8, float osr=2, bool balance_workload=1) 
+    int sector_width=8, float osr=2, bool balance_workload=1) : osr(osr)
     {
         // k-space coordinates
         py::buffer_info sample_loc = kspace_loc.request();
@@ -140,12 +141,11 @@ class GpuNUFFTPythonOperator
 
         // density compensation weights
         gpuNUFFT::Array<DType> density_compArray;
-        //if(density_comp.has_value())
-        //{
+        if(density_comp == Py_None)
+        {
             density_compArray = readNumpyArray(density_comp);
             density_compArray.dim.length = trajectory_length;
-            // No need else as the init is by default with 0 length and density comp is not applied
-        //}
+        }
 
         // image size
         py::buffer_info img_dim = image_size.request();
@@ -305,7 +305,6 @@ class GpuNUFFTPythonOperator
         allocate_pinned_memory(&densArray, n_samples * sizeof(CufftType));
         densArray.dim.length = n_samples;
 
-        // TODO: Allocate directly on device and set with kernel.
         for (long int cnt = 0; cnt < n_samples; cnt++)
         {
           densArray.data[cnt].x = 1.0;
@@ -324,7 +323,7 @@ class GpuNUFFTPythonOperator
 
         gpuNUFFT::GpuArray<CufftType> image_gpu;
         image_gpu.dim = imgDims;
-        allocateDeviceMem(&image_gpu.data, imgDims.count());
+        allocateDeviceMem(&image_gpu.data, image_gpu.dim.count());
 
         if (DEBUG && (cudaDeviceSynchronize() != cudaSuccess))
           printf("error at adj thread synchronization a: %s\n",

{gpuNUFFT-0.7.2 → gpuNUFFT-0.7.3}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: gpuNUFFT
-Version: 0.7.2
+Version: 0.7.3
 Summary: gpuNUFFT - An open source GPU Library for 3D Gridding and NUFFT
 License-File: LICENSE

{gpuNUFFT-0.7.2 → gpuNUFFT-0.7.3}/gpuNUFFT.egg-info/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: gpuNUFFT
-Version: 0.7.2
+Version: 0.7.3
 Summary: gpuNUFFT - An open source GPU Library for 3D Gridding and NUFFT
 License-File: LICENSE

{gpuNUFFT-0.7.2 → gpuNUFFT-0.7.3}/setup.py

@@ -103,7 +103,7 @@ class CMakeBuild(build_ext):
 
 setup(
     name="gpuNUFFT",
-    version="0.7.2",
+    version="0.7.3",
     description="gpuNUFFT - An open source GPU Library for 3D Gridding and NUFFT",
     ext_modules=[
         CMakeExtension("gpuNUFFT", sourcedir=os.path.join("CUDA")),

{gpuNUFFT-0.7.2 → gpuNUFFT-0.7.3}/CUDA/src/gpuNUFFT_operator.cpp

@@ -977,8 +977,6 @@ void gpuNUFFT::GpuNUFFTOperator::performForwardGpuNUFFT(
       performSensMul(imdata_d, sens_d, gi_host, false);
     }
 
-    // apodization Correction
-    performForwardDeapodization(imdata_d, deapo_d, gi_host);
 	 if(gpuNUFFTOut == DENSITY_ESTIMATION)
       {
         // convolution and resampling to non-standard trajectory
@@ -1000,6 +998,8 @@ void gpuNUFFT::GpuNUFFTOperator::performForwardGpuNUFFT(
         this->freeDeviceMemory();
         return;
     } 
+    // apodization Correction
+    performForwardDeapodization(imdata_d, deapo_d, gi_host);
     if (DEBUG && (cudaStreamSynchronize(new_stream) != cudaSuccess))
       printf("error at thread synchronization 2: %s\n",
              cudaGetErrorString(cudaGetLastError()));
@@ -1198,8 +1198,6 @@ void gpuNUFFT::GpuNUFFTOperator::performForwardGpuNUFFT(
       performSensMul(imdata_d, sens_d, gi_host, false);
     }
 
-    // apodization Correction
-    performForwardDeapodization(imdata_d, deapo_d, gi_host);
 	  if(gpuNUFFTOut == DENSITY_ESTIMATION)
 	  {
 	      forwardConvolution(data_d, crds_d, imdata_d, NULL, sectors_d,
@@ -1214,6 +1212,8 @@ void gpuNUFFT::GpuNUFFTOperator::performForwardGpuNUFFT(
         this->freeDeviceMemory();
         return;
     }
+    // apodization Correction
+    performForwardDeapodization(imdata_d, deapo_d, gi_host);
     if (DEBUG && (cudaThreadSynchronize() != cudaSuccess))
       printf("error at thread synchronization 2: %s\n",
              cudaGetErrorString(cudaGetLastError()));