diff options
| -rw-r--r-- | build/msvc/build_env.bat | 9 | ||||
| -rw-r--r-- | build/msvc/build_python2.bat | 28 | ||||
| -rw-r--r-- | build/msvc/build_release.bat | 58 |
3 files changed, 10 insertions, 85 deletions
diff --git a/build/msvc/build_env.bat b/build/msvc/build_env.bat index 73d040a..ef689da 100644 --- a/build/msvc/build_env.bat +++ b/build/msvc/build_env.bat @@ -1,7 +1,5 @@ -set B_WP2=2.7.10.3 -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_WP3=3.9.5.0 +set B_WINPYTHON3=E:\wjp\WPy64-3950 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 @@ -9,8 +7,7 @@ set B_BOOST=E:\wjp\boost_%B_BV%_0 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,-2%.amd64\Lib\site-packages set B_RELEASE_TAG=master -set B_RELEASE=1.9.0.dev11 +set B_RELEASE=2.0.0 diff --git a/build/msvc/build_python2.bat b/build/msvc/build_python2.bat deleted file mode 100644 index 208e17b..0000000 --- a/build/msvc/build_python2.bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off - -cd /D %~dp0 -cd ..\.. -set R=%CD% - -call "%~dp0build_env.bat" - -call "%B_WINPYTHON2%\scripts\env.bat" -call "%B_VC%\vcvars64.bat" - -cd /D %R% - -msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 - -cd python - -rd /s /q build -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;%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" - -pause diff --git a/build/msvc/build_release.bat b/build/msvc/build_release.bat index f10ddc5..7c53ddb 100644 --- a/build/msvc/build_release.bat +++ b/build/msvc/build_release.bat @@ -13,8 +13,7 @@ mkdir release cd release mkdir src mkdir matlab -mkdir python27 -mkdir python37 +mkdir python39 cd src git clone -b %B_RELEASE_TAG% https://github.com/astra-toolbox/astra-toolbox astra-%B_RELEASE% @@ -46,51 +45,7 @@ pause rem ------------------------------------------------------------------- -cd %R%\release\python27 -mkdir astra-%B_RELEASE% -cd astra-%B_RELEASE% -xcopy /e /i %R%\samples\python samples -copy %R%\NEWS.txt . -copy %R%\COPYING COPYING.txt - -copy %B_VCREDIST% . - -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_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-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 -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_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_WP2% . -echo. -echo Sample code can be found in the samples\ directory. -) > README.txt - -pause - -rem ------------------------------------------------------------------- - -cd %R%\release\python37 +cd %R%\release\python39 mkdir astra-%B_RELEASE% cd astra-%B_RELEASE% xcopy /e /i %R%\samples\python samples @@ -100,8 +55,10 @@ copy %R%\COPYING COPYING.txt copy %B_VCREDIST% . mkdir astra +mkdir astra\plugins call "%B_WINPYTHON3%\scripts\env.bat" copy %WINPYDIR%\lib\site-packages\astra\*.* astra +copy %WINPYDIR%\lib\site-packages\astra\plugins\*.* astra\plugins copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib astra copy "%CUDA_PATH%\bin\cudart64_90.dll" astra copy "%CUDA_PATH%\bin\cufft64_90.dll" astra @@ -110,8 +67,8 @@ copy "%CUDA_PATH%\bin\cufft64_90.dll" astra echo ----------------------------------------------------------------------- echo This file is part of the ASTRA Toolbox echo. -echo Copyright: 2010-2019, imec Vision Lab, University of Antwerp -echo 2014-2019, CWI, Amsterdam +echo Copyright: 2010-2021, imec Vision Lab, University of Antwerp +echo 2014-2021, CWI, Amsterdam echo http://visielab.uantwerpen.be/ and http://www.cwi.nl/ echo License: Open Source under GPLv3 echo Contact: astra@astra-toolbox.com @@ -134,8 +91,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%-python37-win-x64', 'zip', 'python37')" +python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python39-win-x64', 'zip', 'python39')" python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%', 'zip', 'src')" pause |