diff --git a/.github/scripts/therock_matrix.py b/.github/scripts/therock_matrix.py index 7e2e7bbbe18d..0d9119860939 100644 --- a/.github/scripts/therock_matrix.py +++ b/.github/scripts/therock_matrix.py @@ -6,7 +6,8 @@ "projects/rocthrust": "prim", "projects/hipcub": "prim", "projects/rocrand": "rand", - "projects/hiprand": "rand" + "projects/hiprand": "rand", + "projects/composablekernel": "composablekernel" } project_map = { @@ -20,4 +21,19 @@ "project_to_test": "rocrand, hiprand", "subtree_checkout": "projects/rocrand\nprojects/hiprand", }, + "composablekernel": { + "cmake_options": "-DTHEROCK_ENABLE_COMPOSABLE_KERNEL=ON -DTHEROCK_ENABLE_MIOPEN=ON -DTHEROCK_ENABLE_ALL=OFF", + "project_to_test": "miopen", + "subtree_checkout": """ + projects/composablekernel + projects/hipblaslt + projects/hipblas + projects/hipblas-common + projects/rocblas + projects/rocrand + projects/hiprand + shared/mxdatagenerator + shared/rocroller + shared/tensile""", + } } diff --git a/.github/workflows/therock-ci-linux.yml b/.github/workflows/therock-ci-linux.yml index 2c639c555059..085b01649418 100644 --- a/.github/workflows/therock-ci-linux.yml +++ b/.github/workflows/therock-ci-linux.yml @@ -52,6 +52,7 @@ jobs: with: repository: "ROCm/TheRock" path: "TheRock" + ref: "users/geomin12/monorepo-ck" - name: Runner Health Settings run: | @@ -71,6 +72,12 @@ jobs: run: | ./TheRock/build_tools/fetch_sources.py --jobs 12 --no-include-math-libs + - name: Patch monorepo + run: | + python TheRock/build_tools/patch_rocm_libraries.py \ + --repo ./ \ + --projects rocBLAS hipBLASLt hipBLAS + - name: Install python deps run: | pip install -r TheRock/requirements.txt diff --git a/.github/workflows/therock-ci-windows.yml b/.github/workflows/therock-ci-windows.yml index 7ddc5a51992a..0ad3e0c60ea3 100644 --- a/.github/workflows/therock-ci-windows.yml +++ b/.github/workflows/therock-ci-windows.yml @@ -54,6 +54,7 @@ jobs: with: repository: "ROCm/TheRock" path: "TheRock" + ref: "users/geomin12/monorepo-ck" - name: Set up Python uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 diff --git a/.github/workflows/therock-ci.yml b/.github/workflows/therock-ci.yml index f160eff6af7c..17f63667c5ee 100644 --- a/.github/workflows/therock-ci.yml +++ b/.github/workflows/therock-ci.yml @@ -40,14 +40,6 @@ jobs: sparse-checkout: .github sparse-checkout-cone-mode: true - # # will be needed for `patch_monorepo.py` but necessary now - # - name: Checkout TheRock Repository - # uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - # with: - # repository: "ROCm/TheRock" - # path: "TheRock" - # ref: 0730cccf8b98e012d64750f26032bd760360fa45 - - name: Set up Python uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 with: @@ -58,12 +50,6 @@ jobs: python -m pip install --upgrade pip pip install pydantic requests - # # For our "rocPRIM" MVP, there are no patches to apply. This will be un-commented and used later! - # - name: Patch monorepo - # run: | - # python TheRock/build_tools/github_actions/patch_monorepo.py \ - # --repo rocm-libraries - - name: Detect changed subtrees id: detect if: github.event_name == 'pull_request'