diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/CompositeGeometryManager.cpp | 4 | ||||
-rw-r--r-- | src/CudaBackProjectionAlgorithm.cpp | 2 | ||||
-rw-r--r-- | src/CudaBackProjectionAlgorithm3D.cpp | 2 | ||||
-rw-r--r-- | src/CudaCglsAlgorithm.cpp | 2 | ||||
-rw-r--r-- | src/CudaCglsAlgorithm3D.cpp | 2 | ||||
-rw-r--r-- | src/CudaDartMaskAlgorithm.cpp | 6 | ||||
-rw-r--r-- | src/CudaDartMaskAlgorithm3D.cpp | 4 | ||||
-rw-r--r-- | src/CudaDartSmoothingAlgorithm.cpp | 6 | ||||
-rw-r--r-- | src/CudaDartSmoothingAlgorithm3D.cpp | 4 | ||||
-rw-r--r-- | src/CudaDataOperationAlgorithm.cpp | 8 | ||||
-rw-r--r-- | src/CudaEMAlgorithm.cpp | 2 | ||||
-rw-r--r-- | src/CudaFDKAlgorithm3D.cpp | 6 | ||||
-rw-r--r-- | src/CudaFilteredBackProjectionAlgorithm.cpp | 4 | ||||
-rw-r--r-- | src/CudaForwardProjectionAlgorithm.cpp | 2 | ||||
-rw-r--r-- | src/CudaForwardProjectionAlgorithm3D.cpp | 2 | ||||
-rw-r--r-- | src/CudaReconstructionAlgorithm2D.cpp | 2 | ||||
-rw-r--r-- | src/CudaRoiSelectAlgorithm.cpp | 6 | ||||
-rw-r--r-- | src/CudaSartAlgorithm.cpp | 2 | ||||
-rw-r--r-- | src/CudaSirtAlgorithm.cpp | 2 | ||||
-rw-r--r-- | src/CudaSirtAlgorithm3D.cpp | 2 | ||||
-rw-r--r-- | src/Float32Data3D.cpp | 2 | ||||
-rw-r--r-- | src/Globals.cpp | 2 |
22 files changed, 37 insertions, 37 deletions
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp index 0d536e6..8a4ce41 100644 --- a/src/CompositeGeometryManager.cpp +++ b/src/CompositeGeometryManager.cpp @@ -43,8 +43,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Float32VolumeData3DGPU.h" #include "astra/Logging.h" -#include "../cuda/2d/astra.h" -#include "../cuda/3d/mem3d.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/3d/mem3d.h" #include <cstring> #include <sstream> diff --git a/src/CudaBackProjectionAlgorithm.cpp b/src/CudaBackProjectionAlgorithm.cpp index 09a356a..c8d56f3 100644 --- a/src/CudaBackProjectionAlgorithm.cpp +++ b/src/CudaBackProjectionAlgorithm.cpp @@ -29,7 +29,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaBackProjectionAlgorithm.h" -#include "../cuda/2d/astra.h" +#include "astra/cuda/2d/astra.h" using namespace std; diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp index bfe0bcd..3fa19a1 100644 --- a/src/CudaBackProjectionAlgorithm3D.cpp +++ b/src/CudaBackProjectionAlgorithm3D.cpp @@ -38,7 +38,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Logging.h" -#include "../cuda/3d/astra3d.h" +#include "astra/cuda/3d/astra3d.h" using namespace std; diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp index ec96991..bc60325 100644 --- a/src/CudaCglsAlgorithm.cpp +++ b/src/CudaCglsAlgorithm.cpp @@ -29,7 +29,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaCglsAlgorithm.h" -#include "../cuda/2d/cgls.h" +#include "astra/cuda/2d/cgls.h" using namespace std; diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp index 2ebc8a3..686c5b1 100644 --- a/src/CudaCglsAlgorithm3D.cpp +++ b/src/CudaCglsAlgorithm3D.cpp @@ -36,7 +36,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Logging.h" -#include "../cuda/3d/astra3d.h" +#include "astra/cuda/3d/astra3d.h" using namespace std; diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp index 5f9f67d..3c5519c 100644 --- a/src/CudaDartMaskAlgorithm.cpp +++ b/src/CudaDartMaskAlgorithm.cpp @@ -29,9 +29,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaDartMaskAlgorithm.h" -#include "../cuda/2d/astra.h" -#include "../cuda/2d/darthelper.h" -#include "../cuda/2d/algo.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/2d/darthelper.h" +#include "astra/cuda/2d/algo.h" #include "astra/AstraObjectManager.h" diff --git a/src/CudaDartMaskAlgorithm3D.cpp b/src/CudaDartMaskAlgorithm3D.cpp index 2703981..7d9aed2 100644 --- a/src/CudaDartMaskAlgorithm3D.cpp +++ b/src/CudaDartMaskAlgorithm3D.cpp @@ -29,8 +29,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaDartMaskAlgorithm3D.h" -#include "../cuda/3d/darthelper3d.h" -#include "../cuda/3d/dims3d.h" +#include "astra/cuda/3d/darthelper3d.h" +#include "astra/cuda/3d/dims3d.h" #include "astra/AstraObjectManager.h" diff --git a/src/CudaDartSmoothingAlgorithm.cpp b/src/CudaDartSmoothingAlgorithm.cpp index e3d569d..437680a 100644 --- a/src/CudaDartSmoothingAlgorithm.cpp +++ b/src/CudaDartSmoothingAlgorithm.cpp @@ -29,9 +29,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaDartSmoothingAlgorithm.h" -#include "../cuda/2d/astra.h" -#include "../cuda/2d/darthelper.h" -#include "../cuda/2d/algo.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/2d/darthelper.h" +#include "astra/cuda/2d/algo.h" #include "astra/AstraObjectManager.h" diff --git a/src/CudaDartSmoothingAlgorithm3D.cpp b/src/CudaDartSmoothingAlgorithm3D.cpp index 26a379c..5903d3c 100644 --- a/src/CudaDartSmoothingAlgorithm3D.cpp +++ b/src/CudaDartSmoothingAlgorithm3D.cpp @@ -29,8 +29,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaDartSmoothingAlgorithm3D.h" -#include "../cuda/3d/darthelper3d.h" -#include "../cuda/3d/dims3d.h" +#include "astra/cuda/3d/darthelper3d.h" +#include "astra/cuda/3d/dims3d.h" #include "astra/AstraObjectManager.h" diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp index 34c8a78..c48eedb 100644 --- a/src/CudaDataOperationAlgorithm.cpp +++ b/src/CudaDataOperationAlgorithm.cpp @@ -29,10 +29,10 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaDataOperationAlgorithm.h" -#include "../cuda/2d/algo.h" -#include "../cuda/2d/darthelper.h" -#include "../cuda/2d/astra.h" -#include "../cuda/2d/arith.h" +#include "astra/cuda/2d/algo.h" +#include "astra/cuda/2d/darthelper.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/2d/arith.h" #include "astra/AstraObjectManager.h" diff --git a/src/CudaEMAlgorithm.cpp b/src/CudaEMAlgorithm.cpp index 43a1eb4..94e05a0 100644 --- a/src/CudaEMAlgorithm.cpp +++ b/src/CudaEMAlgorithm.cpp @@ -29,7 +29,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaEMAlgorithm.h" -#include "../cuda/2d/em.h" +#include "astra/cuda/2d/em.h" using namespace std; diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp index 6690401..4d8fc5a 100644 --- a/src/CudaFDKAlgorithm3D.cpp +++ b/src/CudaFDKAlgorithm3D.cpp @@ -36,9 +36,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Logging.h" -#include "../cuda/3d/astra3d.h" -#include "../cuda/2d/fft.h" -#include "../cuda/3d/util3d.h" +#include "astra/cuda/3d/astra3d.h" +#include "astra/cuda/2d/fft.h" +#include "astra/cuda/3d/util3d.h" using namespace std; using namespace astraCUDA3d; diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp index af9d55a..944f165 100644 --- a/src/CudaFilteredBackProjectionAlgorithm.cpp +++ b/src/CudaFilteredBackProjectionAlgorithm.cpp @@ -31,8 +31,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/AstraObjectManager.h" #include "astra/CudaProjector2D.h" -#include "../cuda/2d/astra.h" -#include "../cuda/2d/fbp.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/2d/fbp.h" #include "astra/Logging.h" diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp index d1f6e96..5fb58a3 100644 --- a/src/CudaForwardProjectionAlgorithm.cpp +++ b/src/CudaForwardProjectionAlgorithm.cpp @@ -29,7 +29,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #ifdef ASTRA_CUDA -#include "../cuda/2d/astra.h" +#include "astra/cuda/2d/astra.h" #include <driver_types.h> #include <cuda_runtime_api.h> diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp index 63b56f8..c70291e 100644 --- a/src/CudaForwardProjectionAlgorithm3D.cpp +++ b/src/CudaForwardProjectionAlgorithm3D.cpp @@ -41,7 +41,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Logging.h" -#include "../cuda/3d/astra3d.h" +#include "astra/cuda/3d/astra3d.h" using namespace std; diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp index e7e2ee1..cf7cb6a 100644 --- a/src/CudaReconstructionAlgorithm2D.cpp +++ b/src/CudaReconstructionAlgorithm2D.cpp @@ -36,7 +36,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Logging.h" -#include "../cuda/2d/algo.h" +#include "astra/cuda/2d/algo.h" #include <ctime> diff --git a/src/CudaRoiSelectAlgorithm.cpp b/src/CudaRoiSelectAlgorithm.cpp index 9a92e10..cccbbe7 100644 --- a/src/CudaRoiSelectAlgorithm.cpp +++ b/src/CudaRoiSelectAlgorithm.cpp @@ -29,9 +29,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaRoiSelectAlgorithm.h" -#include "../cuda/2d/astra.h" -#include "../cuda/2d/darthelper.h" -#include "../cuda/2d/algo.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/2d/darthelper.h" +#include "astra/cuda/2d/algo.h" #include "astra/AstraObjectManager.h" diff --git a/src/CudaSartAlgorithm.cpp b/src/CudaSartAlgorithm.cpp index fea987e..7c7ecc0 100644 --- a/src/CudaSartAlgorithm.cpp +++ b/src/CudaSartAlgorithm.cpp @@ -29,7 +29,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaSartAlgorithm.h" -#include "../cuda/2d/sart.h" +#include "astra/cuda/2d/sart.h" using namespace std; diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp index 3699d55..ae1b13d 100644 --- a/src/CudaSirtAlgorithm.cpp +++ b/src/CudaSirtAlgorithm.cpp @@ -31,7 +31,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/AstraObjectManager.h" -#include "../cuda/2d/sirt.h" +#include "astra/cuda/2d/sirt.h" using namespace std; diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp index b34b1e1..2483704 100644 --- a/src/CudaSirtAlgorithm3D.cpp +++ b/src/CudaSirtAlgorithm3D.cpp @@ -37,7 +37,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Logging.h" -#include "../cuda/3d/astra3d.h" +#include "astra/cuda/3d/astra3d.h" using namespace std; diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp index da053a3..078673d 100644 --- a/src/Float32Data3D.cpp +++ b/src/Float32Data3D.cpp @@ -29,7 +29,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include <sstream> #ifdef ASTRA_CUDA -#include "../../cuda/3d/mem3d.h" +#include "astra/cuda/3d/mem3d.h" #endif using namespace std; diff --git a/src/Globals.cpp b/src/Globals.cpp index a04cc62..b983e3c 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -26,7 +26,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. */ #include "astra/Globals.h" -#include "../../cuda/2d/astra.h" +#include "astra/cuda/2d/astra.h" namespace astra { |