Build updates for Win10 + VS2017 + CUDA9 + Matlab R2018b

7 files changed, 44 insertions, 39 deletions

diff --git a/build/msvc/build_clean.bat b/build/msvc/build_clean.bat
index 4525529..c0af88e 100644
--- a/build/msvc/build_clean.bat
+++ b/build/msvc/build_clean.bat
@@ -1,8 +1,8 @@
 @echo off
 
-set MATLAB_ROOT=C:\Program Files\MATLAB\R2015a
+call "%~dp0build_env.bat"
 
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
+call "%B_VC%\vcvars64.bat"
 
 cd %~dp0
 cd ..\..
diff --git a/build/msvc/build_env.bat b/build/msvc/build_env.bat
index b150a98..73d040a 100644
--- a/build/msvc/build_env.bat
+++ b/build/msvc/build_env.bat
@@ -1,16 +1,16 @@
 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
-set B_BOOST=D:\wjp\boost_%B_BV%_0
+set B_WP3=3.7.2.0
+set B_WINPYTHON2=E:\wjp\WinPython-64bit-%B_WP2%
+set B_WINPYTHON3=E:\wjp\WinPython-64bit-%B_WP3%
+set B_MATLAB_ROOT=C:\Program Files\MATLAB\R2018b
+set B_VC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\
+set B_BV=1_69
+set B_BOOST=E:\wjp\boost_%B_BV%_0
 
-set B_VCREDIST=D:\wjp\vs2015u3_redist\vc_redist.x64.exe
+set B_VCREDIST=E:\wjp\vs2017_redist\vc_redist.x64.exe
 
 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_README_WP3=C:\WinPython-64bit-%B_WP3%\python-%B_WP3:~0,-2%.amd64\Lib\site-packages
 
-set B_RELEASE_TAG=v1.8.3
-set B_RELEASE=1.8.3
+set B_RELEASE_TAG=master
+set B_RELEASE=1.9.0.dev11
diff --git a/build/msvc/build_python2.bat b/build/msvc/build_python2.bat
index 4ac2141..208e17b 100644
--- a/build/msvc/build_python2.bat
+++ b/build/msvc/build_python2.bat
@@ -20,7 +20,7 @@ rd /s /q "%WINPYDIR%\lib\site-packages\astra"
 
 set VS90COMNTOOLS=%VS140COMNTOOLS%
 set CL=/DASTRA_CUDA /DASTRA_PYTHON /EHsc
-set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include
+set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include;%INCLUDE%
 copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib
 python builder.py build_ext --compiler=msvc install
 copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra"
diff --git a/build/msvc/build_python3.bat b/build/msvc/build_python3.bat
index cc21f0f..4a570e3 100644
--- a/build/msvc/build_python3.bat
+++ b/build/msvc/build_python3.bat
@@ -7,7 +7,7 @@ set R=%CD%
 call "%~dp0build_env.bat"
 
 call "%B_WINPYTHON3%\scripts\env.bat"
-call "%B_VC%\vcvars64.bat"
+call "%B_VC%\vcvarsall.bat" amd64 8.1 -vcvars_ver=14.0
 
 cd /D %R%
 
@@ -19,7 +19,7 @@ rd /s /q build
 rd /s /q "%WINPYDIR%\lib\site-packages\astra"
 
 set CL=/DASTRA_CUDA /DASTRA_PYTHON
-set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include
+set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include;%INCLUDE%
 copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib
 python builder.py build_ext --compiler=msvc install
 copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra"
diff --git a/build/msvc/build_release.bat b/build/msvc/build_release.bat
index c8228f0..f10ddc5 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 python36
+mkdir python37
 
 cd src
 git clone -b %B_RELEASE_TAG% https://github.com/astra-toolbox/astra-toolbox astra-%B_RELEASE%
@@ -39,8 +39,8 @@ mkdir mex
 copy %R%\bin\x64\Release_CUDA\*.mexw64 mex
 copy %R%\bin\x64\Release_CUDA\AstraCuda64.dll mex
 copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib mex
-copy "%CUDA_PATH%\bin\cudart64_80.dll" mex
-copy "%CUDA_PATH%\bin\cufft64_80.dll" mex
+copy "%CUDA_PATH%\bin\cudart64_90.dll" mex
+copy "%CUDA_PATH%\bin\cufft64_90.dll" mex
 
 pause
 
@@ -59,15 +59,15 @@ mkdir astra
 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
