diff --git a/.github/repos-config.json b/.github/repos-config.json index 836ad59fdd2..168dd428b4d 100644 --- a/.github/repos-config.json +++ b/.github/repos-config.json @@ -133,7 +133,7 @@ "category": "projects", "auto_subtree_pull": false, "auto_subtree_push": true, - "enable_pr_fanout": false + "enable_pr_fanout": true }, { "name": "rocrand", diff --git a/.github/workflows/therock-ci.yml b/.github/workflows/therock-ci.yml index c7570c0421c..ee6c5c26e7a 100644 --- a/.github/workflows/therock-ci.yml +++ b/.github/workflows/therock-ci.yml @@ -3,11 +3,25 @@ name: TheRock CI on: push: branches: + # Remove later. - users/geomin12/therock-ci pull_request: types: - opened - synchronize + - reopened + - ready_for_review + - draft + branches: + # Remove later. + - users/geomin12/therock-ci + #- 'develop' + #- 'staging' + #- 'main' + paths-ignore: + - '.github/**' + - 'docs/**' + - '*.md' permissions: contents: read @@ -27,17 +41,29 @@ jobs: outputs: jobs: ${{ steps.jobs.outputs.jobs }} steps: + # Checkout the mono-repo which includes the PR. - name: Checkout rocm-libraries Repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - repository: "ROCm/rocm-libraries" + path: + rocm-libraries - name: Checkout TheRock Repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: "ROCm/TheRock" path: "TheRock" - ref: users/geomin12/monorepo-therock-test + ref: users/sosa/monorepo-therock-test + + - name: Set up Python + uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: '3.12' + + - name: Patch monorepo + run: | + python TheRock/build_tools/github_actions/patch_monorepo.py \ + --repo rocm-libraries - name: Generate a token id: generate-token @@ -47,11 +73,6 @@ jobs: private-key: ${{ secrets.APP_PRIVATE_KEY }} owner: ${{ github.repository_owner }} - - name: Set up Python - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 - with: - python-version: '3.12' - - name: Install python dependencies run: | python -m pip install --upgrade pip @@ -60,13 +81,14 @@ jobs: # get the script, see what PR items there are (or do checkout process or share with Joseph's work) - name: Detect changed subtrees id: detect + if: github.event_name == 'pull_request' env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} run: | - python .github/scripts/pr_detect_changed_subtrees.py \ + python rocm-libraries/.github/scripts/pr_detect_changed_subtrees.py \ --repo "${{ github.repository }}" \ --pr "${{ github.event.pull_request.number }}" \ - --config ".github/repos-config.json" + --config "rocm-libraries/.github/repos-config.json" - name: Determine jobs to run id: jobs @@ -83,11 +105,11 @@ jobs: permissions: contents: read id-token: write - uses: ROCm/TheRock/.github/workflows/build_linux_packages.yml@users/geomin12/monorepo-therock-test + uses: ROCm/TheRock/.github/workflows/build_linux_packages.yml@users/sosa/monorepo-therock-test with: amdgpu_families: "gfx94X-dcgpu" expect_failure: false - extra_cmake_options: "-DTHEROCK_ENABLE_PRIM=ON -DTHEROCK_ENABLE_ALL=OFF" + extra_cmake_options: "-DTHEROCK_ENABLE_PRIM=ON -DTHEROCK_ENABLE_ALL=OFF THEROCK_USE_EXTERNAL_ROCM_LIBRARIES=ON THEROCK_ROCM_LIBRARIES_SOURCE_DIR=rocm-libraries" therock-test-linux: name: "rocPRIM math-lib test" diff --git a/projects/rocprim/rmake.py b/projects/rocprim/rmake.py index dd9cc3993d8..96048e83d95 100644 --- a/projects/rocprim/rmake.py +++ b/projects/rocprim/rmake.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 """ Copyright (c) 2021-2025 Advanced Micro Devices, Inc. All rights reserved. -Manage build and installation""" +Manage the build and installation""" import re import sys