summaryrefslogtreecommitdiffstats
path: root/src/Python/fista-recipe
diff options
context:
space:
mode:
authoralgol <dkazanc@hotmail.com>2018-01-25 17:22:13 +0000
committeralgol <dkazanc@hotmail.com>2018-01-25 17:22:13 +0000
commit7edf78f4733379ddc093dc37650f5886bb03d98b (patch)
treec78c03166d90c06de88d5d78bed449041361da02 /src/Python/fista-recipe
parentef41d45779400ae029a14822df79d5d8910ef03d (diff)
parent993022bdddef2c81067db70be6c65a6f943c24bb (diff)
downloadregularization-7edf78f4733379ddc093dc37650f5886bb03d98b.tar.gz
regularization-7edf78f4733379ddc093dc37650f5886bb03d98b.tar.bz2
regularization-7edf78f4733379ddc093dc37650f5886bb03d98b.tar.xz
regularization-7edf78f4733379ddc093dc37650f5886bb03d98b.zip
Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction
Diffstat (limited to 'src/Python/fista-recipe')
-rw-r--r--src/Python/fista-recipe/build.sh10
-rw-r--r--src/Python/fista-recipe/meta.yaml29
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)'