From 679d201df76766a026f0816f62781d25399bf5d6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 1 Jun 2023 16:07:15 -0400 Subject: gitlab-ci: Update HIP job to ROCm 5.5 --- .gitlab-ci.yml | 4 ++-- .gitlab/ci/configure_hip4.2_radeon.cmake | 3 --- .gitlab/ci/configure_hip5.5_radeon.cmake | 3 +++ .gitlab/os-linux.yml | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .gitlab/ci/configure_hip4.2_radeon.cmake create mode 100644 .gitlab/ci/configure_hip5.5_radeon.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e0d01a..297afda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -314,9 +314,9 @@ t:cuda11.8-minimal-ninja: variables: CMAKE_CI_NO_MR: "true" -t:hip4.2-radeon: +t:hip5.5-radeon: extends: - - .hip4.2_radeon + - .hip5.5_radeon - .cmake_test_linux_release - .linux_x86_64_tags_radeon - .run_dependent diff --git a/.gitlab/ci/configure_hip4.2_radeon.cmake b/.gitlab/ci/configure_hip4.2_radeon.cmake deleted file mode 100644 index 58036b0..0000000 --- a/.gitlab/ci/configure_hip4.2_radeon.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_HIP "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_hip5.5_radeon.cmake b/.gitlab/ci/configure_hip5.5_radeon.cmake new file mode 100644 index 0000000..58036b0 --- /dev/null +++ b/.gitlab/ci/configure_hip5.5_radeon.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_HIP "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f4cc401..79217ee 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -344,19 +344,19 @@ ### HIP builds -.hip4.2: - image: "kitware/cmake:ci-hip4.2-x86_64-2021-07-09" +.hip5.5: + image: "kitware/cmake:ci-hip5.5-x86_64-2023-06-01" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" CMAKE_ARCH: x86_64 CTEST_LABELS: "HIP" -.hip4.2_radeon: - extends: .hip4.2 +.hip5.5_radeon: + extends: .hip5.5 variables: - CMAKE_CONFIGURATION: hip4.2_radeon + CMAKE_CONFIGURATION: hip5.5_radeon CMAKE_GENERATOR: "Ninja Multi-Config" ### C++ modules -- cgit v0.12