Skip to content

Commit eccdb03

Browse files
mrogowskimrogowski
committed
CI/CD: updates
1 parent f29b839 commit eccdb03

File tree

6 files changed

+65
-54
lines changed

6 files changed

+65
-54
lines changed

‎docker/oshmem/Dockerfile‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM ubuntu:latest
22

33
ENV INSTALL_DIR=/home/shmem
4+
RUN mkdir /home/shmem
45
ENV DEBIAN_FRONTEND=noninteractive
56

67
RUN apt-get update -y && apt-get install -y \
@@ -12,23 +13,21 @@ RUN apt-get update -y && apt-get install -y \
1213
libtool \
1314
python3 python3-pip python-is-python3
1415

15-
RUN mkdir /home/shmem
16-
1716
# Build UCX
18-
RUN cd $INSTALL_DIR && \
19-
wget -c https://github.com/openucx/ucx/releases/download/v1.13.1/ucx-1.13.1.tar.gz && \
20-
tar xf ucx-1.13.1.tar.gz && \
21-
cd ucx-1.13.1 && \
22-
./contrib/configure-release --prefix=$INSTALL_DIR/ucx-1.13.1/install && \
17+
RUN cd $INSTALL_DIR && \
18+
wget -c https://github.com/openucx/ucx/releases/download/v1.13.1/ucx-1.13.1.tar.gz && \
19+
tar xf ucx-1.13.1.tar.gz && \
20+
cd ucx-1.13.1 && \
21+
./contrib/configure-release --prefix=$INSTALL_DIR/ucx-1.13.1/install && \
2322
make -j && make install
2423

2524
# Build OpenMPI
26-
RUN cd $INSTALL_DIR && \
27-
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
28-
tar xf openmpi-4.1.4.tar.bz2 && \
29-
cd openmpi-4.1.4 && \
30-
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
31-
--with-ucx=/home/shmem/ucx-1.13.1/install && \
25+
RUN cd $INSTALL_DIR && \
26+
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
27+
tar xf openmpi-4.1.4.tar.bz2 && \
28+
cd openmpi-4.1.4 && \
29+
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
30+
--with-ucx=/home/shmem/ucx-1.13.1/install && \
3231
make -j && make install
3332

3433
ENV PATH="/home/shmem/openmpi-4.1.4/install/bin:${PATH}" \

‎docker/oshmem_fedora/Dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ 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 libevent libevent-devel python3 python3-devel python3-pip valgrind valgrind-devel && \
7+
dnf install -y git vim wget pkg-config make automake gcc gcc-c++ kernel-devel libtool lbzip2 hwloc hwloc-devel \
8+
pmix pmix-devel libevent libevent-devel python3 python3-devel python3-pip valgrind valgrind-devel && \
89
dnf clean all
910

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 && \
11+
RUN cd $INSTALL_DIR && \
12+
git clone https://github.com/openucx/ucx && \
13+
cd ucx && ./autogen.sh && \
14+
./contrib/configure-devel --prefix=$INSTALL_DIR/ucx-master/install && \
1415
make -j && make install
1516

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 && \
17+
RUN cd $INSTALL_DIR && \
18+
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
19+
tar xf openmpi-4.1.4.tar.bz2 && \
20+
cd openmpi-4.1.4 && \
21+
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
22+
--with-ucx=/home/shmem/ucx-master/install && \
2223
make -j && make install
2324

2425
ENV PATH=/home/shmem/openmpi-4.1.4/install/bin:"${PATH}" \

‎docker/oshmem_ubuntu/Dockerfile‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM ubuntu:latest
22
ENV INSTALL_DIR=/home/shmem
3+
RUN mkdir /home/shmem
34
ENV DEBIAN_FRONTEND=noninteractive
45

56
RUN apt-get update -y && apt-get install -y \
@@ -8,24 +9,22 @@ RUN apt-get update -y && apt-get install -y \
89
build-essential \
910
automake \
1011
libtool \
11-
wget \
12-
valgrind \
12+
wget \
13+
valgrind \
1314
python3 python3-pip python-is-python3
1415

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 && \
16+
RUN cd $INSTALL_DIR && \
17+
git clone https://github.com/openucx/ucx && \
18+
cd ucx && ./autogen.sh && \
19+
./contrib/configure-devel --prefix=$INSTALL_DIR/ucx-master/install && \
2120
make -j && make install
2221

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 && \
22+
RUN cd $INSTALL_DIR && \
23+
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
24+
tar xf openmpi-4.1.4.tar.bz2 && \
25+
cd openmpi-4.1.4 && \
26+
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
27+
--with-ucx=/home/shmem/ucx-master/install && \
2928
make -j && make install
3029

