diff options
| author | Willem Jan Palenstijn <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:46 +0000 |
|---|---|---|
| committer | wpalenst <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:46 +0000 |
| commit | e0b3ad8e57f269e34085ba319aa399ee3476811a (patch) | |
| tree | e34426606814f3df61f4e590c76d17e808925a37 /cuda/2d/cgls.cu | |
| parent | c72bc7cd47ecb5665a287fb88e101f88118f5232 (diff) | |
| download | astra-e0b3ad8e57f269e34085ba319aa399ee3476811a.tar.gz astra-e0b3ad8e57f269e34085ba319aa399ee3476811a.tar.bz2 astra-e0b3ad8e57f269e34085ba319aa399ee3476811a.tar.xz astra-e0b3ad8e57f269e34085ba319aa399ee3476811a.zip | |
Replace direct cudaMemcpy2D calls by utility functions
Diffstat (limited to 'cuda/2d/cgls.cu')
| -rw-r--r-- | cuda/2d/cgls.cu | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu index fce8beb..066ac5d 100644 --- a/cuda/2d/cgls.cu +++ b/cuda/2d/cgls.cu @@ -120,12 +120,12 @@ bool CGLS::iterate(unsigned int iterations) if (!sliceInitialized) { // copy sinogram - cudaMemcpy2D(D_r, sizeof(float)*rPitch, D_sinoData, sizeof(float)*sinoPitch, sizeof(float)*(dims.iProjDets), dims.iProjAngles, cudaMemcpyDeviceToDevice); + duplicateProjectionData(D_r, D_sinoData, sinoPitch, dims); // r = sino - A*x if (useVolumeMask) { // Use z as temporary storage here since it is unused - cudaMemcpy2D(D_z, sizeof(float)*zPitch, D_volumeData, sizeof(float)*volumePitch, sizeof(float)*(dims.iVolWidth), dims.iVolHeight, cudaMemcpyDeviceToDevice); + duplicateVolumeData(D_z, D_volumeData, volumePitch, dims); processVol<opMul>(D_z, D_maskData, zPitch, dims); callFP(D_z, zPitch, D_r, rPitch, -1.0f); } else { @@ -189,11 +189,11 @@ float CGLS::computeDiffNorm() // used outside of iterations. // copy sinogram to w - cudaMemcpy2D(D_w, sizeof(float)*wPitch, D_sinoData, sizeof(float)*sinoPitch, sizeof(float)*(dims.iProjDets), dims.iProjAngles, cudaMemcpyDeviceToDevice); + duplicateProjectionData(D_w, D_sinoData, sinoPitch, dims); // do FP, subtracting projection from sinogram if (useVolumeMask) { - cudaMemcpy2D(D_z, sizeof(float)*zPitch, D_volumeData, sizeof(float)*volumePitch, sizeof(float)*(dims.iVolWidth), dims.iVolHeight, cudaMemcpyDeviceToDevice); + duplicateVolumeData(D_z, D_volumeData, volumePitch, dims); processVol<opMul>(D_z, D_maskData, zPitch, dims); callFP(D_z, zPitch, D_w, wPitch, -1.0f); } else { |