Skip to content

Commit 75ece71

Browse files
authored
Build SOS with the latest libfabric (#13)
1 parent 37655de commit 75ece71

File tree

3 files changed

+35
-20
lines changed

3 files changed

+35
-20
lines changed

.github/workflows/main.yml

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

docker/sos_fedora/Dockerfile

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,29 @@ RUN mkdir /home/shmem
77

88
RUN dnf update -y && \
99
dnf install -y git vim wget pkg-config make automake gcc gcc-c++ kernel-devel libtool lbzip2 hwloc hwloc-devel \
10-
libevent libevent-devel libfabric libfabric-devel python3 python3-devel python3-pip mpich && \
10+
libevent libevent-devel python3 python3-devel python3-pip mpich && \
1111
dnf clean all
1212

1313
ENV CC=gcc
1414
ENV CXX=g++
1515

16+
# Build Libfabric
17+
RUN cd $INSTALL_DIR && \
18+
git clone --depth 10 https://github.com/ofiwg/libfabric.git libfabric && \
19+
cd libfabric && \
20+
./autogen.sh && \
21+
./configure --prefix=$INSTALL_DIR/libfabric/install && \
22+
make -j && make install
23+
1624
# Build SOS
17-
RUN cd $INSTALL_DIR && \
18-
git clone https://github.com/Sandia-OpenSHMEM/SOS.git && \
19-
cd SOS && \
20-
./autogen.sh && \
21-
# To build SOS w/ basic Libfabric \
22-
./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi \
23-
--without-ucx --without-portals4 --enable-pmi-simple --disable-fortran && \
24-
make -j && make install && \
25+
RUN cd $INSTALL_DIR && \
26+
git clone https://github.com/Sandia-OpenSHMEM/SOS.git && \
27+
cd SOS && \
28+
./autogen.sh && \
29+
# To build SOS w/ basic Libfabric \
30+
./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi=$INSTALL_DIR/libfabric/install \
31+
--without-ucx --without-portals4 --enable-pmi-simple --disable-fortran && \
32+
make -j && make install && \
2533
make check TESTS= -j
2634

2735
ENV PATH="/home/shmem/SOS/install/bin:/usr/lib64/mpich/bin:${PATH}"

docker/sos_ubuntu/Dockerfile

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@ RUN apt-get update -y && apt-get install -y \
1818
flex \
1919
libhwloc-dev \
2020
libevent-dev \
21-
libfabric1 libfabric-dev \
2221
mpich \
2322
python3 python3-pip python-is-python3
2423

24+
# Build Libfabric
25+
RUN cd $INSTALL_DIR && \
26+
git clone --depth 10 https://github.com/ofiwg/libfabric.git libfabric && \
27+
cd libfabric && \
28+
./autogen.sh && \
29+
./configure --prefix=$INSTALL_DIR/libfabric/install && \
30+
make -j && make install
31+
2532
# Build SOS
26-
RUN cd $INSTALL_DIR && \
27-
git clone https://github.com/Sandia-OpenSHMEM/SOS.git && \
28-
cd SOS && \
29-
./autogen.sh && \
30-
# To build SOS w/ basic Libfabric \
31-
./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi \
32-
--without-ucx --without-portals4 --enable-pmi-simple --disable-fortran && \
33-
make -j && make install && \
33+
RUN cd $INSTALL_DIR && \
34+
git clone https://github.com/Sandia-OpenSHMEM/SOS.git && \
35+
cd SOS && \
36+
./autogen.sh && \
37+
# To build SOS w/ basic Libfabric \
38+
./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi=$INSTALL_DIR/libfabric/install \
39+
--without-ucx --without-portals4 --enable-pmi-simple --disable-fortran && \
40+
make -j && make install && \
3441
make check TESTS= -j
3542

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

0 commit comments

Comments
 (0)