Build updates for Win10 + VS2017 + CUDA9 + Matlab R2018b

6 files changed, 29 insertions, 33 deletions

diff --git a/python/conda/astra-toolbox/bld.bat b/python/conda/astra-toolbox/bld.bat
index 15777ce..f43066b 100644
--- a/python/conda/astra-toolbox/bld.bat
+++ b/python/conda/astra-toolbox/bld.bat
@@ -2,26 +2,26 @@
 
 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" amd64 8.1 -vcvars_ver=14.0
 
-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%
 
diff --git a/python/conda/astra-toolbox/conda_build_config_py35.yaml b/python/conda/astra-toolbox/conda_build_config_py35.yaml
index e841047..8dd963c 100644
--- a/python/conda/astra-toolbox/conda_build_config_py35.yaml
+++ b/python/conda/astra-toolbox/conda_build_config_py35.yaml
@@ -2,6 +2,4 @@ python:
   - 3.5
 
 numpy:
-  - 1.11
-  - 1.14
   - 1.15
diff --git a/python/conda/astra-toolbox/conda_build_config_py36.yaml b/python/conda/astra-toolbox/conda_build_config_py36.yaml
index a582533..f043435 100644
--- a/python/conda/astra-toolbox/conda_build_config_py36.yaml
+++ b/python/conda/astra-toolbox/conda_build_config_py36.yaml
@@ -2,7 +2,6 @@ python:
   - 3.6
 
 numpy:
-  - 1.11
   - 1.14
   - 1.15
   - 1.16
diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml
index 70489be..054751b 100644
--- a/python/conda/astra-toolbox/meta.yaml
+++ b/python/conda/astra-toolbox/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: astra-toolbox
-  version: '1.9.0dev'
+  version: '1.9.0.dev11'
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
@@ -30,14 +30,14 @@ requirements:
     - numpy {{ numpy }}
     - scipy
     - six
-    - libastra ==1.9.0dev
+    - libastra ==1.9.0.dev11
 
   run:
     - python
     - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }}
     - scipy
     - six
-    - libastra ==1.9.0dev
+    - libastra ==1.9.0.dev11
 
 
 about:
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: