Skip to content

Commit ea97d2c

Browse files
mrogowskimrogowski
authored
Fix lock issues on Ubuntu by using UCX release rather than master (#16)
Use ucx_v1.14.1
1 parent 8cf1963 commit ea97d2c

File tree

5 files changed

+34
-30
lines changed

5 files changed

+34
-30
lines changed

‎.github/workflows/containers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
uses: actions/checkout@v3
2525
- uses: jpribyl/[email protected]
2626
with:
27-
key: ${{ matrix.shmem }}-4-{hash}
27+
key: ${{ matrix.shmem }}-5-{hash}
2828
restore-keys: |
29-
${{ matrix.shmem }}-4-
29+
${{ matrix.shmem }}-5-
3030
- name: Build Docker container
3131
run: docker build -t local docker/${{ matrix.shmem }}/
3232
- name: run shmem4py test-1

‎docker/oshmem_fedora/Dockerfile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ RUN dnf update -y && \
88
pmix pmix-devel libevent libevent-devel python3 python3-devel python3-pip && \
99
dnf clean all
1010

11-
RUN cd $INSTALL_DIR && \
12-
git clone https://github.com/openucx/ucx && \
13-
cd ucx && ./autogen.sh && \
14-
./configure --prefix=$INSTALL_DIR/ucx-master/install --disable-debug --disable-assertions --disable-params-check && \
11+
RUN cd $INSTALL_DIR && \
12+
wget https://github.com/openucx/ucx/archive/refs/tags/v1.14.1.tar.gz && \
13+
tar xf v1.14.1.tar.gz && \
14+
cd ucx-1.14.1 && ./autogen.sh && \
15+
./configure CFLAGS=-Wno-error --prefix=$INSTALL_DIR/ucx/install --disable-debug --disable-assertions --disable-params-check && \
1516
make -j && make install
1617

1718
RUN cd $INSTALL_DIR && \
1819
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
1920
tar xf openmpi-4.1.4.tar.bz2 && \
2021
cd openmpi-4.1.4 && \
2122
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
22-
--with-ucx=/home/shmem/ucx-master/install && \
23+
--with-ucx=/home/shmem/ucx/install && \
2324
make -j && make install
2425

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

‎docker/oshmem_ubuntu/Dockerfile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ RUN apt-get update -y && apt-get install -y \
1212
wget \
1313
python3 python3-pip python-is-python3
1414

15-
RUN cd $INSTALL_DIR && \
16-
git clone https://github.com/openucx/ucx && \
17-
cd ucx && ./autogen.sh && \
18-
./configure --prefix=$INSTALL_DIR/ucx-master/install --disable-debug --disable-assertions --disable-params-check && \
15+
RUN cd $INSTALL_DIR && \
16+
wget https://github.com/openucx/ucx/archive/refs/tags/v1.14.1.tar.gz && \
17+
tar xf v1.14.1.tar.gz && \
18+
cd ucx-1.14.1 && ./autogen.sh && \
19+
./configure CFLAGS=-Wno-error --prefix=$INSTALL_DIR/ucx/install --disable-debug --disable-assertions --disable-params-check && \
1920
make -j && make install
2021

2122
RUN cd $INSTALL_DIR && \
2223
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
2324
tar xf openmpi-4.1.4.tar.bz2 && \
2425
cd openmpi-4.1.4 && \
2526
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
26-
--with-ucx=/home/shmem/ucx-master/install && \
27+
--with-ucx=/home/shmem/ucx/install && \
2728
make -j && make install
2829

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

‎docker/osss_fedora/Dockerfile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,26 @@ RUN dnf update -y && \
88
pmix pmix-devel libevent libevent-devel python3 python3-devel python3-pip && \
99
dnf clean all
1010

11-
RUN cd $INSTALL_DIR && \
12-
git clone https://github.com/openucx/ucx && \
13-
cd ucx && ./autogen.sh && \
14-
./configure --prefix=$INSTALL_DIR/ucx-master/install --disable-debug --disable-assertions --disable-params-check && \
11+
RUN cd $INSTALL_DIR && \
12+
wget https://github.com/openucx/ucx/archive/refs/tags/v1.14.1.tar.gz && \
13+
tar xf v1.14.1.tar.gz && \
14+
cd ucx-1.14.1 && ./autogen.sh && \
15+
./configure CFLAGS=-Wno-error --prefix=$INSTALL_DIR/ucx/install --disable-debug --disable-assertions --disable-params-check && \
1516
make -j && make install
1617

1718
RUN cd $INSTALL_DIR && \
1819
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
1920
tar xf openmpi-4.1.4.tar.bz2 && \
2021
cd openmpi-4.1.4 && \
2122
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
22-
--with-ucx=/home/shmem/ucx-master/install && \
23+
--with-ucx=/home/shmem/ucx/install && \
2324
make -j && make install
2425

2526
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 && \
27+
git clone https://github.com/openshmem-org/osss-ucx osss-ucx && \
28+
cd osss-ucx/ && \
29+
./autogen.sh && \
30+
./configure --prefix=$INSTALL_DIR/osss-ucx/install --enable-debug --enable-logging --with-pmix --with-ucx=/home/shmem/ucx/install && \
3031
make -j && make install
3132

3233
ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/home/shmem/openmpi-4.1.4/install/bin:"${PATH}" \

‎docker/osss_ubuntu/Dockerfile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,26 @@ RUN apt-get update -y && apt-get install -y \
1515
libpmix-bin libpmix-dev \
1616
python3 python3-pip python-is-python3
1717

18-
RUN cd $INSTALL_DIR && \
19-
git clone https://github.com/openucx/ucx && \
20-
cd ucx && ./autogen.sh && \
21-
./configure --prefix=$INSTALL_DIR/ucx-master/install --disable-debug --disable-assertions --disable-params-check && \
18+
RUN cd $INSTALL_DIR && \
19+
wget https://github.com/openucx/ucx/archive/refs/tags/v1.14.1.tar.gz && \
20+
tar xf v1.14.1.tar.gz && \
21+
cd ucx-1.14.1 && ./autogen.sh && \
22+
./configure CFLAGS=-Wno-error --prefix=$INSTALL_DIR/ucx/install --disable-debug --disable-assertions --disable-params-check && \
2223
make -j && make install
2324

2425
RUN cd $INSTALL_DIR && \
2526
wget -c https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.4.tar.bz2 && \
2627
tar xf openmpi-4.1.4.tar.bz2 && \
2728
cd openmpi-4.1.4 && \
2829
./configure --enable-oshmem --prefix=$INSTALL_DIR/openmpi-4.1.4/install \
29-
--with-ucx=/home/shmem/ucx-master/install && \
30+
--with-ucx=/home/shmem/ucx/install && \
3031
make -j && make install
3132

3233
RUN cd $INSTALL_DIR && \
33-
git clone https://github.com/openshmem-org/osss-ucx osss-ucx && \
34-
cd osss-ucx/ && \
35-
./autogen.sh && \
36-
./configure --prefix=$INSTALL_DIR/osss-ucx/install --enable-debug --enable-logging --with-pmix --with-ucx=/home/shmem/ucx-master/install && \
34+
git clone https://github.com/openshmem-org/osss-ucx osss-ucx && \
35+
cd osss-ucx/ && \
36+
./autogen.sh && \
37+
./configure --prefix=$INSTALL_DIR/osss-ucx/install --enable-debug --enable-logging --with-pmix --with-ucx=/home/shmem/ucx/install && \
3738
make -j && make install
3839

3940
ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/home/shmem/openmpi-4.1.4/install/bin:"${PATH}" \

0 commit comments

Comments
 (0)