fix

flexflow · Feb 17, 2025 · eddcdff · eddcdff
1 parent c658c22
commit eddcdff
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/docker/flexflow-environment/Dockerfile b/docker/flexflow-environment/Dockerfile
@@ -46,7 +46,8 @@ RUN MINICONDA_SCRIPT_NAME=Miniconda3-latest-Linux-x86_64.sh; \
 	/opt/conda/bin/conda config --set solver classic && \
         /opt/conda/bin/conda upgrade --all && \
         /opt/conda/bin/conda install conda-build conda-verify && \
-        /opt/conda/bin/conda clean -ya
+        /opt/conda/bin/conda clean -ya &&
+    ln -sf /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /opt/conda/lib/libstdc++.so.6
 
 # set MAKEFLAGS to speedup any dependency that uses make
 ARG N_BUILD_CORES
@@ -62,20 +63,6 @@ ARG FF_GPU_BACKEND "cuda"
 ARG cuda_version ""
 ARG hip_version "5.6"
 
-# Update NCCL if FF_GPU_BACKEND is cuda
-# RUN /bin/bash -c 'if [ "$FF_GPU_BACKEND" = "cuda" ]; then \
-#         echo "FF_GPU_BACKEND: ${FF_GPU_BACKEND}. Updating NCCL"; \
-#         ubuntu_version=$(lsb_release -rs); \
-#         ubuntu_version=${ubuntu_version//./}; \
-#         wget "https://developer.download.nvidia.com/compute/cuda/repos/ubuntu${ubuntu_version}/x86_64/cuda-keyring_1.0-1_all.deb"; \
-#         DEBIAN_FRONTEND=noninteractive dpkg -i cuda-keyring_1.0-1_all.deb; \
-#         DEBIAN_FRONTEND=noninteractive apt-get update -y --allow-change-held-packages; \
-#         rm -f cuda-keyring_1.0-1_all.deb; \
-#         DEBIAN_FRONTEND=noninteractive apt install -y --allow-change-held-packages libnccl2 libnccl-dev; \
-#     else \
-#         echo "FF_GPU_BACKEND: ${FF_GPU_BACKEND}. Skipping updating NCCL"; \
-#     fi'
-
 # Install hip dependencies if FF_GPU_BACKEND is hip_cuda or hip_rocm
 # Note that amd's docs say to also install the `hip-runtime-nvidia` package. This
 # package attempts to re-install cuda even though cuda is already installed
@@ -105,8 +92,6 @@ RUN  if [ "$FF_GPU_BACKEND" = "hip_cuda" ] || [ "$FF_GPU_BACKEND" = "hip_rocm" ]
         rm ./${AMD_GPU_SCRIPT_NAME}; \
         amdgpu-install -y --usecase=hip,rocm --no-dkms; \
         apt-get install -y hip-dev hipblas miopen-hip rocm-hip-sdk rocm-device-libs; \
-        # Install protobuf dependencies
-        # apt-get update -y && sudo apt-get install -y pkg-config zip g++ zlib1g-dev autoconf automake libtool make; \
     else \
         echo "FF_GPU_BACKEND: ${FF_GPU_BACKEND}. Skipping installing HIP dependencies"; \
     fi