Skip to content

Commit 5f8d89a

Browse files
committed
Update HIP target to use 26.Q1 (ROCm 7.1.1)
1 parent 4550d62 commit 5f8d89a

2 files changed

Lines changed: 18 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,9 @@ jobs:
476476
runs-on: windows-2022
477477

478478
env:
479-
HIPSDK_INSTALLER_VERSION: "25.Q3"
480-
ROCM_VERSION: "6.4.2"
481-
GPU_TARGETS: "gfx1151;gfx1200;gfx1201;gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032"
479+
HIPSDK_INSTALLER_VERSION: "26.Q1"
480+
ROCM_VERSION: "7.1.1"
481+
GPU_TARGETS: "gfx1150;gfx1151;gfx1200;gfx1201;gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032"
482482

483483
steps:
484484
- uses: actions/checkout@v3
@@ -503,7 +503,7 @@ jobs:
503503
run: |
504504
$ErrorActionPreference = "Stop"
505505
write-host "Downloading AMD HIP SDK Installer"
506-
Invoke-WebRequest -Uri "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-${{ env.HIPSDK_INSTALLER_VERSION }}-WinSvr2022-For-HIP.exe" -OutFile "${env:RUNNER_TEMP}\rocm-install.exe"
506+
Invoke-WebRequest -Uri "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-${{ env.HIPSDK_INSTALLER_VERSION }}-Win11-For-HIP.exe" -OutFile "${env:RUNNER_TEMP}\rocm-install.exe"
507507
write-host "Installing AMD HIP SDK"
508508
$proc = Start-Process "${env:RUNNER_TEMP}\rocm-install.exe" -ArgumentList '-install' -NoNewWindow -PassThru
509509
$completed = $proc.WaitForExit(600000)
@@ -556,8 +556,8 @@ jobs:
556556
run: |
557557
md "build\bin\rocblas\library\"
558558
md "build\bin\hipblaslt\library"
559-
cp "${env:HIP_PATH}\bin\hipblas.dll" "build\bin\"
560-
cp "${env:HIP_PATH}\bin\hipblaslt.dll" "build\bin\"
559+
cp "${env:HIP_PATH}\bin\libhipblas.dll" "build\bin\"
560+
cp "${env:HIP_PATH}\bin\libhipblaslt.dll" "build\bin\"
561561
cp "${env:HIP_PATH}\bin\rocblas.dll" "build\bin\"
562562
cp "${env:HIP_PATH}\bin\rocblas\library\*" "build\bin\rocblas\library\"
563563
cp "${env:HIP_PATH}\bin\hipblaslt\library\*" "build\bin\hipblaslt\library\"

docs/hipBLAS_on_Windows.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ Fortunately, `AMD` provides complete help documentation, you can use the help do
2626
2727
Then we must set `ROCM` as environment variables before running cmake.
2828

29-
Usually if you install according to the official tutorial and do not modify the ROCM path, then there is a high probability that it is here `C:\Program Files\AMD\ROCm\5.5\bin`
29+
Usually if you install according to the official tutorial and do not modify the ROCM path, then there is a high probability that it is here `C:\Program Files\AMD\ROCm\7.1.1\bin`
3030

3131
This is what I use to set the clang:
3232
```Commandline
33-
set CC=C:\Program Files\AMD\ROCm\5.5\bin\clang.exe
34-
set CXX=C:\Program Files\AMD\ROCm\5.5\bin\clang++.exe
33+
set CC=C:\Program Files\AMD\ROCm\7.1.1\bin\clang.exe
34+
set CXX=C:\Program Files\AMD\ROCm\7.1.1\bin\clang++.exe
3535
```
3636

3737
## Ninja
@@ -46,7 +46,7 @@ set ninja=C:\Program Files\ninja\ninja.exe
4646
## Building stable-diffusion.cpp
4747

4848
The thing different from the regular CPU build is `-DSD_HIPBLAS=ON` ,
49-
`-G "Ninja"`, `-DCMAKE_C_COMPILER=clang`, `-DCMAKE_CXX_COMPILER=clang++`, `-DAMDGPU_TARGETS=gfx1100`
49+
`-G "Ninja"`, `-DCMAKE_C_COMPILER=clang`, `-DCMAKE_CXX_COMPILER=clang++`, `-DAMDGPU_TARGETS=gfx1150;gfx1151;gfx1200;gfx1201;gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032`
5050

5151
>**Notice**: check the `clang` and `clang++` information:
5252
```Commandline
@@ -59,26 +59,29 @@ If you see like this, we can continue:
5959
clang version 17.0.0 (git@github.amd.com:Compute-Mirrors/llvm-project e3201662d21c48894f2156d302276eb1cf47c7be)
6060
Target: x86_64-pc-windows-msvc
6161
Thread model: posix
62-
InstalledDir: C:\Program Files\AMD\ROCm\5.5\bin
62+
InstalledDir: C:\Program Files\AMD\ROCm\7.1.1\bin
6363
```
6464

6565
```
6666
clang version 17.0.0 (git@github.amd.com:Compute-Mirrors/llvm-project e3201662d21c48894f2156d302276eb1cf47c7be)
6767
Target: x86_64-pc-windows-msvc
6868
Thread model: posix
69-
InstalledDir: C:\Program Files\AMD\ROCm\5.5\bin
69+
InstalledDir: C:\Program Files\AMD\ROCm\7.1.1\bin
7070
```
7171

72-
>**Notice** that the `gfx1100` is the GPU architecture of my GPU, you can change it to your GPU architecture. Click here to see your architecture [LLVM Target](https://rocm.docs.amd.com/en/latest/release/windows_support.html#windows-supported-gpus)
72+
>**Notice** that the GPU targets are now compatible with multiple GPU architectures (ROCm 7.1.1 targets). You can change them to match your GPU architecture. Click here to see your architecture [LLVM Target](https://rocm.docs.amd.com/en/latest/release/windows_support.html#windows-supported-gpus)
7373
74-
My GPU is AMD Radeon™ RX 7900 XTX Graphics, so I set it to `gfx1100`.
74+
Examples:
75+
- AMD Radeon™ RX 7900 XTX Graphics: `gfx1100`
76+
- AMD Radeon™ RX 7900 XT Graphics: `gfx1101`
77+
- AMD Radeon™ RX 7900 GRE Graphics: `gfx1102`
7578

7679
option:
7780

7881
```commandline
7982
mkdir build
8083
cd build
81-
cmake .. -G "Ninja" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSD_HIPBLAS=ON -DCMAKE_BUILD_TYPE=Release -DAMDGPU_TARGETS=gfx1100
84+
cmake .. -G "Ninja" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSD_HIPBLAS=ON -DCMAKE_BUILD_TYPE=Release -DAMDGPU_TARGETS="gfx1150;gfx1151;gfx1200;gfx1201;gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032"
8285
cmake --build . --config Release
8386
```
8487

0 commit comments

Comments
 (0)