Skip to content

Commit 5f16b9b

Browse files
add again necessary python packages
1 parent e204cd4 commit 5f16b9b

File tree

2 files changed

+29
-11
lines changed

2 files changed

+29
-11
lines changed

debian/Dockerfile

+14-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ RUN apt-get update \
2424
python3-pip python3-dev python3-venv\
2525
# needed for openmp with clang
2626
libomp-dev \
27-
doxygen
27+
doxygen\
28+
python3-pip python3-dev python3-venv \
29+
&& python3.12 -m venv .venv \
30+
&& .venv/bin/python -m pip install --no-cache-dir --upgrade\
31+
pip pytest wheel setuptools cmakelang scipy numpy \
32+
&& rm -rf /var/lib/apt/lists/*
2833

2934
FROM debian_base AS debian_gcc_openmpi
3035

@@ -44,7 +49,8 @@ RUN mkdir /tmp/openmpi-src \
4449
&& CC=gcc CXX=g++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
4550
&& make all ${OPENMPI_MAKE_OPTIONS} \
4651
&& make install \
47-
&& cd && rm -rf /tmp/openmpi-src && ldconfig
52+
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
53+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
4854

4955
#### ADD DEFAULT USER ####
5056
ARG USER=mpi
@@ -73,7 +79,8 @@ RUN mkdir /tmp/openmpi-src \
7379
&& CC=clang CXX=clang++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
7480
&& make all ${OPENMPI_MAKE_OPTIONS} \
7581
&& make install \
76-
&& cd && rm -rf /tmp/openmpi-src && ldconfig
82+
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
83+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
7784

7885
#### ADD DEFAULT USER ####
7986
ARG USER=mpi
@@ -102,7 +109,8 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
102109
&& CC=gcc CXX=g++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
103110
&& make ${MPICH_MAKE_OPTIONS} \
104111
&& make install \
105-
&& cd && rm -rf /tmp/mpich-src && ldconfig
112+
&& cd && rm -rf /tmp/mpich-src && ldconfig \
113+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
106114

107115
#### ADD DEFAULT USER ####
108116
ARG USER=mpi
@@ -131,7 +139,8 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
131139
&& CC=clang CXX=clang++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
132140
&& make ${MPICH_MAKE_OPTIONS} \
133141
&& make install \
134-
&& cd && rm -rf /tmp/mpich-src && ldconfig
142+
&& cd && rm -rf /tmp/mpich-src && ldconfig \
143+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
135144

136145
#### ADD DEFAULT USER ####
137146
ARG USER=mpi

ubuntu/Dockerfile

+15-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@ RUN apt-get update \
2222
liblapack-dev \
2323
libsuitesparse-dev \
2424
libomp-dev \
25-
doxygen \
26-
python3-pip python3-dev python3-venv
25+
doxygen\
26+
python3-pip python3-dev python3-venv \
27+
&& python3.12 -m venv .venv \
28+
&& .venv/bin/python -m pip install --no-cache-dir --upgrade\
29+
pip pytest wheel setuptools cmakelang scipy numpy \
30+
&& rm -rf /var/lib/apt/lists/*
31+
2732

2833

2934
FROM ubuntu_base AS ubuntu_gcc_openmpi
@@ -44,7 +49,8 @@ RUN mkdir /tmp/openmpi-src \
4449
&& CC=gcc CXX=g++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
4550
&& make all ${OPENMPI_MAKE_OPTIONS} \
4651
&& make install \
47-
&& cd && rm -rf /tmp/openmpi-src && ldconfig
52+
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
53+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
4854

4955
#### ADD DEFAULT USER ####
5056
ARG USER=mpi
@@ -73,7 +79,8 @@ RUN mkdir /tmp/openmpi-src \
7379
&& CC=clang CXX=clang++ ./configure ${OPENMPI_CONFIGURE_OPTIONS} \
7480
&& make all ${OPENMPI_MAKE_OPTIONS} \
7581
&& make install \
76-
&& cd && rm -rf /tmp/openmpi-src && ldconfig
82+
&& cd && rm -rf /tmp/openmpi-src && ldconfig \
83+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
7784

7885
#### ADD DEFAULT USER ####
7986
ARG USER=mpi
@@ -103,7 +110,8 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
103110
&& CC=gcc CXX=g++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
104111
&& make ${MPICH_MAKE_OPTIONS} \
105112
&& make install \
106-
&& cd && rm -rf /tmp/mpich-src && ldconfig
113+
&& cd && rm -rf /tmp/mpich-src && ldconfig \
114+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
107115

108116
#### ADD DEFAULT USER ####
109117
ARG USER=mpi
@@ -131,7 +139,8 @@ RUN mkdir /tmp/mpich-src && cd /tmp/mpich-src \
131139
&& CC=clang CXX=clang++ ./configure ${MPICH_CONFIGURE_OPTIONS} \
132140
&& make ${MPICH_MAKE_OPTIONS} \
133141
&& make install \
134-
&& cd && rm -rf /tmp/mpich-src && ldconfig
142+
&& cd && rm -rf /tmp/mpich-src && ldconfig \
143+
&& .venv/bin/python -m pip install --no-cache-dir mpi4py
135144

136145
#### ADD DEFAULT USER ####
137146
ARG USER=mpi

0 commit comments

Comments
 (0)