Commit 035d41ad authored by Matt Clarkson's avatar Matt Clarkson

Issue #1: Further tidying up.

parent 2ddad2a9
......@@ -127,7 +127,9 @@ windows build:
- if (Test-Path ${Env:sb_dir}) { Remove-Item ${Env:sb_dir} -Recurse; }
- mkdir ${Env:sb_dir}
- cd ${Env:sb_dir}
- cmake -version
- python3 -m venv continuousenv
- continuousenv/Scripts/activate
- pip install numpy wheel six
- cmake -G "Visual Studio 15 2017 Win64"
-DCMAKE_BUILD_TYPE:STRING=Release
-DSKSURGERYGPUCPP_USE_CUDA:BOOL=OFF
......@@ -142,34 +144,41 @@ windows test:
stage: test
tags:
- shared-win, cuda
- shared-win
script:
- export src_dir=${CI_PROJECT_DIR}
- export git_hash=${CI_COMMIT_SHA:0:6}
- export sb_dir="${CI_PROJECT_DIR}-sb"
- export pb_dir="${sb_dir}/SKSURGERYGPUCPP-build"
- export sb_dir=${sb_dir//\\//}
- export src_dir=${src_dir//\\//}
- export pb_dir=${pb_dir//\\//}
- echo "Sources - ${src_dir}"
- echo "Commit - ${git_hash}"
- echo "Superbuild - ${sb_dir}"
- echo "Project build - ${pb_dir}"
- cd ${pb_dir}
- ${src_dir}/Utilities/ContinuousTest.bat
- ${Env:src_dir} = ${CI_PROJECT_DIR}
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-sb"
- ${Env:pb_dir} = "${Env:sb_dir}\SKSURGERYGPUCPP-build"
- echo "Sources - ${Env:src_dir}"
- echo "Superbuild - ${Env:sb_dir}"
- echo "Project build - ${Env:pb_dir}"
- ${Env:PATH} = "C:\Program Files\CMake\bin;C:\Python36;C:\Python36\Scripts;${Env:PATH}"
- pwd
- cd ${Env:sb_dir}
- pwd
- continuousenv/Scripts/activate
- cd ${Env:pb_dir}
- ctest -S CTestContinuous.cmake -V
- cd ${Env:src_dir}
- pip install pytest numpy opencv-contrib-python
- python setup.py bdist_wheel
- pip install dist/*
- python -c "import sksurgerygpupython as sk; sk.print_cuda_device_info()"
- python -c "import sksurgerygpupython as sk; import numpy as np; a = 2 * np.ones((4,4)); b = 3 * np.ones( (4,4)); c = sk.multiply_two_arrays(a,b); print(c)"
- python -m pytest -v -s ./Testing/
- deactivate
windows cleanup:
stage: cleanup
#when: always
when: always
tags:
- shared-win, cuda
- shared-win
script:
- export src_dir=${CI_PROJECT_DIR}
- export sb_dir="${CI_PROJECT_DIR}-sb"
- export sb_dir=${sb_dir//\\//}
- rm -rf ${sb_dir}
- ${Env:sb_dir} = "C:\gitlab-runner\scikit-surgerygpucpp-sb"
- if (Test-Path ${Env:sb_dir}) { Remove-Item ${Env:sb_dir} -Recurse; if ($LastExitCode -ne 0) {throw $LastExitCode} }
- if ($LastExitCode -ne 0) {throw $LastExitCode}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment