From b0bf3d154e899f757d610b187e17bf9137d4cd94 Mon Sep 17 00:00:00 2001 From: Slobodan Josic Date: Fri, 27 Mar 2026 14:17:54 +0100 Subject: [PATCH 1/7] Bump ROCm version on Linux from 7.2 to 7.2.1 --- .devops/rocm.Dockerfile | 6 +++--- .github/workflows/build.yml | 4 ++-- .github/workflows/hip-quality-check.yml | 2 +- .github/workflows/release.yml | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.devops/rocm.Dockerfile b/.devops/rocm.Dockerfile index 830fe19e3e81..a300615ddd29 100644 --- a/.devops/rocm.Dockerfile +++ b/.devops/rocm.Dockerfile @@ -1,8 +1,8 @@ ARG UBUNTU_VERSION=24.04 # This needs to generally match the container host's environment. -ARG ROCM_VERSION=7.2 -ARG AMDGPU_VERSION=7.2 +ARG ROCM_VERSION=7.2.1 +ARG AMDGPU_VERSION=7.2.1 # Target the ROCm build image ARG BASE_ROCM_DEV_CONTAINER=rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete @@ -12,7 +12,7 @@ FROM ${BASE_ROCM_DEV_CONTAINER} AS build # Unless otherwise specified, we make a fat build. # This is mostly tied to rocBLAS supported archs. -# check https://rocm.docs.amd.com/projects/install-on-linux/en/docs-7.2.0/reference/system-requirements.html +# check https://rocm.docs.amd.com/projects/install-on-linux/en/docs-7.2.1/reference/system-requirements.html # check https://rocm.docs.amd.com/projects/radeon-ryzen/en/latest/docs/compatibility/compatibilityrad/native_linux/native_linux_compatibility.html # check https://rocm.docs.amd.com/projects/radeon-ryzen/en/latest/docs/compatibility/compatibilityryz/native_linux/native_linux_compatibility.html diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3adf2a14af9c..9142de885839 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -924,7 +924,7 @@ jobs: - name: Grab rocWMMA package id: grab_rocwmma run: | - curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/7.2/pool/main/r/rocwmma-dev/rocwmma-dev_2.2.0.70200-43~24.04_amd64.deb" + curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/7.2.1/pool/main/r/rocwmma-dev/rocwmma-dev_2.2.0.70201-81~24.04_amd64.deb " 7z x rocwmma.deb 7z x data.tar @@ -967,7 +967,7 @@ jobs: cmake -G "Unix Makefiles" -B build -S . ` -DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" ` -DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" ` - -DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.0/include/" ` + -DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.1/include/" ` -DCMAKE_BUILD_TYPE=Release ` -DLLAMA_BUILD_BORINGSSL=ON ` -DROCM_DIR="${env:HIP_PATH}" ` diff --git a/.github/workflows/hip-quality-check.yml b/.github/workflows/hip-quality-check.yml index 474c0ad41582..7dea09acf878 100644 --- a/.github/workflows/hip-quality-check.yml +++ b/.github/workflows/hip-quality-check.yml @@ -35,7 +35,7 @@ env: jobs: ubuntu-22-hip-quality-check: runs-on: ubuntu-22.04 - container: rocm/dev-ubuntu-22.04:7.2 + container: rocm/dev-ubuntu-22.04:7.2.1 steps: - name: Clone id: checkout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47cd08d9854e..fa732261b68e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -618,7 +618,7 @@ jobs: strategy: matrix: include: - - ROCM_VERSION: "7.2" + - ROCM_VERSION: "7.2.1" gpu_targets: "gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1151;gfx1150;gfx1200;gfx1201" build: 'x64' @@ -641,7 +641,7 @@ jobs: sudo apt install -y build-essential git cmake wget - name: Setup Legacy ROCm - if: matrix.ROCM_VERSION == '7.2' + if: matrix.ROCM_VERSION == '7.2.1' id: legacy_env run: | sudo mkdir --parents --mode=0755 /etc/apt/keyrings @@ -662,7 +662,7 @@ jobs: sudo apt-get install -y libssl-dev rocm-hip-sdk - name: Setup TheRock - if: matrix.ROCM_VERSION != '7.2' + if: matrix.ROCM_VERSION != '7.2.1' id: therock_env run: | wget https://repo.amd.com/rocm/tarball/therock-dist-linux-gfx1151-${{ matrix.ROCM_VERSION }}.tar.gz @@ -728,7 +728,7 @@ jobs: - name: Grab rocWMMA package id: grab_rocwmma run: | - curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/7.2/pool/main/r/rocwmma-dev/rocwmma-dev_2.2.0.70200-43~24.04_amd64.deb" + curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/7.2.1/pool/main/r/rocwmma-dev/rocwmma-dev_2.2.0.70201-81~24.04_amd64.deb" 7z x rocwmma.deb 7z x data.tar @@ -785,7 +785,7 @@ jobs: cmake -G "Unix Makefiles" -B build -S . ` -DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" ` -DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" ` - -DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.0/include/ -Wno-ignored-attributes -Wno-nested-anon-types" ` + -DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.1/include/ -Wno-ignored-attributes -Wno-nested-anon-types" ` -DCMAKE_BUILD_TYPE=Release ` -DGGML_BACKEND_DL=ON ` -DGGML_NATIVE=OFF ` @@ -1062,7 +1062,7 @@ jobs: **Linux:** - [Ubuntu x64 (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-x64.tar.gz) - [Ubuntu x64 (Vulkan)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-vulkan-x64.tar.gz) - - [Ubuntu x64 (ROCm 7.2)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-7.2-x64.tar.gz) + - [Ubuntu x64 (ROCm 7.2.1)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-7.2.1-x64.tar.gz) - [Ubuntu s390x (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-s390x.tar.gz) - [Ubuntu x64 (OpenVINO)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-openvino-${{ needs.ubuntu-24-openvino.outputs.openvino_version }}-x64.tar.gz) From b2af932c9dac912804a4671d98a816eaac962474 Mon Sep 17 00:00:00 2001 From: Slobodan Josic Date: Fri, 27 Mar 2026 14:20:41 +0100 Subject: [PATCH 2/7] Add missing gfx1102 target --- .devops/rocm.Dockerfile | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devops/rocm.Dockerfile b/.devops/rocm.Dockerfile index a300615ddd29..032838603fe3 100644 --- a/.devops/rocm.Dockerfile +++ b/.devops/rocm.Dockerfile @@ -16,7 +16,7 @@ FROM ${BASE_ROCM_DEV_CONTAINER} AS build # check https://rocm.docs.amd.com/projects/radeon-ryzen/en/latest/docs/compatibility/compatibilityrad/native_linux/native_linux_compatibility.html # check https://rocm.docs.amd.com/projects/radeon-ryzen/en/latest/docs/compatibility/compatibilityryz/native_linux/native_linux_compatibility.html -ARG ROCM_DOCKER_ARCH='gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1151;gfx1150;gfx1200;gfx1201' +ARG ROCM_DOCKER_ARCH='gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1150;gfx1200;gfx1201' # Set ROCm architectures ENV AMDGPU_TARGETS=${ROCM_DOCKER_ARCH} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa732261b68e..d371c6c22a1a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -619,7 +619,7 @@ jobs: matrix: include: - ROCM_VERSION: "7.2.1" - gpu_targets: "gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1151;gfx1150;gfx1200;gfx1201" + gpu_targets: "gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1150;gfx1200;gfx1201" build: 'x64' steps: From f92770d5af2be594b687844709798050bdc7cfd2 Mon Sep 17 00:00:00 2001 From: Slobodan Josic Date: Fri, 27 Mar 2026 15:30:02 +0100 Subject: [PATCH 3/7] Apply code review suggested changes --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9142de885839..d37dee3e7544 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -924,7 +924,7 @@ jobs: - name: Grab rocWMMA package id: grab_rocwmma run: | - curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/7.2.1/pool/main/r/rocwmma-dev/rocwmma-dev_2.2.0.70201-81~24.04_amd64.deb " + curl -o rocwmma.deb "https://repo.radeon.com/rocm/apt/7.2.1/pool/main/r/rocwmma-dev/rocwmma-dev_2.2.0.70201-81~24.04_amd64.deb" 7z x rocwmma.deb 7z x data.tar diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d371c6c22a1a..b6e8763cedd8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1062,7 +1062,7 @@ jobs: **Linux:** - [Ubuntu x64 (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-x64.tar.gz) - [Ubuntu x64 (Vulkan)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-vulkan-x64.tar.gz) - - [Ubuntu x64 (ROCm 7.2.1)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-7.2.1-x64.tar.gz) + - [Ubuntu x64 (ROCm 7.2)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-7.2-x64.tar.gz) - [Ubuntu s390x (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-s390x.tar.gz) - [Ubuntu x64 (OpenVINO)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-openvino-${{ needs.ubuntu-24-openvino.outputs.openvino_version }}-x64.tar.gz) From 229cb12450e6caf83cb7ad587f5402f5cf1730b1 Mon Sep 17 00:00:00 2001 From: Slobodan Josic Date: Fri, 27 Mar 2026 15:32:42 +0100 Subject: [PATCH 4/7] Delete LLVM workaround since ROCm 7.2.1 has fix for ROCm 7.2 perf regression https://github.com/ROCm/rocm-systems/issues/2865 --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b6e8763cedd8..a78d433d14f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -678,7 +678,6 @@ jobs: run: | cmake -B build -S . \ -DCMAKE_HIP_COMPILER="$(hipconfig -l)/clang" \ - -DCMAKE_HIP_FLAGS="-mllvm --amdgpu-unroll-threshold-local=600" \ -DCMAKE_BUILD_TYPE=Release \ -DGGML_BACKEND_DL=ON \ -DGGML_NATIVE=OFF \ From e0359685a6eaccd38a227cdc7244a60cd7d79caf Mon Sep 17 00:00:00 2001 From: Slobodan Josic Date: Fri, 27 Mar 2026 15:53:21 +0100 Subject: [PATCH 5/7] Fix ROCM_VERSION for packaging and uploading artifacts --- .github/workflows/release.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a78d433d14f0..f522a90bceaf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -619,6 +619,7 @@ jobs: matrix: include: - ROCM_VERSION: "7.2.1" + ROCM_VERSION_SHORT: "7.2" gpu_targets: "gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1150;gfx1200;gfx1201" build: 'x64' @@ -699,13 +700,13 @@ jobs: id: pack_artifacts run: | cp LICENSE ./build/bin/ - tar -czvf llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION }}-${{ matrix.build }}.tar.gz --transform "s,./,llama-${{ steps.tag.outputs.name }}/," -C ./build/bin . + tar -czvf llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz --transform "s,./,llama-${{ steps.tag.outputs.name }}/," -C ./build/bin . - name: Upload artifacts uses: actions/upload-artifact@v6 with: - path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION }}-${{ matrix.build }}.tar.gz - name: llama-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION }}-${{ matrix.build }}.tar.gz + path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz + name: llama-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz windows-hip: runs-on: windows-2022 From 7bfdd0a022cf1ef5d00da84fd63ae91151ca07e7 Mon Sep 17 00:00:00 2001 From: Slobodan Josic Date: Mon, 30 Mar 2026 11:42:50 +0200 Subject: [PATCH 6/7] Another fix of ROCM_VERSION for packaging and uploading artifacts --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f522a90bceaf..e70b14772e36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -619,7 +619,6 @@ jobs: matrix: include: - ROCM_VERSION: "7.2.1" - ROCM_VERSION_SHORT: "7.2" gpu_targets: "gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1150;gfx1200;gfx1201" build: 'x64' @@ -696,17 +695,20 @@ jobs: id: tag uses: ./.github/actions/get-tag-name + - name: Get ROCm short version + run: echo "ROCM_VERSION_SHORT=$(echo '${{ matrix.ROCM_VERSION }}' | cut -d '.' -f 1,2)" >> $GITHUB_ENV + - name: Pack artifacts id: pack_artifacts run: | cp LICENSE ./build/bin/ - tar -czvf llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz --transform "s,./,llama-${{ steps.tag.outputs.name }}/," -C ./build/bin . + tar -czvf llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz --transform "s,./,llama-${{ steps.tag.outputs.name }}/," -C ./build/bin . - name: Upload artifacts uses: actions/upload-artifact@v6 with: - path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz - name: llama-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz + path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz + name: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz windows-hip: runs-on: windows-2022 From 003016cbd989fd8de487f05aed7912dc575c0bd4 Mon Sep 17 00:00:00 2001 From: Slobodan Josic <127323561+slojosic-amd@users.noreply.github.com> Date: Mon, 30 Mar 2026 12:40:12 +0200 Subject: [PATCH 7/7] path and name of the artifacts are not the same MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sigbjørn Skjæret --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e70b14772e36..d3e5f331eda6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -708,7 +708,7 @@ jobs: uses: actions/upload-artifact@v6 with: path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz - name: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz + name: llama-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz windows-hip: runs-on: windows-2022