From 2ffd8caa4b5a6ddfe517e91c9ceae8fc8568127c Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Fri, 15 Mar 2019 16:53:17 +0000 Subject: fix test for windows --- recipe/bld.bat | 12 +++--------- recipe/meta.yaml | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 6c84355..8f497d0 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,18 +3,12 @@ ECHO CIL_VERSION Not Defined. exit 1 ) -mkdir "%SRC_DIR%\ccpi" -ROBOCOPY /E "%RECIPE_DIR%\..\.." "%SRC_DIR%\ccpi" -ROBOCOPY /E "%RECIPE_DIR%\..\..\..\Core" "%SRC_DIR%\Core" -::cd %SRC_DIR%\ccpi\Python +mkdir "%SRC_DIR%\test" +ROBOCOPY /E "%RECIPE_DIR%\..\test" "%SRC_DIR%\test" cd %SRC_DIR% :: issue cmake to create setup.py -cmake -G "NMake Makefiles" %RECIPE_DIR%\..\..\..\ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=OFF -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" +cmake -G "NMake Makefiles" %RECIPE_DIR%\..\ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=OFF -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" -::%PYTHON% setup-regularisers.py build_ext -::if errorlevel 1 exit 1 -::%PYTHON% setup-regularisers.py install -::if errorlevel 1 exit 1 nmake install if errorlevel 1 exit 1 \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6ff4e31..111cd68 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,7 +35,7 @@ requirements: - vc 14 # [win and py36] - vc 14 # [win and py35] - vc 9 # [win and py27] - - libgcc-ng + - libgcc-ng # [unix] about: home: http://www.ccpi.ac.uk -- cgit v1.2.3 From 597373314e9bd7609b25f123f487b799f6c80dd2 Mon Sep 17 00:00:00 2001 From: Kazantsev Date: Sat, 16 Mar 2019 13:38:03 +0000 Subject: cuda-on flag added --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 8f497d0..62ae9b9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -8,7 +8,7 @@ ROBOCOPY /E "%RECIPE_DIR%\..\test" "%SRC_DIR%\test" cd %SRC_DIR% :: issue cmake to create setup.py -cmake -G "NMake Makefiles" %RECIPE_DIR%\..\ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=OFF -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" +cmake -G "NMake Makefiles" %RECIPE_DIR%\..\ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" nmake install -if errorlevel 1 exit 1 \ No newline at end of file +if errorlevel 1 exit 1 -- cgit v1.2.3