CI/CD: don't build libfabric

Author: mrogowski

docker/sos_fedora/Dockerfile

@@ -7,29 +7,21 @@ RUN mkdir /home/shmem
 
 RUN dnf update -y && \
     dnf install -y git vim wget pkg-config make automake gcc gcc-c++ kernel-devel libtool lbzip2 hwloc hwloc-devel \
-                   libevent libevent-devel python3 python3-devel python3-pip mpich && \
+                   libevent libevent-devel libfabric libfabric-devel python3 python3-devel python3-pip mpich && \
     dnf clean all
 
 ENV CC=gcc
 ENV CXX=g++
 
-# Build Libfabric
-RUN cd $INSTALL_DIR                                                                  && \
-    git clone -b v1.13.x --depth 10 https://github.com/ofiwg/libfabric.git libfabric && \
-    cd libfabric                                                                     && \
-    ./autogen.sh                                                                     && \
-    ./configure --prefix=$INSTALL_DIR/libfabric/install                              && \
-    make -j && make install
-
 # Build SOS
-RUN cd $INSTALL_DIR                                                                         && \
-    git clone https://github.com/Sandia-OpenSHMEM/SOS.git                                   && \
-    cd SOS                                                                                  && \
-    ./autogen.sh                                                                            && \
-    # To build SOS w/ basic Libfabric                                                          \
-    ./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi=$INSTALL_DIR/libfabric/install    \
-                --without-ucx --without-portals4 --enable-pmi-simple --disable-fortran      && \
-    make -j && make install                                                                 && \
+RUN cd $INSTALL_DIR                                                                    && \
+    git clone https://github.com/Sandia-OpenSHMEM/SOS.git                              && \
+    cd SOS                                                                             && \
+    ./autogen.sh                                                                       && \
+    # To build SOS w/ basic Libfabric                                                     \
+    ./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi                              \
+                --without-ucx --without-portals4 --enable-pmi-simple --disable-fortran && \
+    make -j && make install                                                            && \
     make check TESTS= -j
 
 ENV PATH="/home/shmem/SOS/install/bin:/usr/lib64/mpich/bin:${PATH}"

docker/sos_ubuntu/Dockerfile

@@ -18,26 +18,19 @@ RUN apt-get update -y && apt-get install -y \
   flex                                      \
   libhwloc-dev                              \
   libevent-dev                              \
+  libfabric1 libfabric-dev                  \
   mpich                                     \
   python3 python3-pip python-is-python3
 
-# Build Libfabric
-RUN cd $INSTALL_DIR                                                                 && \
-    git clone -b v1.7.x --depth 10 https://github.com/ofiwg/libfabric.git libfabric && \
-    cd libfabric                                                                    && \
-    ./autogen.sh                                                                    && \
-    ./configure --prefix=$INSTALL_DIR/libfabric/install                             && \
-    make -j && make install
-
 # Build SOS
-RUN cd $INSTALL_DIR                                                                         && \
-    git clone https://github.com/Sandia-OpenSHMEM/SOS.git                                   && \
-    cd SOS                                                                                  && \
-    ./autogen.sh                                                                            && \
-    # To build SOS w/ basic Libfabric                                                          \
-    ./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi=$INSTALL_DIR/libfabric/install    \
-                --without-ucx --without-portals4 --enable-pmi-simple --disable-fortran      && \
-    make -j && make install                                                                 && \
+RUN cd $INSTALL_DIR                                                                    && \
+    git clone https://github.com/Sandia-OpenSHMEM/SOS.git                              && \
+    cd SOS                                                                             && \
+    ./autogen.sh                                                                       && \
+    # To build SOS w/ basic Libfabric                                                     \
+    ./configure --prefix=$INSTALL_DIR/SOS/install --with-ofi                              \
+                --without-ucx --without-portals4 --enable-pmi-simple --disable-fortran && \
+    make -j && make install                                                            && \
     make check TESTS= -j
 
 ENV PATH="/home/shmem/SOS/install/bin:${PATH}"