Skip to content

Commit 7c7d6ce

Browse files
slojosic-amdCISC
slojosic-amd
and
CISC
authored
[HIP] Bump ROCm version to 7.2.1 (#21066)
Bump ROCm version on Linux from 7.2 to 7.2.1 Add gfx1102 target Delete LLVM workaround since ROCm 7.2.1 has fix for ROCm 7.2 perf regression ROCm/rocm-systems#2865 --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>
1 parent 5208e2d commit 7c7d6ce

4 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎.devops/rocm.Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ARG UBUNTU_VERSION=24.04
22

33
# This needs to generally match the container host's environment.
4-
ARG ROCM_VERSION=7.2
5-
ARG AMDGPU_VERSION=7.2
4+
ARG ROCM_VERSION=7.2.1
5+
ARG AMDGPU_VERSION=7.2.1
66

77
# Target the ROCm build image
88
ARG BASE_ROCM_DEV_CONTAINER=rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete
@@ -12,11 +12,11 @@ FROM ${BASE_ROCM_DEV_CONTAINER} AS build
1212

1313
# Unless otherwise specified, we make a fat build.
1414
# This is mostly tied to rocBLAS supported archs.
15-
# check https://rocm.docs.amd.com/projects/install-on-linux/en/docs-7.2.0/reference/system-requirements.html
15+
# check https://rocm.docs.amd.com/projects/install-on-linux/en/docs-7.2.1/reference/system-requirements.html
1616
# check https://rocm.docs.amd.com/projects/radeon-ryzen/en/latest/docs/compatibility/compatibilityrad/native_linux/native_linux_compatibility.html
1717
# check https://rocm.docs.amd.com/projects/radeon-ryzen/en/latest/docs/compatibility/compatibilityryz/native_linux/native_linux_compatibility.html
1818

19-
ARG ROCM_DOCKER_ARCH='gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1151;gfx1150;gfx1200;gfx1201'
19+
ARG ROCM_DOCKER_ARCH='gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1150;gfx1200;gfx1201'
2020

2121
# Set ROCm architectures
2222
ENV AMDGPU_TARGETS=${ROCM_DOCKER_ARCH}

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ jobs:
941941
- name: Grab rocWMMA package
942942
id: grab_rocwmma
943943
run: |
944-
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"
944+
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"
945945
7z x rocwmma.deb
946946
7z x data.tar
947947
@@ -984,7 +984,7 @@ jobs:
984984
cmake -G "Unix Makefiles" -B build -S . `
985985
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
986986
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
987-
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.0/include/" `
987+
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.1/include/" `
988988
-DCMAKE_BUILD_TYPE=Release `
989989
-DLLAMA_BUILD_BORINGSSL=ON `
990990
-DROCM_DIR="${env:HIP_PATH}" `

‎.github/workflows/hip-quality-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535
jobs:
3636
ubuntu-22-hip-quality-check:
3737
runs-on: ubuntu-22.04
38-
container: rocm/dev-ubuntu-22.04:7.2
38+
container: rocm/dev-ubuntu-22.04:7.2.1
3939
steps:
4040
- name: Clone
4141
id: checkout

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -639,8 +639,8 @@ jobs:
639639
strategy:
640640
matrix:
641641
include:
642-
- ROCM_VERSION: "7.2"
643-
gpu_targets: "gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1151;gfx1150;gfx1200;gfx1201"
642+
- ROCM_VERSION: "7.2.1"
643+
gpu_targets: "gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1150;gfx1200;gfx1201"
644644
build: 'x64'
645645

646646
steps:
@@ -662,7 +662,7 @@ jobs:
662662
sudo apt install -y build-essential git cmake wget
663663
664664
- name: Setup Legacy ROCm
665-
if: matrix.ROCM_VERSION == '7.2'
665+
if: matrix.ROCM_VERSION == '7.2.1'
666666
id: legacy_env
667667
run: |
668668
sudo mkdir --parents --mode=0755 /etc/apt/keyrings
@@ -683,7 +683,7 @@ jobs:
683683
sudo apt-get install -y libssl-dev rocm-hip-sdk
684684
685685
- name: Setup TheRock
686-
if: matrix.ROCM_VERSION != '7.2'
686+
if: matrix.ROCM_VERSION != '7.2.1'
687687
id: therock_env
688688
run: |
689689
wget https://repo.amd.com/rocm/tarball/therock-dist-linux-gfx1151-${{ matrix.ROCM_VERSION }}.tar.gz
@@ -699,7 +699,6 @@ jobs:
699699
run: |
700700
cmake -B build -S . \
701701
-DCMAKE_HIP_COMPILER="$(hipconfig -l)/clang" \
702-
-DCMAKE_HIP_FLAGS="-mllvm --amdgpu-unroll-threshold-local=600" \
703702
-DCMAKE_BUILD_TYPE=Release \
704703
-DGGML_BACKEND_DL=ON \
705704
-DGGML_NATIVE=OFF \
@@ -717,17 +716,20 @@ jobs:
717716
id: tag
718717
uses: ./.github/actions/get-tag-name
719718

719+
- name: Get ROCm short version
720+
run: echo "ROCM_VERSION_SHORT=$(echo '${{ matrix.ROCM_VERSION }}' | cut -d '.' -f 1,2)" >> $GITHUB_ENV
721+
720722
- name: Pack artifacts
721723
id: pack_artifacts
722724
run: |
723725
cp LICENSE ./build/bin/
724-
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 .
726+
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 .
725727
726728
- name: Upload artifacts
727729
uses: actions/upload-artifact@v6
728730
with:
729-
path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION }}-${{ matrix.build }}.tar.gz
730-
name: llama-bin-ubuntu-rocm-${{ matrix.ROCM_VERSION }}-${{ matrix.build }}.tar.gz
731+
path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz
732+
name: llama-bin-ubuntu-rocm-${{ env.ROCM_VERSION_SHORT }}-${{ matrix.build }}.tar.gz
731733

732734
windows-hip:
733735
runs-on: windows-2022
@@ -749,7 +751,7 @@ jobs:
749751
- name: Grab rocWMMA package
750752
id: grab_rocwmma
751753
run: |
752-
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"
754+
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"
753755
7z x rocwmma.deb
754756
7z x data.tar
755757
@@ -806,7 +808,7 @@ jobs:
806808
cmake -G "Unix Makefiles" -B build -S . `
807809
-DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
808810
-DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
809-
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.0/include/ -Wno-ignored-attributes -Wno-nested-anon-types" `
811+
-DCMAKE_CXX_FLAGS="-I$($PWD.Path.Replace('\', '/'))/opt/rocm-7.2.1/include/ -Wno-ignored-attributes -Wno-nested-anon-types" `
810812
-DCMAKE_BUILD_TYPE=Release `
811813
-DGGML_BACKEND_DL=ON `
812814
-DGGML_NATIVE=OFF `

0 commit comments

Comments
 (0)