From 7179f2a72f064e377964b79f34b327ce9c551c2a Mon Sep 17 00:00:00 2001 From: Daniel Su Date: Mon, 3 Feb 2025 16:04:07 -0500 Subject: [PATCH] Ex CI: add REPO_RADEON_VERSION as a global variable, clean up other variables (#4334) --- .azuredevops/components/rocDecode.yml | 26 ++----------------- .azuredevops/components/rocJPEG.yml | 26 ++----------------- .azuredevops/components/rocm-core.yml | 2 +- .azuredevops/components/rocminfo.yml | 2 +- .azuredevops/components/rocprofiler-sdk.yml | 4 +-- .../components/rocprofiler-systems.yml | 4 +-- .azuredevops/dependencies/half560.yml | 2 +- .../steps/dependencies-aqlprofile.yml | 4 +-- .../templates/steps/dependencies-other.yml | 10 +++---- .../templates/steps/docker-container.yml | 4 +-- .azuredevops/variables-global.yml | 20 +++++--------- 11 files changed, 27 insertions(+), 77 deletions(-) diff --git a/.azuredevops/components/rocDecode.yml b/.azuredevops/components/rocDecode.yml index 79ad12528..4cd745533 100644 --- a/.azuredevops/components/rocDecode.yml +++ b/.azuredevops/components/rocDecode.yml @@ -49,21 +49,10 @@ jobs: workspace: clean: all steps: - # Since mesa-amdgpu-multimedia-devel is not directly available from apt, register it - - task: Bash@3 - displayName: 'Register ROCm packages' - inputs: - targetType: inline - script: | - sudo mkdir --parents --mode=0755 /etc/apt/keyrings - wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${{ variables.KEYRING_VERSION }}/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/amdgpu.list - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${{ variables.KEYRING_VERSION }} jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list - echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | sudo tee /etc/apt/preferences.d/rocm-pin-600 - sudo apt update - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml parameters: aptPackages: ${{ parameters.aptPackages }} + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml parameters: @@ -104,21 +93,10 @@ jobs: JOB_GPU_TARGET: gfx942 JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }} steps: - # Since mesa-amdgpu-multimedia-devel is not directly available from apt, register it - - task: Bash@3 - displayName: 'Register ROCm packages' - inputs: - targetType: inline - script: | - sudo mkdir --parents --mode=0755 /etc/apt/keyrings - wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${{ variables.KEYRING_VERSION }}/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/amdgpu.list - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${{ variables.KEYRING_VERSION }} jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list - echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | sudo tee /etc/apt/preferences.d/rocm-pin-600 - sudo apt update - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml parameters: aptPackages: ${{ parameters.aptPackages }} + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml diff --git a/.azuredevops/components/rocJPEG.yml b/.azuredevops/components/rocJPEG.yml index f80238908..f87eb17d4 100644 --- a/.azuredevops/components/rocJPEG.yml +++ b/.azuredevops/components/rocJPEG.yml @@ -48,21 +48,10 @@ jobs: gfx942: JOB_GPU_TARGET: gfx942 steps: - # Since mesa-amdgpu-multimedia-devel is not directly available from apt, register it - - task: Bash@3 - displayName: 'Register ROCm packages' - inputs: - targetType: inline - script: | - sudo mkdir --parents --mode=0755 /etc/apt/keyrings - wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${{ variables.KEYRING_VERSION }}/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/amdgpu.list - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${{ variables.KEYRING_VERSION }} jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list - echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | sudo tee /etc/apt/preferences.d/rocm-pin-600 - sudo apt update - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml parameters: aptPackages: ${{ parameters.aptPackages }} + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml parameters: @@ -106,21 +95,10 @@ jobs: JOB_GPU_TARGET: gfx942 JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }} steps: - # Since mesa-amdgpu-multimedia-devel is not directly available from apt, register it - - task: Bash@3 - displayName: 'Register ROCm packages' - inputs: - targetType: inline - script: | - sudo mkdir --parents --mode=0755 /etc/apt/keyrings - wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${{ variables.KEYRING_VERSION }}/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/amdgpu.list - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${{ variables.KEYRING_VERSION }} jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list - echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | sudo tee /etc/apt/preferences.d/rocm-pin-600 - sudo apt update - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml parameters: aptPackages: ${{ parameters.aptPackages }} + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml diff --git a/.azuredevops/components/rocm-core.yml b/.azuredevops/components/rocm-core.yml index a5f5a1afc..4d8087d96 100644 --- a/.azuredevops/components/rocm-core.yml +++ b/.azuredevops/components/rocm-core.yml @@ -36,7 +36,7 @@ jobs: -DCPACK_GENERATOR=DEB -DCPACK_DEBIAN_PACKAGE_RELEASE="local.9999~99.99" -DCPACK_RPM_PACKAGE_RELEASE="local.9999" - -DROCM_VERSION="$(next-release)" + -DROCM_VERSION="$(NEXT_RELEASE_VERSION)" - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml diff --git a/.azuredevops/components/rocminfo.yml b/.azuredevops/components/rocminfo.yml index 46460c1c2..508f6c928 100644 --- a/.azuredevops/components/rocminfo.yml +++ b/.azuredevops/components/rocminfo.yml @@ -35,7 +35,7 @@ jobs: - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml parameters: aptPackages: ${{ parameters.aptPackages }} - registerRadeon: true + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml parameters: diff --git a/.azuredevops/components/rocprofiler-sdk.yml b/.azuredevops/components/rocprofiler-sdk.yml index 0406eb97d..cb35db89e 100644 --- a/.azuredevops/components/rocprofiler-sdk.yml +++ b/.azuredevops/components/rocprofiler-sdk.yml @@ -62,7 +62,7 @@ jobs: parameters: aptPackages: ${{ parameters.aptPackages }} pipModules: ${{ parameters.pipModules }} - registerRadeon: true + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml parameters: @@ -122,7 +122,7 @@ jobs: parameters: aptPackages: ${{ parameters.aptPackages }} pipModules: ${{ parameters.pipModules }} - registerRadeon: true + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml parameters: diff --git a/.azuredevops/components/rocprofiler-systems.yml b/.azuredevops/components/rocprofiler-systems.yml index 58ace833f..1d9ca4478 100644 --- a/.azuredevops/components/rocprofiler-systems.yml +++ b/.azuredevops/components/rocprofiler-systems.yml @@ -76,7 +76,7 @@ jobs: parameters: aptPackages: ${{ parameters.aptPackages }} pipModules: ${{ parameters.pipModules }} - registerRadeon: true + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml parameters: @@ -160,7 +160,7 @@ jobs: parameters: aptPackages: ${{ parameters.aptPackages }} pipModules: ${{ parameters.pipModules }} - registerRadeon: true + registerROCmPackages: true - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml parameters: diff --git a/.azuredevops/dependencies/half560.yml b/.azuredevops/dependencies/half560.yml index 2c9bad396..7e08ab6b3 100644 --- a/.azuredevops/dependencies/half560.yml +++ b/.azuredevops/dependencies/half560.yml @@ -19,7 +19,7 @@ jobs: pool: vmImage: ${{ variables.BASE_BUILD_POOL }} container: - image: ${{ variables.DOCKER_IMAGE_NAME }}:${{ variables.LATEST_DOCKER_VERSION }} + image: rocm/dev-ubuntu-22.04:${{ variables.LATEST_RELEASE_VERSION }} workspace: clean: all steps: diff --git a/.azuredevops/templates/steps/dependencies-aqlprofile.yml b/.azuredevops/templates/steps/dependencies-aqlprofile.yml index 191edcde8..66b9d2e69 100644 --- a/.azuredevops/templates/steps/dependencies-aqlprofile.yml +++ b/.azuredevops/templates/steps/dependencies-aqlprofile.yml @@ -4,13 +4,13 @@ steps: inputs: targetType: inline script: | - export packageName=$(curl -s https://repo.radeon.com/rocm/apt/latest/pool/main/h/hsa-amd-aqlprofile/ | grep -oP "href=\"\K[^\"]*$(lsb_release -rs)[^\"]*\.deb") + export packageName=$(curl -s https://repo.radeon.com/rocm/apt/$(REPO_RADEON_VERSION)/pool/main/h/hsa-amd-aqlprofile/ | grep -oP "href=\"\K[^\"]*$(lsb_release -rs)[^\"]*\.deb") echo "##vso[task.setvariable variable=packageName;isreadonly=true]$packageName" - task: Bash@3 displayName: 'Download aqlprofile' inputs: targetType: inline - script: wget -nv https://repo.radeon.com/rocm/apt/latest/pool/main/h/hsa-amd-aqlprofile/$(packageName) + script: wget -nv https://repo.radeon.com/rocm/apt/$(REPO_RADEON_VERSION)/pool/main/h/hsa-amd-aqlprofile/$(packageName) workingDirectory: '$(Pipeline.Workspace)' - task: Bash@3 displayName: 'Extract aqlprofile' diff --git a/.azuredevops/templates/steps/dependencies-other.yml b/.azuredevops/templates/steps/dependencies-other.yml index cea3c1ca5..921aeb965 100644 --- a/.azuredevops/templates/steps/dependencies-other.yml +++ b/.azuredevops/templates/steps/dependencies-other.yml @@ -6,21 +6,21 @@ parameters: - name: pipModules type: object default: [] -- name: registerRadeon +- name: registerROCmPackages type: boolean default: false steps: -- ${{ if eq(parameters.registerRadeon, true) }}: +- ${{ if eq(parameters.registerROCmPackages, true) }}: - task: Bash@3 - displayName: 'Register repo.radeon packages' + displayName: 'Register AMDGPU & ROCm repos' inputs: targetType: inline script: | sudo mkdir --parents --mode=0755 /etc/apt/keyrings wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/latest/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/amdgpu.list - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/latest jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list + echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/$(REPO_RADEON_VERSION)/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/amdgpu.list + echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/$(REPO_RADEON_VERSION) jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | sudo tee /etc/apt/preferences.d/rocm-pin-600 sudo apt update # firefox takes time to upgrade and is not needed for CI workloads, hold version diff --git a/.azuredevops/templates/steps/docker-container.yml b/.azuredevops/templates/steps/docker-container.yml index 2801e3428..52c043e7f 100644 --- a/.azuredevops/templates/steps/docker-container.yml +++ b/.azuredevops/templates/steps/docker-container.yml @@ -154,8 +154,8 @@ steps: script: | echo "RUN mkdir --parents --mode=0755 /etc/apt/keyrings" >> Dockerfile echo "RUN wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null" >> Dockerfile - echo "RUN echo \"deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/latest/ubuntu jammy main\" | tee /etc/apt/sources.list.d/amdgpu.list" >> Dockerfile - echo "RUN echo \"deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/latest jammy main\" | tee --append /etc/apt/sources.list.d/rocm.list" >> Dockerfile + echo "RUN echo \"deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/$(REPO_RADEON_VERSION)/ubuntu jammy main\" | tee /etc/apt/sources.list.d/amdgpu.list" >> Dockerfile + echo "RUN echo \"deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/$(REPO_RADEON_VERSION) jammy main\" | tee --append /etc/apt/sources.list.d/rocm.list" >> Dockerfile echo "RUN printf 'Package: *\\nPin: release o=repo.radeon.com\\nPin-Priority: 600' > /etc/apt/preferences.d/rocm-pin-600" >> Dockerfile echo "RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update" >> Dockerfile - ${{ if eq(parameters.registerCUDAPackages, true) }}: diff --git a/.azuredevops/variables-global.yml b/.azuredevops/variables-global.yml index 17939e517..63a3ca28b 100644 --- a/.azuredevops/variables-global.yml +++ b/.azuredevops/variables-global.yml @@ -27,14 +27,14 @@ variables: value: rocm-ci_larger_base_disk_pool - name: GFX942_TEST_POOL value: gfx942_test_pool +- name: LATEST_RELEASE_VERSION + value: 6.3.2 +- name: REPO_RADEON_VERSION + value: 6.3.2 +- name: NEXT_RELEASE_VERSION + value: 6.4.0 - name: LATEST_RELEASE_TAG - value: rocm-6.1.0 -- name: DOCKER_IMAGE_NAME - value: rocm/dev-ubuntu-22.04 -- name: LATEST_DOCKER_VERSION - value: 6.1 -- name: KEYRING_VERSION - value: 6.3 + value: rocm-6.3.2 - name: AMDMIGRAPHX_GFX942_TEST_PIPELINE_ID value: 197 - name: AMDMIGRAPHX_PIPELINE_ID @@ -151,8 +151,6 @@ variables: value: 105 - name: HIPTENSOR_TAGGED_PIPELINE_ID value: 56 -- name: LAST_RELEASE - value: 6.1.0 - name: LLVM_PROJECT_PIPELINE_ID value: 2 - name: LLVM_PROJECT_TAGGED_PIPELINE_ID @@ -183,10 +181,6 @@ variables: value: 100 - name: RDC_TAGGED_PIPELINE_ID value: 59 -- name: REIMAGE_ORG - value: AGS-ROCm-CI -- name: REIMAGE_REPO - value: cirrascale-reimage-automation - name: ROCAL_PIPELINE_ID value: 151 - name: ROCALUTION_GFX942_TEST_PIPELINE_ID