diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-29 15:46:04 +0000 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-29 15:46:04 +0000 |
| commit | 4338380a8b540345096052ee30d8bbf668ce3c57 (patch) | |
| tree | 4ffc8f08d9dcdfbceb068ca4c2a1fc19527610cd /Wrappers/Python/conda-recipe | |
| parent | 5df7f2f5c18913f83b64bab12f6bf17df0bc4b01 (diff) | |
finds boost libraries during wrappers build (win)
finds and set the correct name for the boost libraries. Builds GPU wrapper
if CUDA is found.
Diffstat (limited to 'Wrappers/Python/conda-recipe')
| -rw-r--r-- | Wrappers/Python/conda-recipe/bld.bat | 7 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 6 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Wrappers/Python/conda-recipe/bld.bat b/Wrappers/Python/conda-recipe/bld.bat index fe3ddae..850905c 100644 --- a/Wrappers/Python/conda-recipe/bld.bat +++ b/Wrappers/Python/conda-recipe/bld.bat @@ -8,7 +8,10 @@ ROBOCOPY /E "%RECIPE_DIR%\..\.." "%SRC_DIR%\ccpi" ROBOCOPY /E "%RECIPE_DIR%\..\..\..\Core" "%SRC_DIR%\Core" cd %SRC_DIR%\ccpi\Python -%PYTHON% setup.py build_ext +:: issue cmake to create setup.py +cmake . + +%PYTHON% setup-regularizers.py build_ext if errorlevel 1 exit 1 -%PYTHON% setup.py install +%PYTHON% setup-regularizers.py install if errorlevel 1 exit 1 diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index aaf9a69..9ea4161 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -11,7 +11,9 @@ cd $SRC_DIR/ccpi/Python echo "$SRC_DIR/ccpi/Python" -$PYTHON setup.py build_ext -$PYTHON setup.py install +cmake . + +$PYTHON setup-regularizers.py build_ext +$PYTHON setup-regularizers.py install diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index c451b37..8b58738 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -21,6 +21,7 @@ requirements: - cil_regularizer - vc 14 # [win and py35] - vc 9 # [win and py27] + - cmake run: - python ==2.7 # [py27] |