From 15e9ab0d77a08dfb3aef7ec6ed8929df24aef64c Mon Sep 17 00:00:00 2001 From: Jonathan Madsen Date: Tue, 8 Aug 2023 15:26:30 -0500 Subject: [PATCH 1/3] Packaging for ROCm 5.6 - Bump version to 1.10.2 - build rocm 5.6 containers for ubuntu 20.04, 22.04 - build rocm 5.6 containers for opensuse 15.4 - build rocm 5.5 and 5.6 for rhel 8.7, 9.0, 9.1 - cpack rocm 5.6 for ubuntu 20.04, ubuntu 22.04, opensuse 15.4, rhel 8.7, rhel 9.0, rhel 9.1 --- .github/workflows/containers.yml | 27 +++++++++++++++++++++++++++ .github/workflows/cpack.yml | 18 ++++++++++++++++++ VERSION | 2 +- docker/build-docker.sh | 6 +++--- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index c9c6f549c..fb2e8ee83 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -127,6 +127,9 @@ jobs: - os-distro: "ubuntu" os-version: "20.04" rocm-version: "5.5" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "5.6" # ubuntu 22.04 - os-distro: "ubuntu" os-version: "22.04" @@ -140,6 +143,9 @@ jobs: - os-distro: "ubuntu" os-version: "22.04" rocm-version: "5.5" + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "5.6" # opensuse 15.3 - os-distro: "opensuse" os-version: "15.3" @@ -187,6 +193,9 @@ jobs: - os-distro: "opensuse" os-version: "15.4" rocm-version: "5.5" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "5.6" # RHEL 8.7 - os-distro: "rhel" os-version: "8.7" @@ -197,6 +206,12 @@ jobs: - os-distro: "rhel" os-version: "8.7" rocm-version: "5.4" + - os-distro: "rhel" + os-version: "8.7" + rocm-version: "5.5" + - os-distro: "rhel" + os-version: "8.7" + rocm-version: "5.6" # RHEL 9.0 - os-distro: "rhel" os-version: "9.0" @@ -207,6 +222,12 @@ jobs: - os-distro: "rhel" os-version: "9.0" rocm-version: "5.4" + - os-distro: "rhel" + os-version: "9.0" + rocm-version: "5.5" + - os-distro: "rhel" + os-version: "9.0" + rocm-version: "5.6" # RHEL 9.1 - os-distro: "rhel" os-version: "9.1" @@ -217,6 +238,12 @@ jobs: - os-distro: "rhel" os-version: "9.1" rocm-version: "5.4" + - os-distro: "rhel" + os-version: "9.1" + rocm-version: "5.5" + - os-distro: "rhel" + os-version: "9.1" + rocm-version: "5.6" steps: diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index 80ef21975..256cccc70 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -63,6 +63,9 @@ jobs: - os-distro: "ubuntu" os-version: "20.04" rocm-version: "5.5" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "5.6" # ubuntu 22.04 - os-distro: "ubuntu" os-version: "22.04" @@ -76,6 +79,9 @@ jobs: - os-distro: "ubuntu" os-version: "22.04" rocm-version: "5.5" + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "5.6" # opensuse 15.3 - os-distro: "opensuse" os-version: "15.3" @@ -108,6 +114,9 @@ jobs: - os-distro: "opensuse" os-version: "15.4" rocm-version: "5.5" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "5.6" # RHEL 8.7 - os-distro: "rhel" os-version: "8.7" @@ -121,6 +130,9 @@ jobs: - os-distro: "rhel" os-version: "8.7" rocm-version: "5.5" + - os-distro: "rhel" + os-version: "8.7" + rocm-version: "5.6" # RHEL 9.0 - os-distro: "rhel" os-version: "9.0" @@ -134,6 +146,9 @@ jobs: - os-distro: "rhel" os-version: "9.0" rocm-version: "5.5" + - os-distro: "rhel" + os-version: "9.0" + rocm-version: "5.6" # RHEL 9.1 - os-distro: "rhel" os-version: "9.1" @@ -147,6 +162,9 @@ jobs: - os-distro: "rhel" os-version: "9.1" rocm-version: "5.5" + - os-distro: "rhel" + os-version: "9.1" + rocm-version: "5.6" steps: - uses: actions/checkout@v3 diff --git a/VERSION b/VERSION index 4dae2985b..5ad2491cf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.1 +1.10.2 diff --git a/docker/build-docker.sh b/docker/build-docker.sh index 0b0516db7..c49fabfff 100755 --- a/docker/build-docker.sh +++ b/docker/build-docker.sh @@ -173,7 +173,7 @@ do 4.1* | 4.0*) ROCM_REPO_DIST="xenial" ;; - 5.3* | 5.4* | 5.5*) + 5.3* | 5.4* | 5.5* | 5.6*) case "${VERSION}" in 22.04) ROCM_REPO_DIST="jammy" @@ -204,7 +204,7 @@ do # set the sub-URL in https://repo.radeon.com/amdgpu-install/ case "${ROCM_VERSION}" in - 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.*) + 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.*) ROCM_RPM=${ROCM_VERSION}/rhel/${RPM_PATH}/amdgpu-install-${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1${RPM_TAG}.noarch.rpm ;; 5.2 | 5.2.* | 5.1 | 5.1.* | 5.0 | 5.0.* | 4.*) @@ -232,7 +232,7 @@ do ;; esac case "${ROCM_VERSION}" in - 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.*) + 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.*) ROCM_RPM=${ROCM_VERSION}/sle/${VERSION}/amdgpu-install-${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1.noarch.rpm ;; 5.2 | 5.2.*) From 070daa097725867b98c7841fe0c0d9dc749888e0 Mon Sep 17 00:00:00 2001 From: Jonathan Madsen Date: Tue, 8 Aug 2023 15:33:06 -0500 Subject: [PATCH 2/3] Update omnitrace.cfg - remove file_write_period_ms - remove flush_period_ms --- omnitrace.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/omnitrace.cfg b/omnitrace.cfg index 46ca531db..1c1d8304f 100644 --- a/omnitrace.cfg +++ b/omnitrace.cfg @@ -2,8 +2,6 @@ # 5 minute trace, but can be stopped prematurely. duration_ms: 300000 write_into_file: true -file_write_period_ms: 100 -flush_period_ms: 100 # One buffer allocated within the central tracing binary for the entire trace, # shared by the two data sources below. From b3d2e92935d4c8a87abac2819ebc0f69d2841d35 Mon Sep 17 00:00:00 2001 From: Jonathan Madsen Date: Tue, 8 Aug 2023 15:50:53 -0500 Subject: [PATCH 3/3] Remove ROCm 5.6 for RHEL 9.0 - no packaging support --- .github/workflows/containers.yml | 3 --- .github/workflows/cpack.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index fb2e8ee83..20329783f 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -225,9 +225,6 @@ jobs: - os-distro: "rhel" os-version: "9.0" rocm-version: "5.5" - - os-distro: "rhel" - os-version: "9.0" - rocm-version: "5.6" # RHEL 9.1 - os-distro: "rhel" os-version: "9.1" diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index 256cccc70..6ec771ab8 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -146,9 +146,6 @@ jobs: - os-distro: "rhel" os-version: "9.0" rocm-version: "5.5" - - os-distro: "rhel" - os-version: "9.0" - rocm-version: "5.6" # RHEL 9.1 - os-distro: "rhel" os-version: "9.1"