Merge branch 'main' into upstream_merge_24_10_21

.buildkite/run-amd-test.sh

@@ -44,11 +44,11 @@ cleanup_docker
 
 echo "--- Resetting GPUs"
 
-echo "reset" > ${BUILDKITE_META_DATA_RESET_TARGET}
+echo "reset" > ${BUILDKITE_AGENT_META_DATA_RESET_TARGET}
 
 while true; do
         sleep 3
-	if grep -q clean ${BUILDKITE_META_DATA_RESET_TARGET}; then
+	if grep -q clean ${BUILDKITE_AGENT_META_DATA_RESET_TARGET}; then
                 echo "GPUs state is \"clean\""
                 break
         fi

Dockerfile.rocm

@@ -168,6 +168,7 @@ RUN --mount=type=bind,from=export_pytorch,src=/,target=/install \
 if ls /install/*.whl; then \
     pip install /install/*.whl; \
 fi
+
 # Build vLLM
 RUN cd vllm \
     && python3 -m pip install -r requirements-rocm.txt \
@@ -246,7 +247,7 @@ RUN --mount=type=bind,from=export_pytorch,src=/,target=/install \
         && pip install /install/*.whl; \
     fi
 
-RUN python3 -m pip install --upgrade numba scipy huggingface-hub[cli]
+RUN python3 -m pip install --upgrade huggingface-hub[cli]
 
 RUN git clone -b nvtx_enabled https://github.com/ROCm/rocmProfileData.git \
     && cd rocmProfileData/rpd_tracer \

requirements-rocm.txt

@@ -2,11 +2,12 @@
 -r requirements-common.txt
 
 # Dependencies for AMD GPUs
+numpy==1.26.4
 awscli
 boto3
 botocore
 ray >= 2.10.0
 peft
 pytest-asyncio
 tensorizer>=2.9.0
-setuptools-scm>=8
+setuptools-scm>=8