diff options
| -rw-r--r-- | python/conda/bld.bat | 35 | ||||
| -rw-r--r-- | python/conda/libastra/bld.bat | 33 | ||||
| -rw-r--r-- | python/conda/libastra/meta.yaml | 12 | ||||
| -rw-r--r-- | python/conda/meta.yaml | 5 | 
4 files changed, 79 insertions, 6 deletions
| diff --git a/python/conda/bld.bat b/python/conda/bld.bat new file mode 100644 index 0000000..9da8cd4 --- /dev/null +++ b/python/conda/bld.bat @@ -0,0 +1,35 @@ +@echo off + +set R=%SRC_DIR%% + +set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64 +call "%B_VC%\vcvars64.bat" + +cd /D %R% + +set B_BV=1_61 + +mkdir "%R%\lib\x64" +mkdir "%R%\bin\x64\Release_CUDA" + +cd /D %CONDA_PREFIX%\Library\lib + + +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 + +cd /D %CONDA_PREFIX%\Library\include + +xcopy /i /e /q boost "%R%\lib\include\boost" + +cd /D %R% + +cd python + +set VS90COMNTOOLS=%VS140COMNTOOLS% +set CL=/DASTRA_CUDA /DASTRA_PYTHON "/I%R%\include" "/I%R%\lib\include" "/I%CUDA_PATH%\include" +copy %CONDA_PREFIX%\Library\lib\AstraCuda64.lib astra.lib +python builder.py build_ext --compiler=msvc install diff --git a/python/conda/libastra/bld.bat b/python/conda/libastra/bld.bat new file mode 100644 index 0000000..bb7329a --- /dev/null +++ b/python/conda/libastra/bld.bat @@ -0,0 +1,33 @@ +@echo off + +set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64 + +call "%B_VC%\vcvars64.bat" + +set R=%SRC_DIR% +set B_BV=1_61 + +mkdir "%R%\lib\x64" +mkdir "%R%\bin\x64\Release_CUDA" + +cd /D %CONDA_PREFIX%\Library\lib + + +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 + +cd /D %CONDA_PREFIX%\Library\include + +xcopy /i /e /q 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" diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 7c92e04..c9135ab 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -10,13 +10,17 @@ source:  build:    number: 0    script_env: -    - CC -    - CXX -    - CUDA_ROOT +    - CC # [not win] +    - CXX # [not win] +    - CUDA_ROOT # [not win]  requirements:    build: -    - boost +    - boost ==1.61 # [win] +    - vs2015_runtime # [win] + +  run: +    - vs2015_runtime # [win]  about:    home: http://www.astra-toolbox.com diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml index 94ce12f..738489a 100644 --- a/python/conda/meta.yaml +++ b/python/conda/meta.yaml @@ -10,8 +10,8 @@ source:  build:    number: 0    script_env: -    - CC -    - CUDA_ROOT +    - CC # [not win] +    - CUDA_ROOT # [not win]  test:    imports: @@ -24,6 +24,7 @@ test:  requirements:    build:      - python +    - boost ==1.61 # [win]      - cython >=0.13      - nomkl # [not win]      - numpy | 
