From 427b0d24bab9d312c5cce050bd82b5802a428b8d Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 1 Jun 2023 15:46:57 -0400 Subject: ci: Update HIP image to ROCm 5.5 on Ubuntu 22.04 --- .gitlab/ci/docker/hip4.2/Dockerfile | 7 ------- .gitlab/ci/docker/hip4.2/install_deps.sh | 13 ------------- .gitlab/ci/docker/hip5.5/Dockerfile | 28 ++++++++++++++++++++++++++++ .gitlab/ci/docker/hip5.5/deps_packages.lst | 4 ++++ .gitlab/ci/docker/hip5.5/docker-clean | 0 .gitlab/ci/docker/hip5.5/dpkg-exclude | 21 +++++++++++++++++++++ .gitlab/ci/docker/hip5.5/install_deps.sh | 5 +++++ 7 files changed, 58 insertions(+), 20 deletions(-) delete mode 100644 .gitlab/ci/docker/hip4.2/Dockerfile delete mode 100755 .gitlab/ci/docker/hip4.2/install_deps.sh create mode 100644 .gitlab/ci/docker/hip5.5/Dockerfile create mode 100644 .gitlab/ci/docker/hip5.5/deps_packages.lst create mode 100644 .gitlab/ci/docker/hip5.5/docker-clean create mode 100644 .gitlab/ci/docker/hip5.5/dpkg-exclude create mode 100755 .gitlab/ci/docker/hip5.5/install_deps.sh diff --git a/.gitlab/ci/docker/hip4.2/Dockerfile b/.gitlab/ci/docker/hip4.2/Dockerfile deleted file mode 100644 index 563e94f..0000000 --- a/.gitlab/ci/docker/hip4.2/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM rocm/dev-ubuntu-20.04:4.2 -MAINTAINER Brad King - -ENV PATH="/opt/rocm/bin:$PATH" - -COPY install_deps.sh /root/install_deps.sh -RUN sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/hip4.2/install_deps.sh b/.gitlab/ci/docker/hip4.2/install_deps.sh deleted file mode 100755 index 2b45bc9..0000000 --- a/.gitlab/ci/docker/hip4.2/install_deps.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -apt-get update - -# Install development tools. -apt-get install -y --no-install-recommends \ - g++ \ - curl \ - git - -apt-get clean diff --git a/.gitlab/ci/docker/hip5.5/Dockerfile b/.gitlab/ci/docker/hip5.5/Dockerfile new file mode 100644 index 0000000..2deb3c6 --- /dev/null +++ b/.gitlab/ci/docker/hip5.5/Dockerfile @@ -0,0 +1,28 @@ +# syntax=docker/dockerfile:1 + +ARG BASE_IMAGE=rocm/dev-ubuntu-22.04:5.5 + +FROM ${BASE_IMAGE} AS apt-cache +# Populate APT cache w/ the fresh metadata and prefetch packages. +# Use an empty `docker-clean` file to "hide" the image-provided +# file to disallow removing packages after `apt-get` operations. +RUN --mount=type=tmpfs,target=/var/log \ + --mount=type=bind,source=docker-clean,target=/etc/apt/apt.conf.d/docker-clean \ + --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ + apt-get update \ + && apt-get --download-only -y install $(grep -h '^[^#]\+$' /root/*.lst) + +FROM ${BASE_IMAGE} +MAINTAINER Brad King + +ENV PATH="/opt/rocm/bin:$PATH" + +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=dpkg-exclude,target=/etc/dpkg/dpkg.cfg.d/exclude \ + --mount=type=bind,source=docker-clean,target=/etc/apt/apt.conf.d/docker-clean \ + --mount=type=cache,from=apt-cache,source=/var/lib/apt/lists,target=/var/lib/apt/lists \ + --mount=type=cache,from=apt-cache,source=/var/cache/apt,target=/var/cache/apt,sharing=private \ + --mount=type=tmpfs,target=/var/log \ + --mount=type=tmpfs,target=/tmp \ + sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/hip5.5/deps_packages.lst b/.gitlab/ci/docker/hip5.5/deps_packages.lst new file mode 100644 index 0000000..9847925 --- /dev/null +++ b/.gitlab/ci/docker/hip5.5/deps_packages.lst @@ -0,0 +1,4 @@ +# Install development tools. +g++ +curl +git diff --git a/.gitlab/ci/docker/hip5.5/docker-clean b/.gitlab/ci/docker/hip5.5/docker-clean new file mode 100644 index 0000000..e69de29 diff --git a/.gitlab/ci/docker/hip5.5/dpkg-exclude b/.gitlab/ci/docker/hip5.5/dpkg-exclude new file mode 100644 index 0000000..60b6565 --- /dev/null +++ b/.gitlab/ci/docker/hip5.5/dpkg-exclude @@ -0,0 +1,21 @@ +# Drop all man pages +path-exclude=/usr/share/man/* + +# Drop all info pages +path-exclude=/usr/share/info/* + +# Drop all README files except from the some packages +path-exclude=/usr/**/*README* +path-include=/usr/share/devscripts/templates/README.mk-build-deps +path-include=/usr/share/equivs/template/debian/README.Debian.in + +# Drop all translations +path-exclude=/usr/share/locale/*/LC_MESSAGES/*.mo + +# Drop all documentation ... +path-exclude=/usr/share/doc/* +path-exclude=/usr/share/doc-base/* +path-exclude=/usr/share/gtk-doc/* + +# Per package excludes +path-exclude=/usr/share/gnupg/help.*.txt diff --git a/.gitlab/ci/docker/hip5.5/install_deps.sh b/.gitlab/ci/docker/hip5.5/install_deps.sh new file mode 100755 index 0000000..d1c8aed --- /dev/null +++ b/.gitlab/ci/docker/hip5.5/install_deps.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +apt-get install -y $(grep '^[^#]\+$' /root/deps_packages.lst) -- cgit v0.12 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