From e654bfa9846be1af19a3abaf6bb28028bad48401 Mon Sep 17 00:00:00 2001 From: Gregory Shtrasberg Date: Mon, 30 Mar 2026 18:52:57 +0000 Subject: [PATCH 1/5] Add cherry pick for triton https://github.com/triton-lang/triton/pull/9541 Signed-off-by: Gregory Shtrasberg --- docker/Dockerfile.rocm_base | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.rocm_base b/docker/Dockerfile.rocm_base index e77406728cb4..728832a5da2f 100644 --- a/docker/Dockerfile.rocm_base +++ b/docker/Dockerfile.rocm_base @@ -116,6 +116,7 @@ RUN cd triton \ && git checkout ${TRITON_BRANCH} \ && git config --global user.email "you@example.com" && git config --global user.name "Your Name" \ && git cherry-pick 555d04f \ + && git cherry-pick dd998b6 \ && if [ ! -f setup.py ]; then cd python; fi \ && python3 setup.py bdist_wheel --dist-dir=dist \ && mkdir -p /app/install && cp dist/*.whl /app/install From d9e24f376f55ca930c17afd51d0e1a0ba8f45c9d Mon Sep 17 00:00:00 2001 From: Gregory Shtrasberg Date: Mon, 30 Mar 2026 20:11:04 +0000 Subject: [PATCH 2/5] Silence the spammy warning Signed-off-by: Gregory Shtrasberg --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc50b896d2fc..103de708e57a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,8 +225,8 @@ if(VLLM_GPU_LANG STREQUAL "HIP") # Certain HIP functions are marked as [[nodiscard]], yet vllm ignores the result which generates # a lot of warnings that always mask real issues. Suppressing until this is properly addressed. # - set(CMAKE_${VLLM_GPU_LANG}_FLAGS "${CMAKE_${VLLM_GPU_LANG}_FLAGS} -Wno-unused-result") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result") + set(CMAKE_${VLLM_GPU_LANG}_FLAGS "${CMAKE_${VLLM_GPU_LANG}_FLAGS} -Wno-unused-result -Wno-unused-value") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result -Wno-unused-value") endif() # From 263587420dbc823a043f1bed98507074137dde4e Mon Sep 17 00:00:00 2001 From: Gregory Shtrasberg Date: Mon, 30 Mar 2026 20:15:34 +0000 Subject: [PATCH 3/5] Specify what is cherry picked Signed-off-by: Gregory Shtrasberg --- docker/Dockerfile.rocm_base | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.rocm_base b/docker/Dockerfile.rocm_base index 728832a5da2f..9fd1b9a11d26 100644 --- a/docker/Dockerfile.rocm_base +++ b/docker/Dockerfile.rocm_base @@ -115,8 +115,8 @@ RUN git clone ${TRITON_REPO} RUN cd triton \ && git checkout ${TRITON_BRANCH} \ && git config --global user.email "you@example.com" && git config --global user.name "Your Name" \ - && git cherry-pick 555d04f \ - && git cherry-pick dd998b6 \ + && git cherry-pick 555d04f # https://github.com/triton-lang/triton/pull/8991 \ + && git cherry-pick dd998b6 # https://github.com/triton-lang/triton/pull/9541 \ && if [ ! -f setup.py ]; then cd python; fi \ && python3 setup.py bdist_wheel --dist-dir=dist \ && mkdir -p /app/install && cp dist/*.whl /app/install From ece4d442b745f39c8f71c37d521a79cd4b8214c8 Mon Sep 17 00:00:00 2001 From: Gregory Shtrasberg Date: Mon, 30 Mar 2026 21:57:05 +0000 Subject: [PATCH 4/5] Fix the comments Signed-off-by: Gregory Shtrasberg --- docker/Dockerfile.rocm_base | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.rocm_base b/docker/Dockerfile.rocm_base index 9fd1b9a11d26..db59afafad54 100644 --- a/docker/Dockerfile.rocm_base +++ b/docker/Dockerfile.rocm_base @@ -112,11 +112,14 @@ FROM base AS build_triton ARG TRITON_BRANCH ARG TRITON_REPO RUN git clone ${TRITON_REPO} +# Cherry picking the following +# https://github.com/triton-lang/triton/pull/8991 +# https://github.com/triton-lang/triton/pull/9541 RUN cd triton \ && git checkout ${TRITON_BRANCH} \ && git config --global user.email "you@example.com" && git config --global user.name "Your Name" \ - && git cherry-pick 555d04f # https://github.com/triton-lang/triton/pull/8991 \ - && git cherry-pick dd998b6 # https://github.com/triton-lang/triton/pull/9541 \ + && git cherry-pick 555d04f \ + && git cherry-pick dd998b6 \ && if [ ! -f setup.py ]; then cd python; fi \ && python3 setup.py bdist_wheel --dist-dir=dist \ && mkdir -p /app/install && cp dist/*.whl /app/install From bd06e40026c2cc0439e076b14037a253aa22cbad Mon Sep 17 00:00:00 2001 From: Gregory Shtrasberg Date: Thu, 2 Apr 2026 20:52:01 +0000 Subject: [PATCH 5/5] Bump AITER version Signed-off-by: Gregory Shtrasberg --- docker/Dockerfile.rocm_base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.rocm_base b/docker/Dockerfile.rocm_base index db59afafad54..51ce663a1b2a 100644 --- a/docker/Dockerfile.rocm_base +++ b/docker/Dockerfile.rocm_base @@ -9,7 +9,7 @@ ARG PYTORCH_AUDIO_BRANCH="v2.9.0" ARG PYTORCH_AUDIO_REPO="https://github.com/pytorch/audio.git" ARG FA_BRANCH="0e60e394" ARG FA_REPO="https://github.com/Dao-AILab/flash-attention.git" -ARG AITER_BRANCH="v0.1.10.post2" +ARG AITER_BRANCH="v0.1.12" ARG AITER_REPO="https://github.com/ROCm/aiter.git" ARG MORI_BRANCH="2d02c6a9" ARG MORI_REPO="https://github.com/ROCm/mori.git"