Revert "fix(tensorflow): mirror sglang EFA install pattern for 1.49"

This reverts commit f3c86f1. Restores
--disable-ngc in install_efa_amzn2023.sh.

Empirical result: sglang's cuda-rhel9 + symlink pattern does not satisfy
EFA 1.49's check_libnccl_net_so, which verifies the actual EFA-shipped
libnccl-net-ofi.so at /opt/amazon/ofi-nccl/lib64/. cuda-rhel9 installs
libnccl at /usr/lib64/ — different file at a different path. sglang's
pattern works on EFA 1.48 because 1.48's check has the buggy
/opt/amazon/efa/lib/ path that the symlink resolves through.

--disable-ngc remains the correct fix for 1.49: it forces the standard
install path, which installs libnccl-ofi-1.20.0-1.amzn2023.x86_64.rpm
directly from the EFA installer tarball to the correct location.

Author: Bhanu Teja Goshikonda

docker/tensorflow/2.21/Dockerfile.cuda

@@ -121,18 +121,8 @@ ENV PATH="/opt/venv/bin:${OPEN_MPI_PATH}/bin:${EFA_PATH}/bin:/usr/local/cuda/bin
 # (NCCL dlopens libnccl-net-ofi.so from this path).
 ENV LD_LIBRARY_PATH="/opt/amazon/openmpi/lib:/opt/amazon/efa/lib:/opt/amazon/ofi-nccl/lib64:/usr/local/cuda/lib64:/usr/local/lib:${LD_LIBRARY_PATH}"
 
-# Install EFA (mirrors SGLang: pre-install libnccl from cuda-rhel9 repo so the
-# system libnccl is present, symlink lib->lib64 so EFA 1.49's NGC-mode
-# post-install path check resolves, then clean up).
 COPY scripts/docker/common/install_efa_amzn2023.sh /tmp/install_efa.sh
-RUN echo -e '[cuda-rhel9]\nname=cuda-rhel9\nbaseurl=https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64\nenabled=1\ngpgcheck=1' >/etc/yum.repos.d/cuda-rhel9.repo \
-  && dnf install -y --setopt=install_weak_deps=False libnccl libnccl-devel \
-  && ldconfig \
-  && mkdir -p /opt/amazon/efa && ln -sf /opt/amazon/efa/lib64 /opt/amazon/efa/lib \
-  && bash /tmp/install_efa.sh "${EFA_VERSION}" \
-  && rm /tmp/install_efa.sh \
-  && dnf remove -y libnccl-devel \
-  && dnf clean all && rm -rf /var/cache/dnf
+RUN bash /tmp/install_efa.sh "${EFA_VERSION}" && rm /tmp/install_efa.sh
 
 # Wipe EFA's bundled OpenMPI before building OMPI 4.1.8 from source. Both
 # target /opt/amazon/openmpi; without this cleanup wrapper mpirun gets

scripts/docker/common/install_efa_amzn2023.sh

@@ -33,7 +33,18 @@ function install_efa {
     curl -O https://s3-us-west-2.amazonaws.com/aws-efa-installer/aws-efa-installer-${EFA_VERSION}.tar.gz
     tar -xf aws-efa-installer-${EFA_VERSION}.tar.gz
     cd aws-efa-installer
-    ./efa_installer.sh -y --skip-kmod --skip-limit-conf --no-verify
+
+    # EFA 1.48+ auto-detects NGC containers via /opt/nvidia/nvidia_entrypoint.sh
+    # (present in nvidia/cuda:*-amzn2023 bases) and then skips the AL2023
+    # libnccl-ofi RPM. Force the standard install path so the OFI-NCCL plugin
+    # is installed and libnccl-net-ofi.so ends up at /opt/amazon/ofi-nccl/lib64/.
+    # --disable-ngc was added in EFA 1.48; guard so 1.47 callers still work.
+    EFA_EXTRA_ARGS=""
+    if [[ "$EFA_VERSION" > "1.47.99" ]]; then
+        EFA_EXTRA_ARGS="--disable-ngc"
+    fi
+
+    ./efa_installer.sh -y --skip-kmod --skip-limit-conf --no-verify ${EFA_EXTRA_ARGS}
     rm -rf /tmp/efa
 
     mv ${OPEN_MPI_PATH}/bin/mpirun ${OPEN_MPI_PATH}/bin/mpirun.real