Merge branch 'main' into djl

Author: sirutBuasai

.github/workflows/pr-vllm.yml

@@ -21,11 +21,11 @@ env:
   OS_VERSION: "ubuntu22.04"
 
   # vLLM EC2
-  VLLM_VERSION: 0.14.0
-  PROD_EC2_IMAGE: vllm:0.14-gpu-py312-ec2
+  VLLM_VERSION: 0.15.0
+  PROD_EC2_IMAGE: vllm:0.15-gpu-py312-ec2
 
   # vLLM SageMaker
-  PROD_SAGEMAKER_IMAGE: vllm:0.14-gpu-py312
+  PROD_SAGEMAKER_IMAGE: vllm:0.15-gpu-py312
 
   # vLLM RayServe
   VLLM_RAYSERVE_VERSION: 0.10.2
@@ -192,7 +192,7 @@ jobs:
 
       - name: Setup for vLLM tests
         run: |
-          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_14_0_test_setup.sh
+          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_15_0_test_setup.sh
 
       - name: Run vLLM tests
         run: |
@@ -238,7 +238,7 @@ jobs:
 
       - name: Setup for vLLM tests
         run: |
-          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_14_0_test_setup.sh
+          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_15_0_test_setup.sh
 
       - name: Run vLLM tests
         run: |
@@ -284,7 +284,7 @@ jobs:
 
       - name: Setup for vLLM tests
         run: |
-          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_14_0_test_setup.sh
+          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_15_0_test_setup.sh
 
       - name: Run vLLM tests
         run: |
@@ -594,7 +594,7 @@ jobs:
 
       - name: Setup for vLLM tests
         run: |
-          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_14_0_test_setup.sh
+          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_15_0_test_setup.sh
 
       - name: Run vLLM tests
         run: |
@@ -640,7 +640,7 @@ jobs:
 
       - name: Setup for vLLM tests
         run: |
-          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_14_0_test_setup.sh
+          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_15_0_test_setup.sh
 
       - name: Run vLLM tests
         run: |
@@ -686,7 +686,7 @@ jobs:
 
       - name: Setup for vLLM tests
         run: |
-          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_14_0_test_setup.sh
+          docker exec ${CONTAINER_ID} scripts/vllm/vllm_0_15_0_test_setup.sh
 
       - name: Run vLLM tests
         run: |

docker/vllm/Dockerfile

@@ -1,6 +1,6 @@
 # Declare the argument as default to use as input
 # base image: https://hub.docker.com/r/vllm/vllm-openai/tags
-ARG BASE_IMAGE=vllm/vllm-openai:v0.14.0
+ARG BASE_IMAGE=vllm/vllm-openai:v0.15.0
 
 # Use input argument as base image
 FROM $BASE_IMAGE AS base
@@ -19,7 +19,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
   PYTHONDONTWRITEBYTECODE=1 \
   PYTHONUNBUFFERED=1 \
   PYTHONIOENCODING=UTF-8 \
-  LD_LIBRARY_PATH="/usr/local/lib:/opt/amazon/ofi-nccl/lib:/opt/amazon/openmpi/lib:/opt/amazon/efa/lib:/usr/local/cuda/lib64:${LD_LIBRARY_PATH}" \
+  LD_LIBRARY_PATH="/opt/amazon/ofi-nccl/lib:/opt/amazon/openmpi/lib:/opt/amazon/efa/lib:/usr/local/cuda/lib64:${LD_LIBRARY_PATH}" \
   PATH="/opt/amazon/openmpi/bin:/opt/amazon/efa/bin:/usr/local/cuda/bin:${PATH}"
 
 WORKDIR /
@@ -65,6 +65,11 @@ RUN bash install_efa.sh ${EFA_VERSION} \
   && rm -rf /usr/local/cuda/bin/cuobjdump* \
   && rm -rf /usr/local/cuda/bin/nvdisasm*
 
+# TODO: remove this code when issue is fixed:
+# issue introduced by https://github.com/vllm-project/vllm/pull/30784
+# until https://github.com/vllm-project/vllm/pull/32377 is merged
+RUN rm /etc/ld.so.conf.d/00-cuda-compat.conf || true
+
 # ====================== ec2 =========================================
 FROM base AS vllm-ec2