diff --git a/.buildkite/test-amd.yaml b/.buildkite/test-amd.yaml index 847d8762da..fe617cb10a 100644 --- a/.buildkite/test-amd.yaml +++ b/.buildkite/test-amd.yaml @@ -2613,6 +2613,7 @@ steps: - vllm/platforms/rocm.py commands: - export TORCH_NCCL_BLOCKING_WAIT=1 + - VLLM_LOGGING_LEVEL=DEBUG python3 examples/offline_inference/data_parallel.py --model=Qwen/Qwen1.5-MoE-A2.7B -tp=1 -dp=2 --max-model-len=2048 --all2all-backend=deepep_high_throughput - pytest -v -s tests/v1/distributed/test_dbo.py @@ -3601,7 +3602,6 @@ steps: commands: - export TORCH_NCCL_BLOCKING_WAIT=1 - pytest -v -s tests/distributed/test_context_parallel.py - - VLLM_LOGGING_LEVEL=DEBUG python3 examples/offline_inference/data_parallel.py --model=Qwen/Qwen1.5-MoE-A2.7B -tp=1 -dp=2 --max-model-len=2048 --all2all-backend=deepep_high_throughput - pytest -v -s tests/v1/distributed/test_dbo.py diff --git a/docker/Dockerfile.rocm b/docker/Dockerfile.rocm index fb4d04430b..d1eebcd7bd 100644 --- a/docker/Dockerfile.rocm +++ b/docker/Dockerfile.rocm @@ -192,9 +192,10 @@ RUN cd /opt/rixl && mkdir -p /app/install && \ FROM base AS build_deep ARG ROCSHMEM_BRANCH="ba0bf0f3" ARG ROCSHMEM_REPO="https://github.com/ROCm/rocm-systems.git" -ARG DEEPEP_BRANCH="e84464ec" +ARG DEEPEP_BRANCH="5d90af8b" ARG DEEPEP_REPO="https://github.com/ROCm/DeepEP.git" ARG DEEPEP_NIC="cx7" +ARG DEEPEP_ROCM_ARCH="gfx942;gfx950" ENV ROCSHMEM_DIR=/opt/rocshmem RUN git clone ${ROCSHMEM_REPO} \ @@ -202,13 +203,11 @@ RUN git clone ${ROCSHMEM_REPO} \ && git checkout ${ROCSHMEM_BRANCH} \ && mkdir -p projects/rocshmem/build \ && cd projects/rocshmem/build \ - && cmake .. \ - -DCMAKE_INSTALL_PREFIX="${ROCSHMEM_DIR}" \ - -DROCM_PATH=/opt/rocm \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DUSE_EXTERNAL_MPI=OFF \ - && make -j \ - && make install + && bash ../scripts/build_configs/all_backends \ + -DCMAKE_INSTALL_PREFIX="${ROCSHMEM_DIR}" \ + -DROCM_PATH=/opt/rocm \ + -DGPU_TARGETS="${DEEPEP_ROCM_ARCH}" \ + -DUSE_EXTERNAL_MPI=OFF # Build DeepEP wheel. # DeepEP looks for rocshmem at ROCSHMEM_DIR.