Skip to content

Commit f29b839

Browse files
committed
CI/CD: update Dockerfiles
1 parent eb59109 commit f29b839

File tree

5 files changed

+40
-15
lines changed

5 files changed

+40
-15
lines changed

docker/oshmem/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:latest
22

33
ENV INSTALL_DIR=/home/shmem
44
ENV DEBIAN_FRONTEND=noninteractive

docker/oshmem_fedora/Dockerfile

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,24 @@ ENV INSTALL_DIR=/home/shmem
44
RUN mkdir /home/shmem
55

66
RUN dnf update -y && \
7-
dnf install -y git vim wget pkg-config make automake gcc gcc-c++ kernel-devel libtool lbzip2 hwloc hwloc-devel pmix pmix-devel ucx ucx-devel libevent libevent-devel python3 python3-devel python3-pip openmpi openmpi-devel && \
7+
dnf install -y git vim wget pkg-config make automake gcc gcc-c++ kernel-devel libtool lbzip2 hwloc hwloc-devel pmix pmix-devel libevent libevent-devel python3 python3-devel python3-pip valgrind valgrind-devel && \
88
dnf clean all
99

10-
#RUN cd $INSTALL_DIR && \
11-
# git clone https://github.com/openshmem-org/osss-ucx osss-ucx && \
12-
# cd osss-ucx/ && \
13-
# ./autogen.sh && \
14-
# ./configure --prefix=$INSTALL_DIR/osss-ucx/install --enable-debug --enable-logging --with-pmix --with-ucx && \
15-
# make -j && make install
10+
RUN cd $INSTALL_DIR && \
11+
git clone https://github.com/openucx/ucx && \
12+
cd ucx && ./autogen.sh && \
13+
./contrib/configure-devel --prefix=$INSTALL_DIR/ucx-master/install && \
14+
make -j && make install
1615

17-
ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/usr/lib64/openmpi/bin:"${PATH}" \
16+
RUN cd $INSTALL_DIR && \
17+
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
18+
tar xf openmpi-4.1.4.tar.bz2 && \
19+
cd openmpi-4.1.4 && \
20+
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
21+
--with-ucx=/home/shmem/ucx-master/install && \
22+
make -j && make install
23+
24+
ENV PATH=/home/shmem/openmpi-4.1.4/install/bin:"${PATH}" \
1825
OMPI_ALLOW_RUN_AS_ROOT=1 \
1926
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
2027

docker/oshmem_ubuntu/Dockerfile

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM ubuntu:22.04
2-
1+
FROM ubuntu:latest
2+
ENV INSTALL_DIR=/home/shmem
33
ENV DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -y && apt-get install -y \
@@ -8,10 +8,28 @@ RUN apt-get update -y && apt-get install -y \
88
build-essential \
99
automake \
1010
libtool \
11-
openmpi-bin libopenmpi-dev \
11+
wget \
12+
valgrind \
1213
python3 python3-pip python-is-python3
1314

14-
ENV OMPI_ALLOW_RUN_AS_ROOT=1 \
15+
RUN mkdir /home/shmem
16+
17+
RUN cd $INSTALL_DIR && \
18+
git clone https://github.com/openucx/ucx && \
19+
cd ucx && ./autogen.sh && \
20+
./contrib/configure-devel --prefix=$INSTALL_DIR/ucx-master/install && \
21+
make -j && make install
22+
23+
RUN cd $INSTALL_DIR && \
24+
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
25+
tar xf openmpi-4.1.4.tar.bz2 && \
26+
cd openmpi-4.1.4 && \
27+
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
28+
--with-ucx=/home/shmem/ucx-master/install && \
29+
make -j && make install
30+
31+
ENV PATH=/home/shmem/openmpi-4.1.4/install/bin:"${PATH}" \
32+
OMPI_ALLOW_RUN_AS_ROOT=1 \
1533
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1634

1735
RUN python -m pip install numpy cffi

docker/oshmpi/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:latest
22

33
ENV INSTALL_DIR=/home/shmem
44
ENV DEBIAN_FRONTEND=noninteractive

docker/sos/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# adapted from https://github.com/Sandia-OpenSHMEM/SOS/blob/master/scripts/docker/Dockerfile
22

3-
FROM ubuntu:22.04
3+
FROM ubuntu:latest
44

55
ENV INSTALL_DIR=/home/shmem
66
RUN mkdir /home/shmem

0 commit comments

Comments
 (0)