diff options
89 files changed, 252 insertions, 252 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 77e89e7..1627a2e 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -57,7 +57,7 @@ BOOSTUTF_LIBS=@LIBS_BOOSTUTF@ ifeq ($(cuda),yes) CPPFLAGS += @CPPFLAGS_CUDA@ -DASTRA_CUDA -NVCCFLAGS += @NVCCFLAGS_EXTRA@ @CPPFLAGS_CUDA@ -I$(srcdir)/../.. -I$(srcdir)/../../include -DASTRA_CUDA +NVCCFLAGS += @NVCCFLAGS_EXTRA@ @CPPFLAGS_CUDA@ -I$(srcdir)/../../include -DASTRA_CUDA LDFLAGS += @LDFLAGS_CUDA@ LIBS += -lcudart -lcufft NVCC = @NVCC@ @@ -91,7 +91,7 @@ endif # This is below where PYCPPFLAGS copies CPPFLAGS. The python code is built # from a different directory, so these relative includes would be wrong. -CPPFLAGS+=-I$(srcdir)/../.. -I$(srcdir)/../../include -I$(srcdir)/../../lib/include +CPPFLAGS+=-I$(srcdir)/../../include -I$(srcdir)/../../lib/include ifeq ($(matlab),yes) MEXFLAGS = -cxx diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu index 02790f0..f809c23 100644 --- a/cuda/2d/algo.cu +++ b/cuda/2d/algo.cu @@ -25,16 +25,16 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cassert> +#include "astra/cuda/2d/algo.h" +#include "astra/cuda/2d/par_fp.h" +#include "astra/cuda/2d/fan_fp.h" +#include "astra/cuda/2d/par_bp.h" +#include "astra/cuda/2d/fan_bp.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" +#include "astra/cuda/2d/astra.h" -#include "algo.h" -#include "par_fp.h" -#include "fan_fp.h" -#include "par_bp.h" -#include "fan_bp.h" -#include "util.h" -#include "arith.h" -#include "astra.h" +#include <cassert> namespace astraCUDA { diff --git a/cuda/2d/arith.cu b/cuda/2d/arith.cu index 0ff4aa0..62eb8c2 100644 --- a/cuda/2d/arith.cu +++ b/cuda/2d/arith.cu @@ -25,8 +25,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" + #include <cassert> namespace astraCUDA { diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu index 2ee469c..ec03517 100644 --- a/cuda/2d/astra.cu +++ b/cuda/2d/astra.cu @@ -25,33 +25,31 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/par_fp.h" +#include "astra/cuda/2d/fan_fp.h" +#include "astra/cuda/2d/par_bp.h" +#include "astra/cuda/2d/fan_bp.h" +#include "astra/cuda/2d/arith.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/2d/fft.h" -#include "util.h" -#include "par_fp.h" -#include "fan_fp.h" -#include "par_bp.h" -#include "fan_bp.h" -#include "arith.h" -#include "astra.h" +// For fan beam FBP weighting +#include "astra/cuda/3d/fdk.h" -#include "fft.h" +#include "astra/GeometryUtil2D.h" +#include "astra/VolumeGeometry2D.h" +#include "astra/ParallelProjectionGeometry2D.h" +#include "astra/ParallelVecProjectionGeometry2D.h" +#include "astra/FanFlatProjectionGeometry2D.h" +#include "astra/FanFlatVecProjectionGeometry2D.h" +#include "astra/Logging.h" +#include <cstdio> +#include <cassert> #include <fstream> -#include <cuda.h> - -#include "../../include/astra/GeometryUtil2D.h" -#include "../../include/astra/VolumeGeometry2D.h" -#include "../../include/astra/ParallelProjectionGeometry2D.h" -#include "../../include/astra/ParallelVecProjectionGeometry2D.h" -#include "../../include/astra/FanFlatProjectionGeometry2D.h" -#include "../../include/astra/FanFlatVecProjectionGeometry2D.h" - -#include "../../include/astra/Logging.h" -// For fan beam FBP weighting -#include "../3d/fdk.h" +#include <cuda.h> using namespace astraCUDA; using namespace std; diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu index f9fd6c1..696a0c1 100644 --- a/cuda/2d/cgls.cu +++ b/cuda/2d/cgls.cu @@ -25,17 +25,17 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> - -#include "cgls.h" -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/cgls.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" #ifdef STANDALONE #include "testutil.h" #endif +#include <cstdio> +#include <cassert> + namespace astraCUDA { CGLS::CGLS() : ReconAlgo() diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu index 4041d79..b466840 100644 --- a/cuda/2d/darthelper.cu +++ b/cuda/2d/darthelper.cu @@ -25,8 +25,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include "util.h" -#include "darthelper.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/darthelper.h" + #include <cassert> namespace astraCUDA { diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu index cf67f9b..ca09d31 100644 --- a/cuda/2d/em.cu +++ b/cuda/2d/em.cu @@ -25,17 +25,17 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> - -#include "em.h" -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/em.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" #ifdef STANDALONE #include "testutil.h" #endif +#include <cstdio> +#include <cassert> + namespace astraCUDA { diff --git a/cuda/2d/fan_bp.cu b/cuda/2d/fan_bp.cu index 793b5f4..dac3ac2 100644 --- a/cuda/2d/fan_bp.cu +++ b/cuda/2d/fan_bp.cu @@ -25,18 +25,16 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> -#include <iostream> - -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" #ifdef STANDALONE #include "testutil.h" #endif -#define PIXELTRACE +#include <cstdio> +#include <cassert> +#include <iostream> typedef texture<float, 2, cudaReadModeElementType> texture2D; diff --git a/cuda/2d/fan_fp.cu b/cuda/2d/fan_fp.cu index f08a681..3479650 100644 --- a/cuda/2d/fan_fp.cu +++ b/cuda/2d/fan_fp.cu @@ -25,18 +25,18 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> -#include <iostream> -#include <list> - -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" #ifdef STANDALONE #include "testutil.h" #endif +#include <cstdio> +#include <cassert> +#include <iostream> +#include <list> + typedef texture<float, 2, cudaReadModeElementType> texture2D; diff --git a/cuda/2d/fbp.cu b/cuda/2d/fbp.cu index ecaf544..48fb7dc 100644 --- a/cuda/2d/fbp.cu +++ b/cuda/2d/fbp.cu @@ -25,14 +25,14 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include "fbp.h" -#include "fft.h" -#include "par_bp.h" -#include "fan_bp.h" -#include "util.h" +#include "astra/cuda/2d/fbp.h" +#include "astra/cuda/2d/fft.h" +#include "astra/cuda/2d/par_bp.h" +#include "astra/cuda/2d/fan_bp.h" +#include "astra/cuda/2d/util.h" // For fan-beam preweighting -#include "../3d/fdk.h" +#include "astra/cuda/3d/fdk.h" #include "astra/Logging.h" diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu index a1b1b93..bd8cab5 100644 --- a/cuda/2d/fft.cu +++ b/cuda/2d/fft.cu @@ -25,16 +25,18 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include "fft.h" -#include "util.h" +#include "astra/cuda/2d/fft.h" +#include "astra/cuda/2d/util.h" + +#include "astra/Logging.h" +#include "astra/Fourier.h" -#include <cufft.h> #include <iostream> -#include <cuda.h> #include <fstream> -#include "../../include/astra/Logging.h" -#include "../../include/astra/Fourier.h" +#include <cufft.h> +#include <cuda.h> + using namespace astra; diff --git a/cuda/2d/par_bp.cu b/cuda/2d/par_bp.cu index a894f3f..09a6554 100644 --- a/cuda/2d/par_bp.cu +++ b/cuda/2d/par_bp.cu @@ -25,18 +25,16 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> -#include <iostream> - -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" #ifdef STANDALONE #include "testutil.h" #endif -#define PIXELTRACE +#include <cstdio> +#include <cassert> +#include <iostream> typedef texture<float, 2, cudaReadModeElementType> texture2D; diff --git a/cuda/2d/par_fp.cu b/cuda/2d/par_fp.cu index 427a4e8..0835301 100644 --- a/cuda/2d/par_fp.cu +++ b/cuda/2d/par_fp.cu @@ -25,21 +25,18 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> -#include <iostream> -#include <list> -#include <cmath> - -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" #ifdef STANDALONE #include "testutil.h" #endif -#define PIXELTRACE - +#include <cstdio> +#include <cassert> +#include <iostream> +#include <list> +#include <cmath> typedef texture<float, 2, cudaReadModeElementType> texture2D; diff --git a/cuda/2d/sart.cu b/cuda/2d/sart.cu index 8b6f50e..cf9babc 100644 --- a/cuda/2d/sart.cu +++ b/cuda/2d/sart.cu @@ -25,17 +25,17 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/2d/sart.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" +#include "astra/cuda/2d/fan_fp.h" +#include "astra/cuda/2d/fan_bp.h" +#include "astra/cuda/2d/par_fp.h" +#include "astra/cuda/2d/par_bp.h" + #include <cstdio> #include <cassert> -#include "sart.h" -#include "util.h" -#include "arith.h" -#include "fan_fp.h" -#include "fan_bp.h" -#include "par_fp.h" -#include "par_bp.h" - namespace astraCUDA { // FIXME: Remove these functions. (Outdated) diff --git a/cuda/2d/sirt.cu b/cuda/2d/sirt.cu index faba7a7..7ec377c 100644 --- a/cuda/2d/sirt.cu +++ b/cuda/2d/sirt.cu @@ -25,17 +25,17 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> - -#include "sirt.h" -#include "util.h" -#include "arith.h" +#include "astra/cuda/2d/sirt.h" +#include "astra/cuda/2d/util.h" +#include "astra/cuda/2d/arith.h" #ifdef STANDALONE #include "testutil.h" #endif +#include <cstdio> +#include <cassert> + namespace astraCUDA { SIRT::SIRT() : ReconAlgo() diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu index dfc5de9..533b86c 100644 --- a/cuda/2d/util.cu +++ b/cuda/2d/util.cu @@ -25,11 +25,12 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/2d/util.h" + +#include "astra/Logging.h" + #include <cstdio> #include <cassert> -#include "util.h" - -#include "../../include/astra/Logging.h" namespace astraCUDA { diff --git a/cuda/3d/algo3d.cu b/cuda/3d/algo3d.cu index ee7a23b..b4a435b 100644 --- a/cuda/3d/algo3d.cu +++ b/cuda/3d/algo3d.cu @@ -25,13 +25,13 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cassert> +#include "astra/cuda/3d/algo3d.h" +#include "astra/cuda/3d/cone_fp.h" +#include "astra/cuda/3d/cone_bp.h" +#include "astra/cuda/3d/par3d_fp.h" +#include "astra/cuda/3d/par3d_bp.h" -#include "algo3d.h" -#include "cone_fp.h" -#include "cone_bp.h" -#include "par3d_fp.h" -#include "par3d_bp.h" +#include <cassert> namespace astraCUDA3d { diff --git a/cuda/3d/arith3d.cu b/cuda/3d/arith3d.cu index 05b94ce..2f4054e 100644 --- a/cuda/3d/arith3d.cu +++ b/cuda/3d/arith3d.cu @@ -25,8 +25,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include "util3d.h" -#include "arith3d.h" +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/arith3d.h" + #include <cassert> namespace astraCUDA3d { diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu index c0f4c4a..23af36a 100644 --- a/cuda/3d/astra3d.cu +++ b/cuda/3d/astra3d.cu @@ -25,19 +25,16 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> - -#include "cgls3d.h" -#include "sirt3d.h" -#include "util3d.h" -#include "cone_fp.h" -#include "cone_bp.h" -#include "par3d_fp.h" -#include "par3d_bp.h" -#include "fdk.h" -#include "arith3d.h" -#include "astra3d.h" +#include "astra/cuda/3d/cgls3d.h" +#include "astra/cuda/3d/sirt3d.h" +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/cone_fp.h" +#include "astra/cuda/3d/cone_bp.h" +#include "astra/cuda/3d/par3d_fp.h" +#include "astra/cuda/3d/par3d_bp.h" +#include "astra/cuda/3d/fdk.h" +#include "astra/cuda/3d/arith3d.h" +#include "astra/cuda/3d/astra3d.h" #include "astra/ParallelProjectionGeometry3D.h" #include "astra/ParallelVecProjectionGeometry3D.h" @@ -46,6 +43,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/VolumeGeometry3D.h" #include <iostream> +#include <cstdio> +#include <cassert> using namespace astraCUDA3d; diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu index 7e31749..0df10f0 100644 --- a/cuda/3d/cgls3d.cu +++ b/cuda/3d/cgls3d.cu @@ -25,14 +25,14 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/3d/cgls3d.h" +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/arith3d.h" +#include "astra/cuda/3d/cone_fp.h" + #include <cstdio> #include <cassert> -#include "cgls3d.h" -#include "util3d.h" -#include "arith3d.h" -#include "cone_fp.h" - #ifdef STANDALONE #include "testutil.h" #endif diff --git a/cuda/3d/cone_bp.cu b/cuda/3d/cone_bp.cu index 2d12d00..feebda2 100644 --- a/cuda/3d/cone_bp.cu +++ b/cuda/3d/cone_bp.cu @@ -25,20 +25,20 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/dims3d.h" + +#ifdef STANDALONE +#include "astra/cuda/3d/cone_fp.h" +#include "testutil.h" +#endif + #include <cstdio> #include <cassert> #include <iostream> #include <list> #include <cuda.h> -#include "util3d.h" - -#ifdef STANDALONE -#include "cone_fp.h" -#include "testutil.h" -#endif - -#include "dims3d.h" typedef texture<float, 3, cudaReadModeElementType> texture3D; diff --git a/cuda/3d/cone_fp.cu b/cuda/3d/cone_fp.cu index 21598d0..7e0fae8 100644 --- a/cuda/3d/cone_fp.cu +++ b/cuda/3d/cone_fp.cu @@ -25,19 +25,19 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/dims3d.h" + +#ifdef STANDALONE +#include "testutil.h" +#endif + #include <cstdio> #include <cassert> #include <iostream> #include <list> #include <cuda.h> -#include "util3d.h" - -#ifdef STANDALONE -#include "testutil.h" -#endif - -#include "dims3d.h" typedef texture<float, 3, cudaReadModeElementType> texture3D; diff --git a/cuda/3d/darthelper3d.cu b/cuda/3d/darthelper3d.cu index 473199a..d8ccfa6 100644 --- a/cuda/3d/darthelper3d.cu +++ b/cuda/3d/darthelper3d.cu @@ -25,9 +25,10 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include "util3d.h" -#include "dims3d.h" -#include "darthelper3d.h" +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/dims3d.h" +#include "astra/cuda/3d/darthelper3d.h" + #include <cassert> namespace astraCUDA3d { diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu index 48194c4..8aea84d 100644 --- a/cuda/3d/fdk.cu +++ b/cuda/3d/fdk.cu @@ -25,25 +25,26 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> -#include <iostream> -#include <list> +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/dims3d.h" +#include "astra/cuda/3d/arith3d.h" +#include "astra/cuda/3d/cone_bp.h" -#include <cuda.h> -#include "util3d.h" +#include "astra/cuda/2d/fft.h" #ifdef STANDALONE -#include "cone_fp.h" +#include "astra/cuda/3d/cone_fp.h" #include "testutil.h" #endif -#include "dims3d.h" -#include "arith3d.h" -#include "cone_bp.h" -#include "../2d/fft.h" +#include "astra/Logging.h" -#include "../../include/astra/Logging.h" +#include <cstdio> +#include <cassert> +#include <iostream> +#include <list> + +#include <cuda.h> namespace astraCUDA3d { diff --git a/cuda/3d/mem3d.cu b/cuda/3d/mem3d.cu index 4a26921..fe3e723 100644 --- a/cuda/3d/mem3d.cu +++ b/cuda/3d/mem3d.cu @@ -25,23 +25,22 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/mem3d.h" +#include "astra/cuda/3d/astra3d.h" +#include "astra/cuda/3d/cone_fp.h" +#include "astra/cuda/3d/cone_bp.h" +#include "astra/cuda/3d/par3d_fp.h" +#include "astra/cuda/3d/par3d_bp.h" +#include "astra/cuda/3d/fdk.h" -#include "util3d.h" +#include "astra/cuda/2d/astra.h" -#include "mem3d.h" - -#include "../2d/astra.h" +#include "astra/Logging.h" -#include "astra3d.h" -#include "cone_fp.h" -#include "cone_bp.h" -#include "par3d_fp.h" -#include "par3d_bp.h" -#include "fdk.h" +#include <cstdio> +#include <cassert> -#include "astra/Logging.h" namespace astraCUDA3d { diff --git a/cuda/3d/par3d_bp.cu b/cuda/3d/par3d_bp.cu index 6f76d22..3656f78 100644 --- a/cuda/3d/par3d_bp.cu +++ b/cuda/3d/par3d_bp.cu @@ -25,20 +25,20 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/dims3d.h" + +#ifdef STANDALONE +#include "astra/cuda/3d/par3d_fp.h" +#include "testutil.h" +#endif + #include <cstdio> #include <cassert> #include <iostream> #include <list> #include <cuda.h> -#include "util3d.h" - -#ifdef STANDALONE -#include "par3d_fp.h" -#include "testutil.h" -#endif - -#include "dims3d.h" typedef texture<float, 3, cudaReadModeElementType> texture3D; diff --git a/cuda/3d/par3d_fp.cu b/cuda/3d/par3d_fp.cu index 8e2a2d0..515b1ba 100644 --- a/cuda/3d/par3d_fp.cu +++ b/cuda/3d/par3d_fp.cu @@ -25,19 +25,20 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/dims3d.h" + +#ifdef STANDALONE +#include "testutil.h" +#endif + + #include <cstdio> #include <cassert> #include <iostream> #include <list> #include <cuda.h> -#include "util3d.h" - -#ifdef STANDALONE -#include "testutil.h" -#endif - -#include "dims3d.h" typedef texture<float, 3, cudaReadModeElementType> texture3D; diff --git a/cuda/3d/sirt3d.cu b/cuda/3d/sirt3d.cu index 14f5768..332589e 100644 --- a/cuda/3d/sirt3d.cu +++ b/cuda/3d/sirt3d.cu @@ -25,18 +25,18 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include <cstdio> -#include <cassert> - -#include "sirt3d.h" -#include "util3d.h" -#include "arith3d.h" -#include "cone_fp.h" +#include "astra/cuda/3d/sirt3d.h" +#include "astra/cuda/3d/util3d.h" +#include "astra/cuda/3d/arith3d.h" +#include "astra/cuda/3d/cone_fp.h" #ifdef STANDALONE #include "testutil.h" #endif +#include <cstdio> +#include <cassert> + namespace astraCUDA3d { SIRT::SIRT() : ReconAlgo3D() diff --git a/cuda/3d/util3d.cu b/cuda/3d/util3d.cu index 1f436d8..90aa5ea 100644 --- a/cuda/3d/util3d.cu +++ b/cuda/3d/util3d.cu @@ -25,12 +25,14 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ +#include "astra/cuda/3d/util3d.h" + +#include "astra/cuda/2d/util.h" + +#include "astra/Logging.h" + #include <cstdio> #include <cassert> -#include "util3d.h" -#include "../2d/util.h" - -#include "../../include/astra/Logging.h" namespace astraCUDA3d { diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h index 5ff9f02..1280e9a 100644 --- a/include/astra/CudaFilteredBackProjectionAlgorithm.h +++ b/include/astra/CudaFilteredBackProjectionAlgorithm.h @@ -30,11 +30,11 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #ifdef ASTRA_CUDA -#include <astra/Float32ProjectionData2D.h> -#include <astra/Float32VolumeData2D.h> -#include <astra/CudaReconstructionAlgorithm2D.h> +#include "Float32ProjectionData2D.h" +#include "Float32VolumeData2D.h" +#include "CudaReconstructionAlgorithm2D.h" -#include "../../cuda/2d/astra.h" +#include "cuda/2d/astra.h" namespace astra { diff --git a/include/astra/CudaProjector2D.h b/include/astra/CudaProjector2D.h index db6972e..8f61064 100644 --- a/include/astra/CudaProjector2D.h +++ b/include/astra/CudaProjector2D.h @@ -33,7 +33,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "ParallelProjectionGeometry2D.h" #include "Float32Data2D.h" #include "Projector2D.h" -#include "../../cuda/2d/astra.h" +#include "cuda/2d/astra.h" namespace astra { diff --git a/include/astra/CudaProjector3D.h b/include/astra/CudaProjector3D.h index 83ce93e..60df7bb 100644 --- a/include/astra/CudaProjector3D.h +++ b/include/astra/CudaProjector3D.h @@ -36,7 +36,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "Globals.h" #include "Config.h" #include "Projector3D.h" -#include "../../cuda/3d/astra3d.h" +#include "cuda/3d/astra3d.h" namespace astra { diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index 12ad685..1bdddc6 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -32,7 +32,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "Float32Data.h" #include "Float32Data2D.h" -#include "../../cuda/3d/mem3d.h" +#include "cuda/3d/mem3d.h" namespace astra { diff --git a/include/astra/Float32Data3DGPU.h b/include/astra/Float32Data3DGPU.h index 9ebb341..cac38f6 100644 --- a/include/astra/Float32Data3DGPU.h +++ b/include/astra/Float32Data3DGPU.h @@ -33,7 +33,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "Globals.h" #include "Float32Data3D.h" -#include "../../cuda/3d/mem3d.h" +#include "cuda/3d/mem3d.h" namespace astra { diff --git a/cuda/2d/algo.h b/include/astra/cuda/2d/algo.h index 2ce929c..2ce929c 100644 --- a/cuda/2d/algo.h +++ b/include/astra/cuda/2d/algo.h diff --git a/cuda/2d/arith.h b/include/astra/cuda/2d/arith.h index e18bb1b..e18bb1b 100644 --- a/cuda/2d/arith.h +++ b/include/astra/cuda/2d/arith.h diff --git a/cuda/2d/astra.h b/include/astra/cuda/2d/astra.h index 6f0e2f0..6f0e2f0 100644 --- a/cuda/2d/astra.h +++ b/include/astra/cuda/2d/astra.h diff --git a/cuda/2d/cgls.h b/include/astra/cuda/2d/cgls.h index 375a425..375a425 100644 --- a/cuda/2d/cgls.h +++ b/include/astra/cuda/2d/cgls.h diff --git a/cuda/2d/darthelper.h b/include/astra/cuda/2d/darthelper.h index 3c2f83c..3c2f83c 100644 --- a/cuda/2d/darthelper.h +++ b/include/astra/cuda/2d/darthelper.h diff --git a/cuda/2d/dims.h b/include/astra/cuda/2d/dims.h index 0bdefa9..0bdefa9 100644 --- a/cuda/2d/dims.h +++ b/include/astra/cuda/2d/dims.h diff --git a/cuda/2d/em.h b/include/astra/cuda/2d/em.h index 3ffe01b..3ffe01b 100644 --- a/cuda/2d/em.h +++ b/include/astra/cuda/2d/em.h diff --git a/cuda/2d/fan_bp.h b/include/astra/cuda/2d/fan_bp.h index 22349b0..22349b0 100644 --- a/cuda/2d/fan_bp.h +++ b/include/astra/cuda/2d/fan_bp.h diff --git a/cuda/2d/fan_fp.h b/include/astra/cuda/2d/fan_fp.h index 3e8f1e4..3e8f1e4 100644 --- a/cuda/2d/fan_fp.h +++ b/include/astra/cuda/2d/fan_fp.h diff --git a/cuda/2d/fbp.h b/include/astra/cuda/2d/fbp.h index 8666646..8666646 100644 --- a/cuda/2d/fbp.h +++ b/include/astra/cuda/2d/fbp.h diff --git a/cuda/2d/fbp_filters.h b/include/astra/cuda/2d/fbp_filters.h index 7c1121a..7c1121a 100644 --- a/cuda/2d/fbp_filters.h +++ b/include/astra/cuda/2d/fbp_filters.h diff --git a/cuda/2d/fft.h b/include/astra/cuda/2d/fft.h index d36cae2..d36cae2 100644 --- a/cuda/2d/fft.h +++ b/include/astra/cuda/2d/fft.h diff --git a/cuda/2d/par_bp.h b/include/astra/cuda/2d/par_bp.h index c8dfab8..c8dfab8 100644 --- a/cuda/2d/par_bp.h +++ b/include/astra/cuda/2d/par_bp.h diff --git a/cuda/2d/par_fp.h b/include/astra/cuda/2d/par_fp.h index 62277a1..62277a1 100644 --- a/cuda/2d/par_fp.h +++ b/include/astra/cuda/2d/par_fp.h diff --git a/cuda/2d/sart.h b/include/astra/cuda/2d/sart.h index 6c0e547..6c0e547 100644 --- a/cuda/2d/sart.h +++ b/include/astra/cuda/2d/sart.h diff --git a/cuda/2d/sirt.h b/include/astra/cuda/2d/sirt.h index 434a07c..434a07c 100644 --- a/cuda/2d/sirt.h +++ b/include/astra/cuda/2d/sirt.h diff --git a/cuda/2d/util.h b/include/astra/cuda/2d/util.h index 70e7c86..70e7c86 100644 --- a/cuda/2d/util.h +++ b/include/astra/cuda/2d/util.h diff --git a/cuda/3d/algo3d.h b/include/astra/cuda/3d/algo3d.h index f5fd207..f5fd207 100644 --- a/cuda/3d/algo3d.h +++ b/include/astra/cuda/3d/algo3d.h diff --git a/cuda/3d/arith3d.h b/include/astra/cuda/3d/arith3d.h index fa9f3a1..fa9f3a1 100644 --- a/cuda/3d/arith3d.h +++ b/include/astra/cuda/3d/arith3d.h diff --git a/cuda/3d/astra3d.h b/include/astra/cuda/3d/astra3d.h index 0ea752d..0ea752d 100644 --- a/cuda/3d/astra3d.h +++ b/include/astra/cuda/3d/astra3d.h diff --git a/cuda/3d/cgls3d.h b/include/astra/cuda/3d/cgls3d.h index b9b9e3a..b9b9e3a 100644 --- a/cuda/3d/cgls3d.h +++ b/include/astra/cuda/3d/cgls3d.h diff --git a/cuda/3d/cone_bp.h b/include/astra/cuda/3d/cone_bp.h index 6dcadb1..6dcadb1 100644 --- a/cuda/3d/cone_bp.h +++ b/include/astra/cuda/3d/cone_bp.h diff --git a/cuda/3d/cone_fp.h b/include/astra/cuda/3d/cone_fp.h index 4da72d4..4da72d4 100644 --- a/cuda/3d/cone_fp.h +++ b/include/astra/cuda/3d/cone_fp.h diff --git a/cuda/3d/darthelper3d.h b/include/astra/cuda/3d/darthelper3d.h index 385e48e..385e48e 100644 --- a/cuda/3d/darthelper3d.h +++ b/include/astra/cuda/3d/darthelper3d.h diff --git a/cuda/3d/dims3d.h b/include/astra/cuda/3d/dims3d.h index ef4ea78..ef4ea78 100644 --- a/cuda/3d/dims3d.h +++ b/include/astra/cuda/3d/dims3d.h diff --git a/cuda/3d/fdk.h b/include/astra/cuda/3d/fdk.h index 6f6e73b..6f6e73b 100644 --- a/cuda/3d/fdk.h +++ b/include/astra/cuda/3d/fdk.h diff --git a/cuda/3d/mem3d.h b/include/astra/cuda/3d/mem3d.h index 78e1294..78e1294 100644 --- a/cuda/3d/mem3d.h +++ b/include/astra/cuda/3d/mem3d.h diff --git a/cuda/3d/par3d_bp.h b/include/astra/cuda/3d/par3d_bp.h index b4ec6a3..b4ec6a3 100644 --- a/cuda/3d/par3d_bp.h +++ b/include/astra/cuda/3d/par3d_bp.h diff --git a/cuda/3d/par3d_fp.h b/include/astra/cuda/3d/par3d_fp.h index 18f5f2e..18f5f2e 100644 --- a/cuda/3d/par3d_fp.h +++ b/include/astra/cuda/3d/par3d_fp.h diff --git a/cuda/3d/sirt3d.h b/include/astra/cuda/3d/sirt3d.h index 7c9a7c0..7c9a7c0 100644 --- a/cuda/3d/sirt3d.h +++ b/include/astra/cuda/3d/sirt3d.h diff --git a/cuda/3d/util3d.h b/include/astra/cuda/3d/util3d.h index 17eb31e..17eb31e 100644 --- a/cuda/3d/util3d.h +++ b/include/astra/cuda/3d/util3d.h diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index f57c0cd..2cc2be9 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -38,8 +38,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/AstraObjectManager.h" #ifdef ASTRA_CUDA -#include "../cuda/2d/astra.h" -#include "../cuda/2d/util.h" +#include "astra/cuda/2d/astra.h" +#include "astra/cuda/2d/util.h" #include "astra/CompositeGeometryManager.h" #endif diff --git a/python/astra/astra_c.pyx b/python/astra/astra_c.pyx index e7c5a6d..85a3b0c 100644 --- a/python/astra/astra_c.pyx +++ b/python/astra/astra_c.pyx @@ -41,7 +41,7 @@ cdef extern from "astra/Globals.h" namespace "astra": bool cudaAvailable() IF HAVE_CUDA==True: - cdef extern from "../cuda/2d/astra.h" namespace "astraCUDA": + cdef extern from "astra/cuda/2d/astra.h" namespace "astraCUDA": bool setGPUIndex(int) string getCudaDeviceString(int) ELSE: 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 { |