Commit a79de160 authored by Philipp  Trunschke's avatar Philipp Trunschke
Browse files

update Dockerfiles

parent 2043273e
Pipeline #1550 failed with stages
in 19 minutes and 10 seconds
FROM firemarmot/xerus AS xerus
FROM quay.io/fenicsproject/stable:2017.1.0
FROM quay.io/fenicsproject/stable:current
USER root
WORKDIR "/tmp/"
......@@ -27,8 +27,8 @@ RUN apt-get -y install \
python3-numpy
# Check Python versions
RUN python -c'import sys; raise SystemExit("{0}.{1}".format(*sys.version_info) != "2.7")'
RUN python3 -c'import sys; raise SystemExit("{0}.{1}".format(*sys.version_info) != "3.5")'
RUN python -c'from __future__ import print_function; import sys; version = "{0}.{1}".format(*sys.version_info); print("python2-version:", version)'
RUN python3 -c'import sys; version = "{0}.{1}".format(*sys.version_info); print("python3-version:", version)'
# Clean apt
RUN apt-get clean && \
......
......@@ -3,18 +3,18 @@ USER root
WORKDIR "/tmp/"
# Check Python versions
RUN python -c'import sys; raise SystemExit("{0}.{1}".format(*sys.version_info) != "2.7")'
RUN python3 -c'import sys; raise SystemExit("{0}.{1}".format(*sys.version_info) != "3.5")'
RUN python -c'import sys; version = "{0}.{1}".format(*sys.version_info); print("python2-version:", version); raise SystemExit(version != "2.7")'
RUN python3 -c'import sys; version = "{0}.{1}".format(*sys.version_info); print("python3-version:", version); raise SystemExit(version != "3.6")'
# Install Xerus
RUN git clone https://git.hemio.de/xerus/xerus.git
WORKDIR "/tmp/xerus/"
RUN git checkout development && \
RUN git checkout pybind11 && \
cp ./docker/xerus/config.mk . && \
mkdir -p /usr/local/lib && \
mkdir -p /usr/local/include && \
mkdir -p /usr/local/lib/python2.7/site-packages && \
mkdir -p /usr/local/lib/python3.5/site-packages && \
mkdir -p /usr/local/lib/python3.6/site-packages && \
make install -j $(cat /tmp/NCORES_1)
RUN mkdir -p $(python -m site --user-site) && \
......
CXX = g++
PYTHON2_CONFIG = `python-config --cflags --ldflags`
PYTHON3_CONFIG = `python3-config --cflags --ldflags`
COMPATIBILITY = -std=c++17
COMPILE_THREADS = 8 # Number of threads to use during link time optimization.
HIGH_OPTIMIZATION = TRUE # Activates -O3 -march=native and some others
OTHER += -fopenmp
PYTHON2_CONFIG = `python-config --cflags --ldflags`
PYTHON3_CONFIG = `python3-config --cflags --ldflags`
LOGGING += -D XERUS_LOG_INFO # Information that is not linked to any unexpected behaviour but might nevertheless be of interest.
LOGGING += -D XERUS_LOGFILE # Use 'error.log' file instead of cerr
LOGGING += -D XERUS_LOG_ABSOLUTE_TIME # Print absolute times instead of relative to program time
......@@ -20,6 +21,3 @@ BLAS_LIBRARIES = -lopenblas -lgfortran # Openblas, serial
LAPACK_LIBRARIES = -llapacke -llapack # Standard Lapack + Lapacke libraries
SUITESPARSE = -L/usr/local/lib/suitesparse -lcholmod -lspqr
BOOST_LIBS = -lboost_filesystem
BOOST_PYTHON2 = -lboost_python-py27
BOOST_PYTHON3 = -lboost_python-py35
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