Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rccl dockerfile updates #19

Merged
merged 2 commits into from
May 17, 2024
Merged

Rccl dockerfile updates #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d5578
[ROCm] adding a missing triton autotune config
hongxiayang May 16, 2024
2df2927
Update Docker to use upstream RCCL; install hipBLASLt by default; upd…
mawong-amd May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Dockerfile.rocm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ VOLUME [ ${APP_MOUNT} ]
WORKDIR ${APP_MOUNT}


ARG BUILD_HIPBLASLT="0"
ARG HIPBLASLT_BRANCH="develop"
ARG BUILD_HIPBLASLT="1"
ARG HIPBLASLT_BRANCH="ee51a9d1"

RUN if [ "$BUILD_HIPBLASLT" = "1" ]; then \
echo "HIPBLASLT_BRANCH is $HIPBLASLT_BRANCH"; \
Expand All @@ -50,7 +50,7 @@ RUN python3 -m pip install --upgrade pip && rm -rf /var/lib/apt/lists/*


ARG BUILD_RCCL="1"
ARG RCCL_BRANCH="4ee96dd"
ARG RCCL_BRANCH="eeea3b6"

RUN if [ "$BUILD_RCCL" = "1" ]; then \
echo "RCCL_BRANCH is $RCCL_BRANCH"; \
Expand All @@ -59,7 +59,7 @@ RUN if [ "$BUILD_RCCL" = "1" ]; then \
RUN if [ "$BUILD_RCCL" = "1" ]; then \
mkdir -p libs \
&& cd libs \
&& git clone https://github.com/mberenjk/rccl.git \
&& git clone https://github.com/ROCm/rccl \
&& cd rccl \
&& git checkout ${RCCL_BRANCH} \
&& ./install.sh -i --amdgpu_targets ${PYTORCH_ROCM_ARCH} \
Expand Down Expand Up @@ -183,10 +183,7 @@ RUN cd /app/vllm/gradlib \
RUN python3 -m pip install --no-cache-dir 'ray[all]>=2.10.0'
ENV RAY_EXPERIMENTAL_NOSET_ROCR_VISIBLE_DEVICES=1

# HIPgraph performance environment variables.
# HIPgraph performance environment variable.
ENV HIP_FORCE_DEV_KERNARG=1
ENV DEBUG_CLR_GRAPH_PACKET_CAPTURE=1
# Might help if one is running into RCCL issues
#ENV NCCL_MAX_NCHANNELS=32

CMD ["/bin/bash"]
Binary file modified rocm_patch/libamdhip64.so.6
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions vllm/attention/ops/triton_flash_attention.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,16 @@ def _attn_fwd_inner(
num_stages=1,
num_warps=8,
),
triton.Config(
{
"BLOCK_M": 128,
"BLOCK_N": 64,
"waves_per_eu": 1,
"PRE_LOAD_V": False,
},
num_stages=1,
num_warps=4,
),
triton.Config(
{
"BLOCK_M": 128,
Expand Down
Loading