Commit aa16258c authored by Martin Reinecke's avatar Martin Reinecke

aesthetic tweaks

parent 469ae0ee
Pipeline #12734 passed with stage
in 4 minutes and 37 seconds
...@@ -92,16 +92,12 @@ Starting with a fresh Ubuntu installation move to a folder like ...@@ -92,16 +92,12 @@ Starting with a fresh Ubuntu installation move to a folder like
- Install pyHealpix: - Install pyHealpix:
git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
cd pyHealpix (cd pyHealpix && autoreconf -i && ./configure --prefix=$HOME/.local --enable-openmp --enable-native-optimizations && make -j4 install)
autoreconf -i && ./configure --prefix=$HOME/.local --enable-openmp --enable-native-optimizations && make -j4 && make install
cd ..
- Finally, NIFTy: - Finally, NIFTy:
git clone https://gitlab.mpcdf.mpg.de/ift/NIFTy.git git clone https://gitlab.mpcdf.mpg.de/ift/NIFTy.git
cd NIFTy (cd NIFTy && python setup.py install --user)
python setup.py install --user
cd ..
### Installation on Linux systems in general ### Installation on Linux systems in general
...@@ -139,16 +135,13 @@ may cause trouble. ...@@ -139,16 +135,13 @@ may cause trouble.
- Install NIFTy: - Install NIFTy:
git clone https://gitlab.mpcdf.mpg.de/ift/NIFTy.git git clone https://gitlab.mpcdf.mpg.de/ift/NIFTy.git
cd NIFTy (cd NIFTy && python setup.py install --user)
python setup.py install --user
cd ..
### 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 pip install nose parameterized
pip install parameterized
Afterwards the tests (including a coverage report) are run using the following Afterwards the tests (including a coverage report) are run using the following
command in the repository root: command in the repository root:
......
#!/bin/bash #!/bin/bash
apt-get install -y libhdf5-10 libhdf5-dev libhdf5-openmpi-10 libhdf5-openmpi-dev hdf5-tools apt-get install -y libhdf5-10 libhdf5-dev libhdf5-openmpi-10 libhdf5-openmpi-dev hdf5-tools
CC=mpicc HDF5_DIR=/usr/lib/x86_64-linux-gnu/hdf5/openmpi HDF5_MPI="ON" pip install --no-binary=h5py h5py
export CC=mpicc
export HDF5_DIR=/usr/lib/x86_64-linux-gnu/hdf5/openmpi
export HDF5_MPI="ON"
pip install --no-binary=h5py h5py
#!/bin/bash #!/bin/bash
apt-get install -y openmpi-bin libopenmpi-dev apt-get install -y openmpi-bin libopenmpi-dev
pip install mpi4py pip install mpi4py
\ No newline at end of file
#!/bin/bash #!/bin/bash
git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
cd pyHealpix (cd pyHealpix && autoreconf -i && ./configure --enable-openmp --enable-native-optimizations && make -j4 install)
autoreconf -i && ./configure --enable-openmp --enable-native-optimizations && make -j4 install
cd ..
rm -rf pyHealpix rm -rf pyHealpix
...@@ -3,7 +3,5 @@ ...@@ -3,7 +3,5 @@
apt-get install -y libatlas-base-dev libfftw3-bin libfftw3-dev libfftw3-double3 libfftw3-long3 libfftw3-mpi-dev libfftw3-mpi3 libfftw3-quad3 libfftw3-single3 apt-get install -y libatlas-base-dev libfftw3-bin libfftw3-dev libfftw3-double3 libfftw3-long3 libfftw3-mpi-dev libfftw3-mpi3 libfftw3-quad3 libfftw3-single3
git clone -b mpi https://github.com/fredros/pyFFTW.git git clone -b mpi https://github.com/fredros/pyFFTW.git
cd pyFFTW/ (cd pyFFTW && CC=mpicc python setup.py build_ext install)
CC=mpicc python setup.py build_ext install rm -rf pyFFTW
cd ..
rm -r pyFFTW
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