From 63463080b44dbbe2f6e9eddc4c5626a50860f2a9 Mon Sep 17 00:00:00 2001
From: Raghu Raja <raghunch@amazon.com>
Date: Tue, 21 May 2024 17:53:09 +0000
Subject: [PATCH] distcheck: Use the EFA installer like the other steps

Signed-off-by: Raghu Raja <raghunch@amazon.com>
---
 .github/workflows/distcheck.yaml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/distcheck.yaml b/.github/workflows/distcheck.yaml
index dc54f4db3..9f8ab0003 100644
--- a/.github/workflows/distcheck.yaml
+++ b/.github/workflows/distcheck.yaml
@@ -28,8 +28,9 @@ jobs:
         run: |
           curl -O https://efa-installer.amazonaws.com/aws-efa-installer-${{ matrix.efainstaller }}.tar.gz
           tar -xvf aws-efa-installer-*.tar.gz
-          cd aws-efa-installer/RPMS/ALINUX2/x86_64
-          find . | grep rpm$ | xargs sudo yum -y localinstall
+          pushd aws-efa-installer/
+              sudo ./efa_installer.sh -y --skip-kmod
+          popd
 
       - name: Install hwloc, utilities.
         run: |
@@ -96,21 +97,12 @@ jobs:
           # Install Neuron Runtime
           sudo apt-get install aws-neuronx-runtime-lib -y
 
-      - name: Install Libfabric
+      - name: Fetch and Install EFA Installer Dependencies
         run: |
-          # We're just doing distchecks, so it is fine if we
-          # just grab the latest master and built a lean build.
-          git clone --depth 1 https://github.com/ofiwg/libfabric.git
-          pushd libfabric
-          ./autogen.sh
-          ./configure --prefix=$PWD/install \
-                      --disable-sockets \
-                      --disable-udp \
-                      --disable-mrail \
-                      --disable-opx \
-                      CC=${{ matrix.cc }}
-          make -j $(nproc)
-          make install
+          curl -O https://efa-installer.amazonaws.com/aws-efa-installer-latest.tar.gz
+          tar -xvf aws-efa-installer-*.tar.gz
+          pushd aws-efa-installer/
+              sudo ./efa_installer.sh -y --skip-kmod
           popd
 
       - name: Build Plugin
@@ -122,12 +114,14 @@ jobs:
           ./autogen.sh
           if [ ${{ matrix.sdk }} == "cuda" ]
           then
-            ./configure --with-libfabric=$PWD/libfabric/install \
+            ./configure --with-libfabric=/opt/amazon/efa/ \
+                        --with-mpi=/opt/amazon/openmpi/ \
                         --with-cuda=/usr/local/cuda/ \
                         --enable-platform-aws \
                         CC=${{ matrix.cc }}
           else
-            ./configure --with-libfabric=$PWD/libfabric/install \
+            ./configure --with-libfabric=/opt/amazon/efa/ \
+                        --with-mpi=/opt/amazon/openmpi/ \
                         --enable-neuron \
                         --enable-platform-aws \
                         CC=${{ matrix.cc }}