diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-20 13:02:36 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-20 15:28:57 +0100 |
| commit | 5c33826855a8d88889cdbbfc78b27c86549715d5 (patch) | |
| tree | c202a0d6888c1f8d926f51e3d68cf023fa553d9a | |
| parent | 2d2be13aa9dcfc77afed1dbe52c78e5dce5a04fa (diff) | |
| download | astra-5c33826855a8d88889cdbbfc78b27c86549715d5.tar.gz astra-5c33826855a8d88889cdbbfc78b27c86549715d5.tar.bz2 astra-5c33826855a8d88889cdbbfc78b27c86549715d5.tar.xz astra-5c33826855a8d88889cdbbfc78b27c86549715d5.zip | |
Add check for scipy
The module matrix_c.pyx uses it.
| -rw-r--r-- | build/linux/configure.ac | 7 | ||||
| -rw-r--r-- | python/conda/meta.yaml | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 354bccc..5a04509 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -219,6 +219,13 @@ assert(LooseVersion(Cython.__version__)>=LooseVersion("0.13")) AC_MSG_ERROR(You need the six module to use the ASTRA toolbox in Python) fi AC_MSG_RESULT(yes) + AC_MSG_CHECKING(for scipy module) + ASTRA_TRY_PYTHON([import scipy],,HAVEPYTHON=no) + if test x$HAVEPYTHON = xno; then + AC_MSG_RESULT(no) + AC_MSG_ERROR(You need the scipy module to use the ASTRA toolbox in Python) + fi + AC_MSG_RESULT(yes) fi AC_SUBST(HAVEPYTHON) diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml index 41250dc..7e4679b 100644 --- a/python/conda/meta.yaml +++ b/python/conda/meta.yaml @@ -21,6 +21,7 @@ requirements: - python - cython >=0.13 - numpy + - scipy - six run: |