HIP SDK 6.2

lshqqytiger · Dec 18, 2024 · 1b6e012 · 1b6e012
1 parent c0804ca
commit 1b6e012
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -5,7 +5,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  ROCM_VERSION: "6.1.3"
+  ROCM_VERSION: "6.2.4"
 
 jobs:
   build_lin:
@@ -61,9 +61,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install AMD HIP SDK 6.1
+      - name: Install AMD HIP SDK 6.2
         run: |
-          C:\msys64\usr\bin\wget.exe https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q3-Win10-Win11-For-HIP.exe -O "amdgpu-install.exe"
+          C:\msys64\usr\bin\wget.exe https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q4-Win10-Win11-For-HIP.exe -O "amdgpu-install.exe"
           .\amdgpu-install.exe -Install -View:1
           Start-Sleep -Seconds 60
           $setupId = (Get-Process ATISetup).id

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -5,7 +5,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  ROCM_VERSION: "6.1.3"
+  ROCM_VERSION: "6.2.4"
 
 jobs:
   release:
@@ -127,9 +127,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install AMD HIP SDK 6.1
+      - name: Install AMD HIP SDK 6.2
         run: |
-          C:\msys64\usr\bin\wget.exe https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q3-Win10-Win11-For-HIP.exe -O "amdgpu-install.exe"
+          C:\msys64\usr\bin\wget.exe https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q4-Win10-Win11-For-HIP.exe -O "amdgpu-install.exe"
           .\amdgpu-install.exe -Install -View:1
           Start-Sleep -Seconds 60
           $setupId = (Get-Process ATISetup).id

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -47,7 +47,10 @@ enum Subcommand {
 
 impl Default for Subcommand {
     fn default() -> Self {
-        Subcommand::Build(BuildCommand { release: false, rocm5: false })
+        Subcommand::Build(BuildCommand {
+            release: false,
+            rocm5: false,
+        })
     }
 }
 
@@ -232,23 +235,20 @@ fn build_impl(is_debug: bool, rocm5: bool) -> Result<Workspace, DynError> {
     if !is_debug {
         command.arg("--release");
     }
-    if cfg!(windows) { // Should we allow ROCm 5 for Linux?
+    if cfg!(windows) {
+        // Should we allow ROCm 5 for Linux?
         if rocm5 {
             command.args(["--features", "rocm5"]);
         }
         if let Ok(path_default) = env::var("HIP_PATH") {
-            env::set_var("HIP_PATH",
-                env::var(
-                    if rocm5 {
-                        "HIP_PATH_57"
-                    } else {
-                        "HIP_PATH_61"
-                    }
-                )
-                .unwrap_or(path_default)
+            env::set_var(
+                "HIP_PATH",
+                env::var(if rocm5 { "HIP_PATH_57" } else { "HIP_PATH_62" }).unwrap_or(path_default),
             );
         } else {
-            return Err("Could not find HIP SDK installed. Please check if HIP_PATH is set.".into());
+            return Err(
+                "Could not find HIP SDK installed. Please check if HIP_PATH is set.".into(),
+            );
         }
     }
     let build_result = command.status()?.code().unwrap();