diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-25 21:55:28 +0000 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-01-25 21:55:28 +0000 |
| commit | dea3fee71df68034223948f1f992814081994517 (patch) | |
| tree | 2eceac615ef26d9565538d35ec3159aeda9eb800 /src/Python/fista-recipe | |
| parent | 542eda7340dd8ed74eb5a2e492bc5171ecd588af (diff) | |
| parent | d274c376cfb5bcb11e8ce72ea57f921c4149eb7e (diff) | |
| download | regularization-dea3fee71df68034223948f1f992814081994517.tar.gz regularization-dea3fee71df68034223948f1f992814081994517.tar.bz2 regularization-dea3fee71df68034223948f1f992814081994517.tar.xz regularization-dea3fee71df68034223948f1f992814081994517.zip | |
Merge branch 'master' into gpu
Diffstat (limited to 'src/Python/fista-recipe')
| -rw-r--r-- | src/Python/fista-recipe/build.sh | 10 | ||||
| -rw-r--r-- | src/Python/fista-recipe/meta.yaml | 29 |
2 files changed, 0 insertions, 39 deletions
diff --git a/src/Python/fista-recipe/build.sh b/src/Python/fista-recipe/build.sh deleted file mode 100644 index e3f3552..0000000 --- a/src/Python/fista-recipe/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ -z "$CIL_VERSION" ]; then - echo "Need to set CIL_VERSION" - exit 1 -fi -mkdir "$SRC_DIR/ccpifista" -cp -r "$RECIPE_DIR/.." "$SRC_DIR/ccpifista" - -cd $SRC_DIR/ccpifista - -$PYTHON setup-fista.py install diff --git a/src/Python/fista-recipe/meta.yaml b/src/Python/fista-recipe/meta.yaml deleted file mode 100644 index 265541f..0000000 --- a/src/Python/fista-recipe/meta.yaml +++ /dev/null @@ -1,29 +0,0 @@ -package: - name: ccpi-fista - version: {{ environ['CIL_VERSION'] }} - - -build: - preserve_egg_dir: False - script_env: - - CIL_VERSION -# number: 0 - -requirements: - build: - - python - - numpy - - setuptools - - run: - - python - - numpy - #- astra-toolbox - - ccpi-regularizers - - - -about: - home: http://www.ccpi.ac.uk - license: Apache v.2.0 license - summary: 'CCPi Core Imaging Library (Viewer)' |