Commit 26bec12e authored by Martin Reinecke's avatar Martin Reinecke
Browse files

use new installation method for pyHealpix

parent 150a2752
......@@ -26,7 +26,6 @@ test_min:
test_mpi:
stage: test
script:
- ci/install_pyHealpix.sh
- ci/install_mpi4py.sh
- nosetests -vv
- nosetests3 -vv
......@@ -34,7 +33,6 @@ test_mpi:
test_mpi_fftw:
stage: test
script:
- ci/install_pyHealpix.sh
- ci/install_mpi4py.sh
- ci/install_pyfftw.sh
- nosetests -vv
......@@ -43,14 +41,13 @@ test_mpi_fftw:
test_mpi_fftw_hdf5:
stage: test
script:
- ci/install_pyHealpix.sh
- ci/install_mpi4py.sh
- ci/install_pyfftw.sh
- ci/install_h5py.sh
- mpiexec --allow-run-as-root -n 2 nosetests -x
- mpiexec --allow-run-as-root -n 2 nosetests3 -x
- mpiexec --allow-run-as-root -n 4 nosetests -x
- mpiexec --allow-run-as-root -n 4 nosetests3 -x
- OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 2 nosetests -x
- OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 2 nosetests3 -x
- OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests -x
- OMP_NUM_THREADS=1 mpiexec --allow-run-as-root -n 4 nosetests3 -x
- nosetests -x --with-coverage --cover-package=nifty --cover-branches
- >
coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }'
......
......@@ -14,10 +14,7 @@ ADD ci/requirements_extras.txt /tmp/requirements_extras.txt
RUN pip install --upgrade -r /tmp/requirements_extras.txt
# install pyHealpix, pyfftw and h5py
ADD ci/install_pyHealpix.sh /tmp/install_pyHealpix.sh
RUN cd /tmp && chmod +x install_pyHealpix.sh && ./install_pyHealpix.sh
# install pyfftw and h5py
ADD ci/install_mpi4py.sh /tmp/install_mpi4py.sh
RUN cd /tmp && chmod +x install_mpi4py.sh && ./install_mpi4py.sh
......
......@@ -91,8 +91,7 @@ Starting with a fresh Ubuntu installation move to a folder like
- Install pyHealpix:
git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
(cd pyHealpix && autoreconf -i && ./configure --prefix=$HOME/.local --enable-openmp --enable-native-optimizations && make -j4 install)
pip install --user git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
- Finally, NIFTy:
......@@ -123,14 +122,7 @@ may cause trouble.
- Install pyHealpix:
git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
cd pyHealpix
autoreconf -i && ./configure --prefix=`python-config --prefix` --enable-openmp --enable-native-optimizations && make -j4 && sudo make install
cd ..
(The third command installs the package system-wide. User-specific
installation would be preferrable, but we haven't found a simple recipe yet
how to determine the installation prefix ...)
pip install --user git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
- Install NIFTy:
......
#!/bin/bash
git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
(cd pyHealpix && autoreconf -i && ./configure --enable-openmp && make -j4 install)
(cd pyHealpix && autoreconf -i && PYTHON=python3 ./configure --enable-openmp && make -j4 install)
rm -rf pyHealpix
......@@ -8,3 +8,4 @@ coverage
git+https://gitlab.mpcdf.mpg.de/ift/mpi_dummy.git
git+https://gitlab.mpcdf.mpg.de/ift/keepers.git
git+https://gitlab.mpcdf.mpg.de/ift/D2O.git
git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
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