diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2019-07-08 18:54:14 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2019-07-08 23:25:53 +0200 |
| commit | c84b7f8ae6542de8bd23018e2badeafaddf4d28d (patch) | |
| tree | b724536a4c35f2ce307e66aee5a013354d979d39 /python/conda/libastra | |
| parent | 52456fe847252b764b07051323892fa8ce7df298 (diff) | |
| download | astra-c84b7f8ae6542de8bd23018e2badeafaddf4d28d.tar.gz astra-c84b7f8ae6542de8bd23018e2badeafaddf4d28d.tar.bz2 astra-c84b7f8ae6542de8bd23018e2badeafaddf4d28d.tar.xz astra-c84b7f8ae6542de8bd23018e2badeafaddf4d28d.zip | |
Build updates for Win10 + VS2017 + CUDA9 + Matlab R2018b
Diffstat (limited to 'python/conda/libastra')
| -rw-r--r-- | python/conda/libastra/bld.bat | 28 | ||||
| -rw-r--r-- | python/conda/libastra/meta.yaml | 5 |
2 files changed, 16 insertions, 17 deletions
diff --git a/python/conda/libastra/bld.bat b/python/conda/libastra/bld.bat index 29b894a..eafadac 100644 --- a/python/conda/libastra/bld.bat +++ b/python/conda/libastra/bld.bat @@ -2,32 +2,32 @@ set R=%SRC_DIR% -set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64 -call "%B_VC%\vcvars64.bat" +set B_VC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\ +rem call "%B_VC%\vcvars64.bat" -set B_BV=1_62 -set B_BOOST=D:\wjp\boost_%B_BV%_0 +set B_BV=1_69 +set B_BOOST=E:\wjp\boost_%B_BV%_0 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 libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64 -copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64 -copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64 -copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64 +copy boost_unit_test_framework-vc140-mt-x64-%B_BV%.lib "%R%\lib\x64" +copy libboost_chrono-vc140-mt-x64-%B_BV%.lib "%R%\lib\x64" +copy libboost_date_time-vc140-mt-x64-%B_BV%.lib "%R%\lib\x64" +copy libboost_system-vc140-mt-x64-%B_BV%.lib "%R%\lib\x64" +copy libboost_thread-vc140-mt-x64-%B_BV%.lib "%R%\lib\x64" cd %B_BOOST% -xcopy /i /e /q boost "%R%\lib\include\boost" +xcopy /i /e /q /y boost "%R%\lib\include\boost" cd /D %R% msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 -copy bin\x64\Release_CUDA\AstraCuda64.dll "%CONDA_PREFIX%\Library\bin" -copy bin\x64\Release_CUDA\AstraCuda64.lib "%CONDA_PREFIX%\Library\lib" -copy "%CUDA_PATH%\bin\cudart64_80.dll" "%CONDA_PREFIX%\Library\bin" -copy "%CUDA_PATH%\bin\cufft64_80.dll" "%CONDA_PREFIX%\Library\bin" +copy bin\x64\Release_CUDA\AstraCuda64.dll "%LIBRARY_BIN%" +copy bin\x64\Release_CUDA\AstraCuda64.lib "%LIBRARY_LIB%" +copy "%CUDA_PATH%\bin\cudart64_90.dll" "%LIBRARY_BIN%" +copy "%CUDA_PATH%\bin\cufft64_90.dll" "%LIBRARY_BIN%" diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 2135376..59c3a09 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,6 +1,6 @@ package: name: libastra - version: '1.9.0dev' + version: '1.9.0.dev11' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git @@ -14,7 +14,7 @@ build: requirements: build: - - vs2015_runtime # [win] + - {{compiler('c')}} # [win] - boost # [osx] - automake # [osx] - autoconf # [osx] @@ -22,7 +22,6 @@ requirements: - cudatoolkit {{ cudatoolkit }} # [linux] run: - - vs2015_runtime # [win] - cudatoolkit {{ cudatoolkit }} # [linux] about: |