From d58f6b51493c7931cbc02feb3ffeb0eca6ea3a4e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 5 Jul 2018 16:13:37 +0200 Subject: Refactor a few filter-related functions out of cuda code --- build/linux/Makefile.in | 1 + build/msvc/gen.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'build') diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 1627a2e..0b90bd9 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -142,6 +142,7 @@ BASE_OBJECTS=\ src/FanFlatProjectionGeometry2D.lo \ src/FanFlatVecProjectionGeometry2D.lo \ src/FilteredBackProjectionAlgorithm.lo \ + src/Filters.lo \ src/Float32Data2D.lo \ src/Float32Data3D.lo \ src/Float32Data3DMemory.lo \ diff --git a/build/msvc/gen.py b/build/msvc/gen.py index fcc12d2..47e7440 100644 --- a/build/msvc/gen.py +++ b/build/msvc/gen.py @@ -214,6 +214,7 @@ P_astra["filters"]["Global & Other\\source"] = [ "src\\AstraObjectManager.cpp", "src\\CompositeGeometryManager.cpp", "src\\Config.cpp", +"src\\Filters.cpp", "src\\Fourier.cpp", "src\\Globals.cpp", "src\\Logging.cpp", @@ -292,7 +293,6 @@ P_astra["filters"]["CUDA\\cuda headers"] = [ "include\\astra\\cuda\\2d\\em.h", "include\\astra\\cuda\\2d\\fan_bp.h", "include\\astra\\cuda\\2d\\fan_fp.h", -"include\\astra\\cuda\\2d\\fbp_filters.h", "include\\astra\\cuda\\2d\\fbp.h", "include\\astra\\cuda\\2d\\fft.h", "include\\astra\\cuda\\2d\\par_bp.h", @@ -354,6 +354,7 @@ P_astra["filters"]["Global & Other\\headers"] = [ "include\\astra\\clog.h", "include\\astra\\CompositeGeometryManager.h", "include\\astra\\Config.h", +"include\\astra\\Filters.h", "include\\astra\\Fourier.h", "include\\astra\\Globals.h", "include\\astra\\Logging.h", -- cgit v1.2.3