Commit f3cc0971 authored by Martin Reinecke's avatar Martin Reinecke

tweak installation

parent 1a7d9d99
Pipeline #23871 failed
...@@ -16,10 +16,7 @@ before_script: ...@@ -16,10 +16,7 @@ before_script:
test_min: test_min:
stage: test stage: test
script: script:
# - python setup.py install --user -f
# - python3 setup.py install --user -f
- nosetests -x --with-coverage --cover-package=nifty4 --cover-branches - nosetests -x --with-coverage --cover-package=nifty4 --cover-branches
- OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests -x --with-coverage --cover-package=nifty4 --cover-branches - OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests -x --with-coverage --cover-package=nifty4 --cover-branches
- OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests3 -x - OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests3 -x
- > - coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }'
coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }'
...@@ -66,33 +66,35 @@ Installation ...@@ -66,33 +66,35 @@ Installation
- [Python](http://www.python.org/) (v2.7.x or 3.5.x) - [Python](http://www.python.org/) (v2.7.x or 3.5.x)
- [NumPy](http://www.numpy.org/) - [NumPy](http://www.numpy.org/)
- [pyFFTW](https://pypi.python.org/pypi/pyFFTW)
Optional dependencies: Optional dependencies:
- [pyFFTW](https://pypi.python.org/pypi/pyFFTW)
- [pyHealpix](https://gitlab.mpcdf.mpg.de/ift/pyHealpix) - [pyHealpix](https://gitlab.mpcdf.mpg.de/ift/pyHealpix)
- [mpi4py](https://mpi4py.scipy.org) - [mpi4py](https://mpi4py.scipy.org)
### Sources ### Sources
The current version of Nifty3 can be obtained by cloning the repository: The current version of Nifty4 can be obtained by cloning the repository and
switching to the NIFTy_4 branch:
git clone https://gitlab.mpcdf.mpg.de/ift/NIFTy.git git clone https://gitlab.mpcdf.mpg.de/ift/NIFTy.git
git checkout NIFTy_4
### Installation via pip ### Installation via pip
It is possible to simply install NIFTy with all its dependencies via the command It is possible to simply install NIFTy with all its dependencies via the command
pip install --user --process-dependency-links --egg git+https://gitlab.mpcdf.mpg.de/ift/NIFTy.git@nifty4 pip install --user --process-dependency-links --egg git+https://gitlab.mpcdf.mpg.de/ift/NIFTy.git@NIFTy_4
### Running the tests ### Running the tests
In oder to run the tests one needs two additional packages: In oder to run the tests one needs two additional packages:
pip install nose parameterized pip install --user nose parameterized
Afterwards the tests (including a coverage report) are run using the following Afterwards the tests (including a coverage report) can be run using the
command in the repository root: following command in the repository root:
nosetests -x --with-coverage --cover-html --cover-package=nifty4 nosetests -x --with-coverage --cover-html --cover-package=nifty4
...@@ -125,9 +127,6 @@ The NIFTy package is licensed under the terms of the ...@@ -125,9 +127,6 @@ The NIFTy package is licensed under the terms of the
* * * * * * * * * *
**NIFTy** project homepage:
[](http://www.mpa-garching.mpg.de/ift/nifty/)
[1] Selig et al., "NIFTy - Numerical Information Field Theory - a [1] Selig et al., "NIFTy - Numerical Information Field Theory - a
versatile Python library for signal inference", [A&A, vol. 554, id. versatile Python library for signal inference", [A&A, vol. 554, id.
A26](http://dx.doi.org/10.1051/0004-6361/201321236), 2013; A26](http://dx.doi.org/10.1051/0004-6361/201321236), 2013;
......
parameterized parameterized
coverage coverage
pyfftw
git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
...@@ -30,7 +30,7 @@ setup(name="nifty4", ...@@ -30,7 +30,7 @@ setup(name="nifty4",
zip_safe=False, zip_safe=False,
license="GPLv3", license="GPLv3",
setup_requires=['future', 'numpy'], setup_requires=['future', 'numpy'],
install_requires=['future', 'numpy'], install_requires=['future', 'numpy', 'pyfftw>=0.10.4'],
classifiers=[ classifiers=[
"Development Status :: 4 - Beta", "Development Status :: 4 - Beta",
"Topic :: Utilities", "Topic :: Utilities",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment