Skip to content

Help get Geo's workflow working with Marius #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amd-chrissosa wants to merge 7 commits into from
Closed

Help get Geo's workflow working with Marius #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e400717
Make Geo's PR work correctly (can only work on PRs)
May 22, 2025
c9ee745
Add a small rocPrim change to test and fix bug
May 22, 2025
af163ab
Support draft
May 22, 2025
847c86f
Update on to fire correctly
May 22, 2025
f586d3c
Merge Marius changes with Geos
May 22, 2025
b2f5268
small fix
May 22, 2025
9238cf4
small fix2
May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/repos-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"category": "projects",
"auto_subtree_pull": false,
"auto_subtree_push": true,
"enable_pr_fanout": false
"enable_pr_fanout": true
},
{
"name": "rocrand",
Expand Down
44 changes: 33 additions & 11 deletions .github/workflows/therock-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Copy link
Copy Markdown
Member

@marbre marbre May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The location for the script will be

Suggested change
python TheRock/build_tools/github_actions/patch_monorepo.py \
python TheRock/build_tools/patch_monorepo.py \

if we don't move it to github_actions.

Copy link
Copy Markdown
Collaborator

@geomin12 geomin12 May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think since this is specific to github actions, we can keep it there!

Copy link
Copy Markdown
Member

@marbre marbre May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rephrase: This has never been in a github_actions subdirectory and as soon as I merge my PR it will be in the path suggested above.

Copy link
Copy Markdown
Collaborator

@geomin12 geomin12 May 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh apologies, I was looking at the wrong script! but yes, certainly can be an easy change

--repo rocm-libraries

- name: Generate a token
id: generate-token
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
Copy link
Copy Markdown
Member

@marbre marbre May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs

Suggested change
extra_cmake_options: "-DTHEROCK_ENABLE_PRIM=ON -DTHEROCK_ENABLE_ALL=OFF THEROCK_USE_EXTERNAL_ROCM_LIBRARIES=ON THEROCK_ROCM_LIBRARIES_SOURCE_DIR=rocm-libraries"
extra_cmake_options: "-DTHEROCK_ENABLE_PRIM=ON -DTHEROCK_ENABLE_ALL=OFF -DTHEROCK_USE_EXTERNAL_ROCM_LIBRARIES=ON -DTHEROCK_ROCM_LIBRARIES_SOURCE_DIR=rocm-libraries"


therock-test-linux:
name: "rocPRIM math-lib test"
Expand Down
2 changes: 1 addition & 1 deletion projects/rocprim/rmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading