From b608e5e682014e7074ada793d37c316f85f6b623 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 25 Nov 2014 18:26:11 +0100 Subject: Remove unused files --- cuda/2d/dataop.cu | 130 ------------------------------------------------------ cuda/2d/dataop.h | 47 -------------------- 2 files changed, 177 deletions(-) delete mode 100644 cuda/2d/dataop.cu delete mode 100644 cuda/2d/dataop.h (limited to 'cuda') diff --git a/cuda/2d/dataop.cu b/cuda/2d/dataop.cu deleted file mode 100644 index 9dc193e..0000000 --- a/cuda/2d/dataop.cu +++ /dev/null @@ -1,130 +0,0 @@ -/* ------------------------------------------------------------------------ -Copyright 2012 iMinds-Vision Lab, University of Antwerp - -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be - - -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). - -The ASTRA Toolbox is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -The ASTRA Toolbox is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with the ASTRA Toolbox. If not, see . - ------------------------------------------------------------------------ -$Id$ -*/ - -#include "util.h" -#include "dataop.h" -#include "arith.h" -#include - -namespace astraCUDA { - -void operationVolumeMult(float* data1, float* data2, unsigned int width, unsigned int height) -{ - float* D_data1; - float* D_data2; - - unsigned int pitch; - allocateVolume(D_data1, width, height, pitch); - copyVolumeToDevice(data1, width, width, height, D_data1, pitch); - - allocateVolume(D_data2, width, height, pitch); - copyVolumeToDevice(data2, width, width, height, D_data2, pitch); - - processVol(D_data1, D_data2, pitch, width, height); - - copyVolumeFromDevice(data1, width, width, height, D_data1, pitch); - - cudaFree(D_data1); - cudaFree(D_data2); -} - -void operationVolumeMultScalarMask(float* data, float* mask, float scalar, unsigned int width, unsigned int height) -{ - float* D_data; - float* D_mask; - - unsigned int pitch; - allocateVolume(D_data, width, height, pitch); - copyVolumeToDevice(data, width, width, height, D_data, pitch); - - allocateVolume(D_mask, width, height, pitch); - copyVolumeToDevice(mask, width, width, height, D_mask, pitch); - - processVol(D_data, D_mask, scalar, pitch, width, height); - - copyVolumeFromDevice(data, width, width, height, D_data, pitch); - - cudaFree(D_data); - cudaFree(D_mask); -} - - -void operationVolumeMultScalar(float* data, float scalar, unsigned int width, unsigned int height) -{ - float* D_data; - - unsigned int pitch; - allocateVolume(D_data, width, height, pitch); - copyVolumeToDevice(data, width, width, height, D_data, pitch); - - processVol(D_data, scalar, pitch, width, height); - - copyVolumeFromDevice(data, width, width, height, D_data, pitch); - - cudaFree(D_data); -} - - -void operationVolumeAdd(float* data1, float* data2, unsigned int width, unsigned int height) -{ - float* D_data1; - float* D_data2; - - unsigned int pitch; - allocateVolume(D_data1, width, height, pitch); - copyVolumeToDevice(data1, width, width, height, D_data1, pitch); - - allocateVolume(D_data2, width, height, pitch); - copyVolumeToDevice(data2, width, width, height, D_data2, pitch); - - processVol(D_data1, D_data2, pitch, width, height); - - copyVolumeFromDevice(data1, width, width, height, D_data1, pitch); - - cudaFree(D_data1); - cudaFree(D_data2); -} - - -void operationVolumeAddScalar(float* data, float scalar, unsigned int width, unsigned int height) -{ - float* D_data; - - unsigned int pitch; - allocateVolume(D_data, width, height, pitch); - copyVolumeToDevice(data, width, width, height, D_data, pitch); - - processVol(D_data, scalar, pitch, width, height); - - copyVolumeFromDevice(data, width, width, height, D_data, pitch); - - cudaFree(D_data); -} - - -} diff --git a/cuda/2d/dataop.h b/cuda/2d/dataop.h deleted file mode 100644 index 3e9c7e2..0000000 --- a/cuda/2d/dataop.h +++ /dev/null @@ -1,47 +0,0 @@ -/* ------------------------------------------------------------------------ -Copyright 2012 iMinds-Vision Lab, University of Antwerp - -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be - - -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). - -The ASTRA Toolbox is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -The ASTRA Toolbox is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with the ASTRA Toolbox. If not, see . - ------------------------------------------------------------------------ -$Id$ -*/ - -#ifndef _CUDA_DATAOP_H -#define _CUDA_DATAOP_H - -#include - -namespace astraCUDA { - - void operationVolumeMult(float* data1, float* data2, unsigned int width, unsigned int height); - - void operationVolumeMultScalar(float* data, float scalar, unsigned int width, unsigned int height); - void operationVolumeMultScalarMask(float* data, float* mask, float scalar, unsigned int width, unsigned int height); - - void operationVolumeAdd(float* data1, float* data2, unsigned int width, unsigned int height); - - void operationVolumeAddScalar(float* data, float scalar, unsigned int width, unsigned int height); - -} - -#endif -- cgit v1.2.3