Browse Source

ci: Update HIP image to ROCm 6.3 on Ubuntu 24.04

The problem described in commit ec682ff22a (ci: Update to ROCm 6 HIP on
Fedora 41, 2024-12-02, v3.31.2~3^2) occurs here too.  Move the CI work
directory to a path without spaces.

Issue: #25932
Brad King 11 months ago
parent
commit
bc94c018c4

+ 4 - 4
.gitlab-ci.yml

@@ -439,9 +439,9 @@ t:cuda12.6-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:hip5.5-nvidia:
+t:hip6.3-nvidia:
     extends:
-        - .hip5.5_nvidia
+        - .hip6.3_nvidia
         - .cmake_test_linux_release
         - .linux_x86_64_tags_cuda
         - .run_dependent
@@ -449,9 +449,9 @@ t:hip5.5-nvidia:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:hip5.5-radeon:
+t:hip6.3-radeon:
     extends:
-        - .hip5.5_radeon
+        - .hip6.3_radeon
         - .cmake_test_linux_release
         - .linux_x86_64_tags_radeon
         - .run_dependent

+ 0 - 0
.gitlab/ci/configure_hip5.5_nvidia.cmake → .gitlab/ci/configure_hip6.3_nvidia.cmake


+ 0 - 0
.gitlab/ci/configure_hip5.5_radeon.cmake → .gitlab/ci/configure_hip6.3_radeon.cmake


+ 0 - 21
.gitlab/ci/docker/hip5.5/deps_packages.lst

@@ -1,21 +0,0 @@
-# Install development tools.
-g++
-curl
-git
-
-# NVIDIA CUDA Compiler
-cuda-keyring
-cuda-nvcc-11-8
-cuda-profiler-api-11-8
-
-# NVIDIA CUDA Toolkit
-# These are not needed for HIP, but having them in
-# the environment allows us to run CUDA tests too.
-cuda-nvrtc-dev-11-8
-cuda-nvtx-11-8
-libcublas-dev-11-8
-libcufft-dev-11-8
-libcurand-dev-11-8
-libcusolver-dev-11-8
-libcusparse-dev-11-8
-libnpp-dev-11-8

+ 3 - 3
.gitlab/ci/docker/hip5.5/Dockerfile → .gitlab/ci/docker/hip6.3/Dockerfile

@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
 
-ARG BASE_IMAGE=rocm/dev-ubuntu-22.04:5.5
+ARG BASE_IMAGE=rocm/dev-ubuntu-24.04:6.3.2
 
 FROM ${BASE_IMAGE} AS cuda-keyring
-ADD https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb /root/
+ADD https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/cuda-keyring_1.1-1_all.deb /root/
 RUN --mount=type=tmpfs,target=/var/log \
     dpkg -i /root/cuda-keyring_1.1-1_all.deb \
  && rm /root/cuda-keyring_1.1-1_all.deb
@@ -22,7 +22,7 @@ FROM cuda-keyring
 MAINTAINER Brad King <[email protected]>
 
 ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
-ENV NVIDIA_REQUIRE_CUDA=cuda>=11.8
+ENV NVIDIA_REQUIRE_CUDA=cuda>=12.6
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV PATH="/opt/rocm/bin:$PATH"
 

+ 23 - 0
.gitlab/ci/docker/hip6.3/deps_packages.lst

@@ -0,0 +1,23 @@
+# Install development tools.
+g++
+curl
+git
+
+# NVIDIA CUDA Compiler
+cuda-keyring
+cuda-nvcc-12-6
+cuda-profiler-api-12-6
+
+# NVIDIA CUDA Toolkit
+# These are not needed for HIP, but having them in
+# the environment allows us to run CUDA tests too.
+cuda-nvrtc-dev-12-6
+cuda-nvtx-12-6
+cuda-opencl-dev-12-6
+libcublas-dev-12-6
+libcufft-dev-12-6
+libcurand-dev-12-6
+libcusolver-dev-12-6
+libcusparse-dev-12-6
+libnpp-dev-12-6
+libnvjitlink-dev-12-6

+ 0 - 0
.gitlab/ci/docker/hip5.5/docker-clean → .gitlab/ci/docker/hip6.3/docker-clean


+ 0 - 0
.gitlab/ci/docker/hip5.5/dpkg-exclude → .gitlab/ci/docker/hip6.3/dpkg-exclude


+ 0 - 0
.gitlab/ci/docker/hip5.5/install_deps.sh → .gitlab/ci/docker/hip6.3/install_deps.sh


+ 0 - 4
.gitlab/ci/env_hip5.5_nvidia.sh

@@ -1,4 +0,0 @@
-export HIP_PLATFORM=nvidia
-export CUDA_PATH=/usr/local/cuda-11.8
-export PATH=/usr/local/cuda-11.8/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/cuda-11.8/lib64

+ 4 - 0
.gitlab/ci/env_hip6.3_nvidia.sh

@@ -0,0 +1,4 @@
+export HIP_PLATFORM=nvidia
+export CUDA_PATH=/usr/local/cuda-12.6
+export PATH=/usr/local/cuda-12.6/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/cuda-12.6/lib64

+ 10 - 8
.gitlab/os-linux.yml

@@ -434,19 +434,21 @@
 
 ### HIP builds
 
-.hip5.5:
-    image: "kitware/cmake:ci-hip5.5-x86_64-2023-09-18"
+.hip6.3:
+    image: "kitware/cmake:ci-hip6.3-x86_64-2025-02-14"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
         CMAKE_ARCH: x86_64
         CTEST_LABELS: "HIP"
 
-.hip5.5_radeon:
-    extends: .hip5.5
+.hip6.3_radeon:
+    extends: .hip6.3
 
     variables:
-        CMAKE_CONFIGURATION: hip5.5_radeon
+        # FIXME(rocclr): device modules fail loading from binaries in paths with spaces
+        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
+        CMAKE_CONFIGURATION: hip6.3_radeon
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
 .debian12_hip_radeon:
@@ -463,11 +465,11 @@
         CMAKE_CONFIGURATION: fedora41_hip_radeon
         CTEST_LABELS: "HIP"
 
-.hip5.5_nvidia:
-    extends: .hip5.5
+.hip6.3_nvidia:
+    extends: .hip6.3
 
     variables:
-        CMAKE_CONFIGURATION: hip5.5_nvidia
+        CMAKE_CONFIGURATION: hip6.3_nvidia
         CTEST_LABELS: "HIP"
 
 ### C++ modules