-copy "%CUDA_PATH%\bin\cufft64_80.dll" astra
+copy "%CUDA_PATH%\bin\cudart64_90.dll" astra
+copy "%CUDA_PATH%\bin\cufft64_90.dll" astra
 
 (
 echo -----------------------------------------------------------------------
 echo This file is part of the ASTRA Toolbox
 echo.
-echo Copyright: 2010-2018, imec Vision Lab, University of Antwerp
-echo            2014-2018, CWI, Amsterdam
+echo Copyright: 2010-2019, imec Vision Lab, University of Antwerp
+echo            2014-2019, CWI, Amsterdam
 echo            http://visielab.uantwerpen.be/ and http://www.cwi.nl/
 echo License: Open Source under GPLv3
 echo Contact: astra@astra-toolbox.com
@@ -90,7 +90,7 @@ pause
 
 rem -------------------------------------------------------------------
 
-cd %R%\release\python36
+cd %R%\release\python37
 mkdir astra-%B_RELEASE%
 cd astra-%B_RELEASE%
 xcopy /e /i %R%\samples\python samples
@@ -103,15 +103,15 @@ mkdir astra
 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
-copy "%CUDA_PATH%\bin\cufft64_80.dll" astra
+copy "%CUDA_PATH%\bin\cudart64_90.dll" astra
+copy "%CUDA_PATH%\bin\cufft64_90.dll" astra
 
 (
 echo -----------------------------------------------------------------------
 echo This file is part of the ASTRA Toolbox
 echo.
-echo Copyright: 2010-2018, imec Vision Lab, University of Antwerp
-echo            2014-2018, CWI, Amsterdam
+echo Copyright: 2010-2019, imec Vision Lab, University of Antwerp
+echo            2014-2019, CWI, Amsterdam
 echo            http://visielab.uantwerpen.be/ and http://www.cwi.nl/
 echo License: Open Source under GPLv3
 echo Contact: astra@astra-toolbox.com
@@ -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%-python36-win-x64', 'zip', 'python36')"
+python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python37-win-x64', 'zip', 'python37')"
 python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%', 'zip', 'src')"
 
 pause
diff --git a/build/msvc/build_setup.bat b/build/msvc/build_setup.bat
index 4314386..32bf91e 100644
--- a/build/msvc/build_setup.bat
+++ b/build/msvc/build_setup.bat
@@ -6,6 +6,7 @@ cd /D %~dp0
 cd ..\..
 set R=%CD%
 
+echo Removing lib, bin directories
 rd /s /q "%R%\lib\x64"
 rd /s /q "%R%\lib\include\boost"
 rd /s /q "%R%\bin\x64\Release_CUDA"
@@ -15,23 +16,26 @@ cd /D "%B_BOOST%\lib64-msvc-14.0"
 mkdir "%R%\lib\x64"
 mkdir "%R%\bin\x64\Release_CUDA"
 
-copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy boost_unit_test_framework-vc140-mt-gd-%B_BV%.lib %R%\lib\x64
+echo Copying boost libraries
+copy boost_unit_test_framework-vc140-mt-x64-%B_BV%.lib %R%\lib\x64
+copy boost_unit_test_framework-vc140-mt-gd-x64-%B_BV%.lib %R%\lib\x64
 
-copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_chrono-vc140-mt-gd-%B_BV%.lib %R%\lib\x64
+copy libboost_chrono-vc140-mt-x64-%B_BV%.lib %R%\lib\x64
+copy libboost_chrono-vc140-mt-gd-x64-%B_BV%.lib %R%\lib\x64
 
-copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_date_time-vc140-mt-gd-%B_BV%.lib %R%\lib\x64
+copy libboost_date_time-vc140-mt-x64-%B_BV%.lib %R%\lib\x64
+copy libboost_date_time-vc140-mt-gd-x64-%B_BV%.lib %R%\lib\x64
 
-copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_system-vc140-mt-gd-%B_BV%.lib %R%\lib\x64
+copy libboost_system-vc140-mt-x64-%B_BV%.lib %R%\lib\x64
+copy libboost_system-vc140-mt-gd-x64-%B_BV%.lib %R%\lib\x64
 
-copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_thread-vc140-mt-gd-%B_BV%.lib %R%\lib\x64
+copy libboost_thread-vc140-mt-x64-%B_BV%.lib %R%\lib\x64
+copy libboost_thread-vc140-mt-gd-x64-%B_BV%.lib %R%\lib\x64
 
 cd %B_BOOST%
 
+echo Copying boost headers
+
 xcopy /i /e /q boost "%R%\lib\include\boost"
 
 pause
diff --git a/build/msvc/gen.py b/build/msvc/gen.py
index ee5651f..5da9003 100644
--- a/build/msvc/gen.py
+++ b/build/msvc/gen.py
@@ -777,6 +777,7 @@ def write_mex_project11_14(P, version):
     if c.cuda:
       d+="ASTRA_CUDA;"
     d+="__SSE2__;"
+    d+="MATLAB_MEXCMD_RELEASE=700;"
 #    d+="DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;"
     d+='%(PreprocessorDefinitions)</PreprocessorDefinitions>'
     print(d, file=F)