Skip to content

Commit

Permalink
update openmpi/mpich versions
Browse files Browse the repository at this point in the history
  • Loading branch information
PierreMarchand20 committed Jul 29, 2024
1 parent 0f41fda commit cfcf8ab
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 36 deletions.
29 changes: 11 additions & 18 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,14 @@ RUN apt-get update \
python3-pip python3-dev python3-venv\
# needed for openmp with clang
libomp-dev \
doxygen \
&& pip3 --no-cache-dir install --upgrade pip \
&& pip3 --no-cache-dir install pytest wheel setuptools cmakelang scipy numpy \
&& rm -rf /var/lib/apt/lists/*
doxygen

FROM debian_base AS debian_gcc_openmpi

# Build Options:
# These options are passed to the steps below
ARG OPENMPI_VERSION="4.1.3"
ARG OPENMPI_MAJOR_VERSION="v4.1"
ARG OPENMPI_VERSION="5.0.5"
ARG OPENMPI_MAJOR_VERSION="v5.0"
ARG OPENMPI_CONFIGURE_OPTIONS=""
ARG OPENMPI_MAKE_OPTIONS="-j4"

Expand All @@ -45,8 +42,7 @@ RUN mkdir /tmp/openmpi-src \
&& CC=gcc CXX=g++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
&& make all ${OPENMPI_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/openmpi-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand All @@ -61,8 +57,8 @@ FROM debian_base AS debian_clang_openmpi

# Build Options:
# These options are passed to the steps below
ARG OPENMPI_VERSION="4.1.3"
ARG OPENMPI_MAJOR_VERSION="v4.1"
ARG OPENMPI_VERSION="5.0.5"
ARG OPENMPI_MAJOR_VERSION="v5.0"
ARG OPENMPI_CONFIGURE_OPTIONS="--disable-mpi-fortran"
ARG OPENMPI_MAKE_OPTIONS="-j4"

Expand All @@ -75,8 +71,7 @@ RUN mkdir /tmp/openmpi-src \
&& CC=clang CXX=clang++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
&& make all ${OPENMPI_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/openmpi-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand All @@ -93,7 +88,7 @@ FROM debian_base AS debian_gcc_mpich
# See installation guide of target MPICH version
# Ex: http://www.mpich.org/static/downloads/3.4/mpich-3.4-installguide.pdf
# These options are passed to the steps below
ARG MPICH_VERSION="4.0.2"
ARG MPICH_VERSION="4.2.2"
ARG MPICH_CONFIGURE_OPTIONS="FFLAGS=-fallow-argument-mismatch FCFLAGS=-fallow-argument-mismatch --enable-shared"
ARG MPICH_MAKE_OPTIONS="-j4"

Expand All @@ -105,8 +100,7 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
&& CC=gcc CXX=g++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
&& make ${MPICH_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/mpich-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/mpich-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand All @@ -123,7 +117,7 @@ FROM debian_base AS debian_clang_mpich
# See installation guide of target MPICH version
# Ex: http://www.mpich.org/static/downloads/3.4/mpich-3.4-installguide.pdf
# These options are passed to the steps below
ARG MPICH_VERSION="4.0.2"
ARG MPICH_VERSION="4.2.2"
ARG MPICH_CONFIGURE_OPTIONS="--disable-f90 --disable-fc --disable-fortran --enable-shared"
ARG MPICH_MAKE_OPTIONS="-j4"

Expand All @@ -135,8 +129,7 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
&& CC=clang CXX=clang++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
&& make ${MPICH_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/mpich-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/mpich-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand Down
29 changes: 11 additions & 18 deletions ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,15 @@ RUN apt-get update \
libsuitesparse-dev \
libomp-dev \
doxygen \
python3-pip python3-dev python3-venv\
&& pip3 --no-cache-dir install --upgrade pip \
&& pip3 --no-cache-dir install pytest wheel setuptools cmakelang scipy numpy \
&& rm -rf /var/lib/apt/lists/*
python3-pip python3-dev python3-venv


FROM ubuntu_base AS ubuntu_gcc_openmpi

# Build Options:
# These options are passed to the steps below
ARG OPENMPI_VERSION="4.1.3"
ARG OPENMPI_MAJOR_VERSION="v4.1"
ARG OPENMPI_VERSION="5.0.5"
ARG OPENMPI_MAJOR_VERSION="v5.0"
ARG OPENMPI_CONFIGURE_OPTIONS=""
ARG OPENMPI_MAKE_OPTIONS="-j4"

Expand All @@ -45,8 +42,7 @@ RUN mkdir /tmp/openmpi-src \
&& CC=gcc CXX=g++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
&& make all ${OPENMPI_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/openmpi-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand All @@ -61,8 +57,8 @@ FROM ubuntu_base AS ubuntu_clang_openmpi

# Build Options:
# These options are passed to the steps below
ARG OPENMPI_VERSION="4.1.3"
ARG OPENMPI_MAJOR_VERSION="v4.1"
ARG OPENMPI_VERSION="5.0.5"
ARG OPENMPI_MAJOR_VERSION="v5.0"
ARG OPENMPI_CONFIGURE_OPTIONS=""
ARG OPENMPI_MAKE_OPTIONS="-j4"

Expand All @@ -75,8 +71,7 @@ RUN mkdir /tmp/openmpi-src \
&& CC=clang CXX=clang++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
&& make all ${OPENMPI_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/openmpi-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand All @@ -94,7 +89,7 @@ FROM ubuntu_base AS ubuntu_gcc_mpich
# See installation guide of target MPICH version
# Ex: http://www.mpich.org/static/downloads/3.4/mpich-3.4-installguide.pdf
# These options are passed to the steps below
ARG MPICH_VERSION="4.0.2"
ARG MPICH_VERSION="4.2.2"
ARG MPICH_CONFIGURE_OPTIONS="FFLAGS=-fallow-argument-mismatch FCFLAGS=-fallow-argument-mismatch --enable-shared"
ARG MPICH_MAKE_OPTIONS="-j4"

Expand All @@ -106,8 +101,7 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
&& CC=gcc CXX=g++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
&& make ${MPICH_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/mpich-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/mpich-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand All @@ -123,7 +117,7 @@ FROM ubuntu_base AS ubuntu_clang_mpich
# See installation guide of target MPICH version
# Ex: http://www.mpich.org/static/downloads/3.4/mpich-3.4-installguide.pdf
# These options are passed to the steps below
ARG MPICH_VERSION="4.0.2"
ARG MPICH_VERSION="4.2.2"
ARG MPICH_CONFIGURE_OPTIONS="FFLAGS=-fallow-argument-mismatch FCFLAGS=-fallow-argument-mismatch --enable-shared"
ARG MPICH_MAKE_OPTIONS="-j4"

Expand All @@ -135,8 +129,7 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
&& CC=clang CXX=clang++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
&& make ${MPICH_MAKE_OPTIONS} \
&& make install \
&& cd && rm -rf /tmp/mpich-src && ldconfig \
&& pip3 --no-cache-dir install mpi4py
&& cd && rm -rf /tmp/mpich-src && ldconfig

#### ADD DEFAULT USER ####
ARG USER=mpi
Expand Down

0 comments on commit cfcf8ab

Please sign in to comment.