3130
ENV PATH=/home/shmem/openmpi-4.1.4/install/bin:"${PATH}" \

‎docker/oshmpi/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM ubuntu:latest
22

33
ENV INSTALL_DIR=/home/shmem
4+
RUN mkdir /home/shmem
45
ENV DEBIAN_FRONTEND=noninteractive
56

67
RUN apt-get update -y && apt-get install -y \
@@ -13,8 +14,6 @@ RUN apt-get update -y && apt-get install -y \
1314
mpich \
1415
python3 python3-pip python-is-python3
1516

16-
RUN mkdir /home/shmem
17-
1817
RUN cd $INSTALL_DIR && \
1918
git clone https://github.com/dalcinl/oshmpi -b fix-api-1.5 --recurse-submodules && \
2019
cd oshmpi && \

‎docker/osss/Dockerfile‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,32 @@ 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 && \
7+
dnf install -y git vim wget pkg-config make automake gcc gcc-c++ kernel-devel libtool lbzip2 hwloc hwloc-devel \
8+
pmix pmix-devel libevent libevent-devel python3 python3-devel python3-pip valgrind valgrind-devel && \
89
dnf clean all
910

1011
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 && \
12+
git clone https://github.com/openucx/ucx && \
13+
cd ucx && ./autogen.sh && \
14+
./contrib/configure-devel --prefix=$INSTALL_DIR/ucx-master/install && \
1515
make -j && make install
1616

17-
ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/usr/lib64/openmpi/bin:"${PATH}" \
17+
RUN cd $INSTALL_DIR && \
18+
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
19+
tar xf openmpi-4.1.4.tar.bz2 && \
20+
cd openmpi-4.1.4 && \
21+
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
22+
--with-ucx=/home/shmem/ucx-master/install && \
23+
make -j && make install
24+
25+
RUN cd $INSTALL_DIR && \
26+
git clone https://github.com/openshmem-org/osss-ucx osss-ucx && \
27+
cd osss-ucx/ && \
28+
./autogen.sh && \
29+
./configure --prefix=$INSTALL_DIR/osss-ucx/install --enable-debug --enable-logging --with-pmix --with-ucx=/home/shmem/ucx-master/install && \
30+
make -j && make install
31+
32+
ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/home/shmem/openmpi-4.1.4/install/bin:"${PATH}" \
1833
OMPI_ALLOW_RUN_AS_ROOT=1 \
1934
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
2035

‎docker/sos/Dockerfile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ RUN apt-get update -y && apt-get install -y \
2121
python3 python3-pip python-is-python3
2222

2323
# Build Libevent
24-
RUN cd $INSTALL_DIR && \
25-
wget -c https://github.com/libevent/libevent/releases/download/release-2.1.10-stable/libevent-2.1.10-stable.tar.gz && \
26-
tar -xzvf libevent-2.1.10-stable.tar.gz && \
27-
cd libevent-2.1.10-stable && \
28-
./autogen.sh && \
29-
./configure --prefix=$INSTALL_DIR/libevent-2.1.10-stable/install && \
24+
RUN cd $INSTALL_DIR && \
25+
wget -c https://github.com/libevent/libevent/releases/download/release-2.1.10-stable/libevent-2.1.10-stable.tar.gz && \
26+
tar -xzvf libevent-2.1.10-stable.tar.gz && \
27+
cd libevent-2.1.10-stable && \
28+
./autogen.sh && \
29+
./configure --prefix=$INSTALL_DIR/libevent-2.1.10-stable/install && \
3030
make clean all install
3131

3232
# Build Libfabric
@@ -50,6 +50,4 @@ RUN cd $INSTALL_DIR
5050

5151
ENV PATH="/home/shmem/SOS/install/bin:${PATH}"
5252

53-
WORKDIR $INSTALL_DIR/SOS/examples
54-
5553
RUN python -m pip install numpy cffi setuptools

0 commit comments

Comments
 (0)