diff options
| author | Daniil Kazantsev <dkazanc3@googlemail.com> | 2018-04-09 15:17:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 15:17:24 +0100 |
| commit | 62635199f4e5a464a267ffce070ecec68bfdcfe8 (patch) | |
| tree | cdc7c4469e210a52cb416b2747ca2d954da073cc /Wrappers/Python/conda-recipe | |
| parent | a5b5872b76bf00023a7e7cee97e028003ccbc45e (diff) | |
| parent | b9fafd363d1d181a4a8b42ea4038924097207913 (diff) | |
| download | regularization-62635199f4e5a464a267ffce070ecec68bfdcfe8.tar.gz regularization-62635199f4e5a464a267ffce070ecec68bfdcfe8.tar.bz2 regularization-62635199f4e5a464a267ffce070ecec68bfdcfe8.tar.xz regularization-62635199f4e5a464a267ffce070ecec68bfdcfe8.zip | |
Merge pull request #47 from vais-ral/add3Dtests
major renaming and new 3D demos for Matlab
Diffstat (limited to 'Wrappers/Python/conda-recipe')
| -rw-r--r-- | Wrappers/Python/conda-recipe/bld.bat | 4 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/build.sh | 4 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Wrappers/Python/conda-recipe/bld.bat b/Wrappers/Python/conda-recipe/bld.bat index 850905c..e47f8d9 100644 --- a/Wrappers/Python/conda-recipe/bld.bat +++ b/Wrappers/Python/conda-recipe/bld.bat @@ -11,7 +11,7 @@ cd %SRC_DIR%\ccpi\Python :: issue cmake to create setup.py cmake . -%PYTHON% setup-regularizers.py build_ext +%PYTHON% setup-regularisers.py build_ext if errorlevel 1 exit 1 -%PYTHON% setup-regularizers.py install +%PYTHON% setup-regularisers.py install if errorlevel 1 exit 1 diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index 9ea4161..8b05663 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -13,7 +13,7 @@ echo "$SRC_DIR/ccpi/Python" cmake . -$PYTHON setup-regularizers.py build_ext -$PYTHON setup-regularizers.py install +$PYTHON setup-regularisers.py build_ext +$PYTHON setup-regularisers.py install diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index f4cb471..5336d14 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -1,5 +1,5 @@ package: - name: ccpi-regularizer + name: ccpi-regulariser version: {{ environ['CIL_VERSION'] }} @@ -17,7 +17,7 @@ requirements: #- boost ==1.64.0 #- boost-cpp ==1.64.0 - cython - - cil_regularizer + - cil_regulariser - vc 14 # [win and py35] - vc 9 # [win and py27] - cmake @@ -26,7 +26,7 @@ requirements: - python - numpy x.x #- boost ==1.64 - - cil_regularizer + - cil_regulariser - vc 14 # [win and py35] - vc 9 # [win and py27] |