ci: Update to ROCm 6 HIP on Fedora 41
The problem that motivated commit 3a44b8dfc0
(ci: Move job for HIP tests
on Fedora 39 to a dedicated base image, 2024-04-24, v3.30.0-rc1~202^2~11)
turns out to be exposed by spaces in the path to HIP binaries. Move the
CI work directory to a path without spaces.
Closes: #25932
This commit is contained in:
parent
bf9b13920d
commit
ec682ff22a
@ -219,9 +219,9 @@ t:debian12-hip-radeon:
|
|||||||
variables:
|
variables:
|
||||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||||
|
|
||||||
t:fedora39-hip-radeon:
|
t:fedora41-hip-radeon:
|
||||||
extends:
|
extends:
|
||||||
- .fedora39_hip_radeon
|
- .fedora41_hip_radeon
|
||||||
- .cmake_test_linux_release
|
- .cmake_test_linux_release
|
||||||
- .linux_x86_64_tags_radeon
|
- .linux_x86_64_tags_radeon
|
||||||
- .run_dependent
|
- .run_dependent
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG BASE_IMAGE=fedora:39
|
ARG BASE_IMAGE=fedora:41
|
||||||
|
|
||||||
FROM ${BASE_IMAGE} AS dnf-cache
|
FROM ${BASE_IMAGE} AS dnf-cache
|
||||||
# Populate DNF cache w/ the fresh metadata and prefetch packages.
|
# Populate DNF cache w/ the fresh metadata and prefetch packages.
|
||||||
@ -20,7 +20,7 @@ LABEL maintainer="Brad King <brad.king@kitware.com>"
|
|||||||
|
|
||||||
RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \
|
RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \
|
||||||
--mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \
|
--mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \
|
||||||
--mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \
|
--mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \
|
||||||
--mount=type=cache,target=/var/cache/pip \
|
--mount=type=cache,target=/var/cache/pip \
|
||||||
--mount=type=tmpfs,target=/var/log \
|
--mount=type=tmpfs,target=/var/log \
|
||||||
--mount=type=tmpfs,target=/tmp \
|
--mount=type=tmpfs,target=/tmp \
|
@ -1 +0,0 @@
|
|||||||
export HIPCXX=/usr/bin/clang++-17
|
|
1
.gitlab/ci/env_fedora41_hip_radeon.sh
Normal file
1
.gitlab/ci/env_fedora41_hip_radeon.sh
Normal file
@ -0,0 +1 @@
|
|||||||
|
export HIPCXX=/usr/bin/clang++-18
|
@ -71,12 +71,12 @@
|
|||||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
|
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
|
||||||
CMAKE_ARCH: x86_64
|
CMAKE_ARCH: x86_64
|
||||||
|
|
||||||
# FIXME(#25932): Our HIP tests do not fully work in CI with Fedora 40.
|
.fedora41_hip:
|
||||||
.fedora39_hip:
|
image: "kitware/cmake:ci-fedora41-hip-x86_64-2024-12-02"
|
||||||
image: "kitware/cmake:ci-fedora39-hip-x86_64-2024-04-24"
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
|
# FIXME(rocclr): device modules fail loading from binaries in paths with spaces
|
||||||
|
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
|
||||||
CMAKE_ARCH: x86_64
|
CMAKE_ARCH: x86_64
|
||||||
|
|
||||||
#### Lint builds
|
#### Lint builds
|
||||||
@ -438,11 +438,11 @@
|
|||||||
CMAKE_CONFIGURATION: debian12_hip_radeon
|
CMAKE_CONFIGURATION: debian12_hip_radeon
|
||||||
CTEST_LABELS: "HIP"
|
CTEST_LABELS: "HIP"
|
||||||
|
|
||||||
.fedora39_hip_radeon:
|
.fedora41_hip_radeon:
|
||||||
extends: .fedora39_hip
|
extends: .fedora41_hip
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
CMAKE_CONFIGURATION: fedora39_hip_radeon
|
CMAKE_CONFIGURATION: fedora41_hip_radeon
|
||||||
CTEST_LABELS: "HIP"
|
CTEST_LABELS: "HIP"
|
||||||
|
|
||||||
.hip5.5_nvidia:
|
.hip5.5_nvidia:
|
||||||
|
Loading…
Reference in New Issue
Block a user