summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/linux/Makefile.in3
-rw-r--r--build/linux/configure.ac6
-rw-r--r--build/msvc/build_env.bat12
-rw-r--r--build/msvc/build_release.bat30
-rw-r--r--build/msvc/gen.py5
5 files changed, 32 insertions, 24 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 7cff15e..77e89e7 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -154,6 +154,7 @@ BASE_OBJECTS=\
src/Float32VolumeData3DMemory.lo \
src/ForwardProjectionAlgorithm.lo \
src/Fourier.lo \
+ src/GeometryUtil2D.lo \
src/GeometryUtil3D.lo \
src/Globals.lo \
src/Logging.lo \
@@ -162,6 +163,7 @@ BASE_OBJECTS=\
src/ParallelBeamLineKernelProjector2D.lo \
src/ParallelBeamStripKernelProjector2D.lo \
src/ParallelProjectionGeometry2D.lo \
+ src/ParallelVecProjectionGeometry2D.lo \
src/ParallelProjectionGeometry3D.lo \
src/ParallelVecProjectionGeometry3D.lo \
src/PlatformDepSystemCode.lo \
@@ -213,6 +215,7 @@ CUDA_OBJECTS=\
cuda/2d/par_bp.lo \
cuda/2d/fan_fp.lo \
cuda/2d/fan_bp.lo \
+ cuda/2d/fbp.lo \
cuda/2d/sirt.lo \
cuda/2d/sart.lo \
cuda/2d/cgls.lo \
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 7959792..ac0d82f 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -1,8 +1,8 @@
dnl -----------------------------------------------------------------------
-dnl Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
-dnl 2014-2016, CWI, Amsterdam
+dnl Copyright: 2010-2018, imec Vision Lab, University of Antwerp
+dnl 2014-2018, CWI, Amsterdam
dnl
-dnl Contact: astra@uantwerpen.be
+dnl Contact: astra@astra-toolbox.com
dnl Website: http://www.astra-toolbox.com/
dnl
dnl This file is part of the ASTRA Toolbox.
diff --git a/build/msvc/build_env.bat b/build/msvc/build_env.bat
index 56c811f..b150a98 100644
--- a/build/msvc/build_env.bat
+++ b/build/msvc/build_env.bat
@@ -1,7 +1,7 @@
-set B_WP27=2.7.10.3
-set B_WP35=3.5.2.3
-set B_WINPYTHON27=D:\wjp\WinPython-64bit-%B_WP27%
-set B_WINPYTHON35=D:\wjp\WinPython-64bit-%B_WP35%
+set B_WP2=2.7.10.3
+set B_WP3=3.6.3.0Qt5
+set B_WINPYTHON2=D:\wjp\WinPython-64bit-%B_WP2%
+set B_WINPYTHON3=D:\wjp\WinPython-64bit-%B_WP3%
set B_MATLAB_ROOT=C:\Program Files\MATLAB\R2015a
set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
set B_BV=1_62
@@ -9,8 +9,8 @@ set B_BOOST=D:\wjp\boost_%B_BV%_0
set B_VCREDIST=D:\wjp\vs2015u3_redist\vc_redist.x64.exe
-set B_README_WP27=C:\WinPython-64bit-%B_WP27%\python-%B_WP27:~0,-2%.amd64\Lib\site-packages
-set B_README_WP35=C:\WinPython-64bit-%B_WP35%\python-%B_WP35:~0,-2%.amd64\Lib\site-packages
+set B_README_WP2=C:\WinPython-64bit-%B_WP2%\python-%B_WP2:~0,-2%.amd64\Lib\site-packages
+set B_README_WP3=C:\WinPython-64bit-%B_WP3%\python-%B_WP3:~0,-5%.amd64\Lib\site-packages
set B_RELEASE_TAG=v1.8.3
set B_RELEASE=1.8.3
diff --git a/build/msvc/build_release.bat b/build/msvc/build_release.bat
index e88cb6e..c8228f0 100644
--- a/build/msvc/build_release.bat
+++ b/build/msvc/build_release.bat
@@ -14,7 +14,7 @@ cd release
mkdir src
mkdir matlab
mkdir python27
-mkdir python35
+mkdir python36
cd src
git clone -b %B_RELEASE_TAG% https://github.com/astra-toolbox/astra-toolbox astra-%B_RELEASE%
@@ -56,7 +56,7 @@ copy %R%\COPYING COPYING.txt
copy %B_VCREDIST% .
mkdir astra
-call "%B_WINPYTHON27%\scripts\env.bat"
+call "%B_WINPYTHON2%\scripts\env.bat"
copy %WINPYDIR%\lib\site-packages\astra\*.* astra
copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib astra
copy "%CUDA_PATH%\bin\cudart64_80.dll" astra
@@ -66,22 +66,22 @@ copy "%CUDA_PATH%\bin\cufft64_80.dll" astra
echo -----------------------------------------------------------------------
echo This file is part of the ASTRA Toolbox
echo.
-echo Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
-echo 2014-2016, CWI, Amsterdam
+echo Copyright: 2010-2018, imec Vision Lab, University of Antwerp
+echo 2014-2018, CWI, Amsterdam
echo http://visielab.uantwerpen.be/ and http://www.cwi.nl/
echo License: Open Source under GPLv3
-echo Contact: astra@uantwerpen.be
+echo Contact: astra@astra-toolbox.com
echo Website: http://www.astra-toolbox.com/
echo -----------------------------------------------------------------------
echo.
echo.
echo This directory contains pre-built Python modules for the ASTRA Toolbox.
echo.
-echo It has been built with WinPython-64bit-%B_WP27%.
+echo It has been built with WinPython-64bit-%B_WP2%.
echo.
echo To use it, move the astra\ directory to your existing site-packages directory.
echo Its exact location depends on your Python installation, but should look
-echo similar to %B_README_WP27% .
+echo similar to %B_README_WP2% .
echo.
echo Sample code can be found in the samples\ directory.
) > README.txt
@@ -90,7 +90,7 @@ pause
rem -------------------------------------------------------------------
-cd %R%\release\python35
+cd %R%\release\python36
mkdir astra-%B_RELEASE%
cd astra-%B_RELEASE%
xcopy /e /i %R%\samples\python samples
@@ -100,7 +100,7 @@ copy %R%\COPYING COPYING.txt
copy %B_VCREDIST% .
mkdir astra
-call "%B_WINPYTHON35%\scripts\env.bat"
+call "%B_WINPYTHON3%\scripts\env.bat"
copy %WINPYDIR%\lib\site-packages\astra\*.* astra
copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib astra
copy "%CUDA_PATH%\bin\cudart64_80.dll" astra
@@ -110,22 +110,22 @@ copy "%CUDA_PATH%\bin\cufft64_80.dll" astra
echo -----------------------------------------------------------------------
echo This file is part of the ASTRA Toolbox
echo.
-echo Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
-echo 2014-2016, CWI, Amsterdam
+echo Copyright: 2010-2018, imec Vision Lab, University of Antwerp
+echo 2014-2018, CWI, Amsterdam
echo http://visielab.uantwerpen.be/ and http://www.cwi.nl/
echo License: Open Source under GPLv3
-echo Contact: astra@uantwerpen.be
+echo Contact: astra@astra-toolbox.com
echo Website: http://www.astra-toolbox.com/
echo -----------------------------------------------------------------------
echo.
echo.
echo This directory contains pre-built Python modules for the ASTRA Toolbox.
echo.
-echo It has been built with WinPython-64bit-%B_WP35%.
+echo It has been built with WinPython-64bit-%B_WP3%.
echo.
echo To use it, move the astra\ directory to your existing site-packages directory.
echo Its exact location depends on your Python installation, but should look
-echo similar to %B_README_WP35% .
+echo similar to %B_README_WP3% .
echo.
echo Sample code can be found in the samples\ directory.
) > README.txt
@@ -135,7 +135,7 @@ pause
cd %R%\release
python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-matlab-win-x64', 'zip', 'matlab')"
python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python27-win-x64', 'zip', 'python27')"
-python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python35-win-x64', 'zip', 'python35')"
+python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python36-win-x64', 'zip', 'python36')"
python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%', 'zip', 'src')"
pause
diff --git a/build/msvc/gen.py b/build/msvc/gen.py
index 9c14ffe..771c226 100644
--- a/build/msvc/gen.py
+++ b/build/msvc/gen.py
@@ -158,6 +158,7 @@ P_astra["filters"]["CUDA\\cuda source"] = [
"cuda\\2d\\em.cu",
"cuda\\2d\\fan_bp.cu",
"cuda\\2d\\fan_fp.cu",
+"cuda\\2d\\fbp.cu",
"cuda\\2d\\fft.cu",
"cuda\\2d\\par_bp.cu",
"cuda\\2d\\par_fp.cu",
@@ -227,9 +228,11 @@ P_astra["filters"]["Geometries\\source"] = [
"src\\ConeVecProjectionGeometry3D.cpp",
"src\\FanFlatProjectionGeometry2D.cpp",
"src\\FanFlatVecProjectionGeometry2D.cpp",
+"src\\GeometryUtil2D.cpp",
"src\\GeometryUtil3D.cpp",
"src\\ParallelProjectionGeometry2D.cpp",
"src\\ParallelProjectionGeometry3D.cpp",
+"src\\ParallelVecProjectionGeometry2D.cpp",
"src\\ParallelVecProjectionGeometry3D.cpp",
"src\\ProjectionGeometry2D.cpp",
"src\\ProjectionGeometry3D.cpp",
@@ -290,6 +293,7 @@ P_astra["filters"]["CUDA\\cuda headers"] = [
"cuda\\2d\\fan_bp.h",
"cuda\\2d\\fan_fp.h",
"cuda\\2d\\fbp_filters.h",
+"cuda\\2d\\fbp.h",
"cuda\\2d\\fft.h",
"cuda\\2d\\par_bp.h",
"cuda\\2d\\par_fp.h",
@@ -371,6 +375,7 @@ P_astra["filters"]["Geometries\\headers"] = [
"include\\astra\\GeometryUtil3D.h",
"include\\astra\\ParallelProjectionGeometry2D.h",
"include\\astra\\ParallelProjectionGeometry3D.h",
+"include\\astra\\ParallelVecProjectionGeometry2D.h",
"include\\astra\\ParallelVecProjectionGeometry3D.h",
"include\\astra\\ProjectionGeometry2D.h",
"include\\astra\\ProjectionGeometry3D.h",
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 11:08:05 +0000