From 79f78c7bfb7bde5a3e62bac7eadb68e01e119494 Mon Sep 17 00:00:00 2001
From: David Rohr <drohr@jwdt.org>
Date: Fri, 10 Jan 2025 23:50:18 +0100
Subject: [PATCH] Bump to ROCm 6.3, fix regex for binary files

---
 slc9-gpu-builder/amdgpu.repo  | 2 +-
 slc9-gpu-builder/packer.json  | 2 +-
 slc9-gpu-builder/provision.sh | 2 +-
 slc9-gpu-builder/rocm.repo    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/slc9-gpu-builder/amdgpu.repo b/slc9-gpu-builder/amdgpu.repo
index b68005c..80fb031 100644
--- a/slc9-gpu-builder/amdgpu.repo
+++ b/slc9-gpu-builder/amdgpu.repo
@@ -1,5 +1,5 @@
 [amdgpu]
 name=amdgpu
-baseurl=http://repo.radeon.com/amdgpu/6.2.4/rhel/9.4/main/x86_64/
+baseurl=http://repo.radeon.com/amdgpu/6.3.1/rhel/9.4/main/x86_64/
 enabled=1
 gpgcheck=0
diff --git a/slc9-gpu-builder/packer.json b/slc9-gpu-builder/packer.json
index 1b8c952..1754418 100644
--- a/slc9-gpu-builder/packer.json
+++ b/slc9-gpu-builder/packer.json
@@ -1,5 +1,5 @@
 {
-  "_comment": "Alma 9.4 GPU builder X-enabled CUDA12.6-enabled AMD ROCm 6.2.4-enabled",
+  "_comment": "Alma 9.4 GPU builder X-enabled CUDA12.6-enabled AMD ROCm 6.3.1-enabled",
   "variables": {
     "REPO": "registry.cern.ch/alisw/slc9-gpu-builder",
     "TAG": "latest",
diff --git a/slc9-gpu-builder/provision.sh b/slc9-gpu-builder/provision.sh
index 0d47bfb..b4942ef 100755
--- a/slc9-gpu-builder/provision.sh
+++ b/slc9-gpu-builder/provision.sh
@@ -46,7 +46,7 @@ export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64
 LIBRARY_PATH=/usr/local/cuda/lib64/stubs ldconfig
 
 # Fix some errors in current ROCm
-sed -i "s/amdgpu-function-calls=false/amdgpu-function-calls=true/g" /opt/rocm/bin/hipcc* /opt/rocm/lib/cmake/hip/*.cmake
+sed -i "s/amdgpu-function-calls=false/amdgpu-function-calls=true /g" /opt/rocm/bin/hipcc* /opt/rocm/lib/cmake/hip/*.cmake
 
 # Remove clang-ocl binary, since it is currently broken, to avoid automatic pick-up
 rm -fv /opt/rocm/bin/clang-ocl /usr/bin/clang-ocl
diff --git a/slc9-gpu-builder/rocm.repo b/slc9-gpu-builder/rocm.repo
index 65568b0..62f8b34 100644
--- a/slc9-gpu-builder/rocm.repo
+++ b/slc9-gpu-builder/rocm.repo
@@ -1,5 +1,5 @@
 [ROCm]
 name=ROCm
-baseurl=http://repo.radeon.com/rocm/rhel9/6.2.4/main/
+baseurl=http://repo.radeon.com/rocm/rhel9/6.3.1/main/
 enabled=1
 gpgcheck=0