From 8e98b80deb0a9c70a362db3d385133bb88317189 Mon Sep 17 00:00:00 2001 From: Geo Min Date: Tue, 28 Oct 2025 19:47:17 -0700 Subject: [PATCH] [TheRock CI] Fixing patches for rocm-systems (#1460) * Fixing patches for rocm-systems * Adding all * Adding remaining projects * Submodule bump * adding compiler * adding test commit hash * Adding artifact group * adding update for artifact group * Adding new commit hash --- .github/scripts/therock_configure_ci.py | 11 +++++++---- .github/scripts/therock_matrix.py | 11 ++++++++++- .github/workflows/therock-ci-linux.yml | 5 ++--- .github/workflows/therock-ci-windows.yml | 5 ++--- .github/workflows/therock-test-packages.yml | 3 ++- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/scripts/therock_configure_ci.py b/.github/scripts/therock_configure_ci.py index a24ba9cbb7..4e3a8efabe 100644 --- a/.github/scripts/therock_configure_ci.py +++ b/.github/scripts/therock_configure_ci.py @@ -83,7 +83,7 @@ def check_for_workflow_file_related_to_ci(paths: Optional[Iterable[str]]) -> boo def retrieve_projects(args): if args.get("is_pull_request"): - subtrees = args.get("input_subtrees").split("\n") + subtrees = list(subtree_to_project_map.keys()) if args.get("is_workflow_dispatch"): if args.get("input_projects") == "all": @@ -111,9 +111,12 @@ def retrieve_projects(args): # retrieve the subtrees to checkout, cmake options to build, and projects to test project_to_run = [] - for project in projects: - if project in project_map: - project_to_run.append(project_map.get(project)) + # Currently as we have no tests, we just build all packages available if an applicable change is made. + # As we start to get an idea of test times, we can divide test jobs. + if projects: + for project in ["all"]: + if project in project_map: + project_to_run.append(project_map.get(project)) return project_to_run diff --git a/.github/scripts/therock_matrix.py b/.github/scripts/therock_matrix.py index eb327786a0..731ded3647 100644 --- a/.github/scripts/therock_matrix.py +++ b/.github/scripts/therock_matrix.py @@ -6,11 +6,16 @@ subtree_to_project_map = { 'projects/clr': 'core', 'projects/hip': 'core', 'projects/hip-tests': 'core', + 'projects/hipother': 'core', + 'projects/rdc': 'rdc', + 'projects/rocm-core': 'core', + 'projects/rocm-smi-lib': 'core', 'projects/rocminfo': 'core', - 'projects/rocprofiler': 'profiler', 'projects/rocprofiler-compute': 'profiler', + 'projects/rocprofiler-register': 'profiler', 'projects/rocprofiler-sdk': 'profiler', 'projects/rocprofiler-systems': 'profiler', + 'projects/rocprofiler': 'profiler', 'projects/rocr-runtime': 'core', 'projects/roctracer': 'profiler' } @@ -24,4 +29,8 @@ project_map = { "cmake_options": "-DTHEROCK_ENABLE_PROFILER=ON -DTHEROCK_ENABLE_ALL=OFF", "project_to_test": "rocprofiler-tests", }, + "all": { + "cmake_options": "-DTHEROCK_ENABLE_CORE=ON -DTHEROCK_ENABLE_PROFILER=ON -DTHEROCK_ENABLE_ALL=OFF", + "project_to_test": "hip-tests, rocprofiler-tests", + } } diff --git a/.github/workflows/therock-ci-linux.yml b/.github/workflows/therock-ci-linux.yml index b747ce3aff..ce9abc3f87 100644 --- a/.github/workflows/therock-ci-linux.yml +++ b/.github/workflows/therock-ci-linux.yml @@ -38,7 +38,7 @@ jobs: with: repository: "ROCm/TheRock" path: "TheRock" - ref: 83b25f87ea8f163ef37295f28204a9b4ab86f168 # 2025-09-30 commit + ref: 550a6f7f6af0deaafba352da1dd0674e146902b6 # 2025-10-28 commit - name: Install python deps run: | @@ -69,7 +69,6 @@ jobs: - name: Patch rocm-systems run: | - rm ./TheRock/patches/amd-mainline/rocm-systems/0007-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch git -c user.name="therockbot" -c "user.email=therockbot@amd.com" am --whitespace=nowarn ./TheRock/patches/amd-mainline/rocm-systems/*.patch - name: Configure Projects @@ -115,7 +114,7 @@ jobs: run: | python TheRock/build_tools/github_actions/post_build_upload.py \ --run-id ${{ github.run_id }} \ - --amdgpu-family ${{ env.AMDGPU_FAMILIES }} \ + --artifact-group ${{ env.AMDGPU_FAMILIES }} \ --build-dir TheRock/build \ --upload diff --git a/.github/workflows/therock-ci-windows.yml b/.github/workflows/therock-ci-windows.yml index a440a6bd73..f3b786ed02 100644 --- a/.github/workflows/therock-ci-windows.yml +++ b/.github/workflows/therock-ci-windows.yml @@ -39,7 +39,7 @@ jobs: with: repository: "ROCm/TheRock" path: "TheRock" - ref: 83b25f87ea8f163ef37295f28204a9b4ab86f168 # 2025-09-30 commit + ref: 550a6f7f6af0deaafba352da1dd0674e146902b6 # 2025-10-28 commit - name: Set up Python uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 @@ -52,7 +52,6 @@ jobs: - name: Patch rocm-systems run: | - rm ./TheRock/patches/amd-mainline/rocm-systems/0007-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch git -c user.name="therockbot" -c "user.email=therockbot@amd.com" am --whitespace=nowarn ./TheRock/patches/amd-mainline/rocm-systems/*.patch - name: Install requirements @@ -143,7 +142,7 @@ jobs: run: | python TheRock/build_tools/github_actions/post_build_upload.py \ --run-id ${{ github.run_id }} \ - --amdgpu-family ${{ env.AMDGPU_FAMILIES }} \ + --artifact-group ${{ env.AMDGPU_FAMILIES }} \ --build-dir ${{ env.BUILD_DIR }} \ --upload diff --git a/.github/workflows/therock-test-packages.yml b/.github/workflows/therock-test-packages.yml index 03910e4649..9a0cb80a6f 100644 --- a/.github/workflows/therock-test-packages.yml +++ b/.github/workflows/therock-test-packages.yml @@ -92,12 +92,13 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: "ROCm/TheRock" + ref: 550a6f7f6af0deaafba352da1dd0674e146902b6 # 2025-10-28 commit - name: Run setup test environment workflow uses: './.github/actions/setup_test_environment' with: ARTIFACT_RUN_ID: ${{ env.ARTIFACT_RUN_ID }} - AMDGPU_FAMILIES: ${{ inputs.amdgpu_families }} + ARTIFACT_GROUP: ${{ inputs.amdgpu_families }} OUTPUT_ARTIFACTS_DIR: ${{ env.OUTPUT_ARTIFACTS_DIR }} VENV_DIR: ${{ env.VENV_DIR }} FETCH_ARTIFACT_ARGS: ${{ matrix.components.fetch_artifact_args }}