Skip to content
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.

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

support cpp wheels in 'rapids-wheels-anaconda' #105

Merged
merged 5 commits into from
May 1, 2024

Conversation

jameslamb
Copy link
Member

Contributes to rapidsai/build-planning#44.

Proposes removing hardcoding of _python_ in the search for artifact names performed by rapids-wheels-anaconda, to enable uploading of C++ wheels (which will have _cpp_ in artifact names).

Notes for Reviewers

I think this would be safe to merge right now... it should be totally backwards-compatible because it defaults to _python_ when a pkg_type isn't supplied.

To see how the entire S3 object key is computed, also see this:

## For PR builds:
## s3://rapids-downloads/ci/<REPO_NAME>/pull-request/<PR_NUMBER>/<SHORT_HASH>/
## For branch builds:
## s3://rapids-downloads/ci/<REPO_NAME>/branch/<BRANCH_NAME>/<SHORT_HASH>/
## For nightly builds:
## s3://rapids-downloads/nightly/<REPO_NAME>/<DATE>/<SHORT_HASH>/

Related to:

@jameslamb jameslamb added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Apr 30, 2024
@vyasr
Copy link
Contributor

vyasr commented May 1, 2024

Testing in rapidsai/ucx-wheels#2

Copy link
Contributor

@msarahan msarahan left a comment

Choose a reason for hiding this comment

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

approved pending results from Vyas' testing

Copy link
Contributor

@vyasr vyasr left a comment

Choose a reason for hiding this comment

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

LGTM! We have a test confirming that this works.

Copy link
Member

@ajschmidt8 ajschmidt8 left a comment

Choose a reason for hiding this comment

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

LGTM.

Do you think it's worth adding a case statement to ensure PKG_TYPE is cpp or python?

Similar to what we do here:

case "${pkg_type}" in
cpp)
;&
python)
;;
*)
rapids-echo-stderr 'Pass "cpp" or "python" as an argument.'
exit 1
;;
esac

@jameslamb
Copy link
Member Author

Great suggestion, thanks @ajschmidt8. Just pushed ad0e188 adding that.

Tested it by adding one of these after the case block

echo "--- ${PKG_TYPE}"
exit 6

and then a few different combinations

# fails with this error
PATH="${PWD}/tools:${PATH}" rapids-wheels-anaconda beepboop cpp2

# succeeds
PATH="${PWD}/tools:${PATH}" rapids-wheels-anaconda beepboop cpp

# succeeds
PATH="${PWD}/tools:${PATH}" rapids-wheels-anaconda beepboop python

# succeeds, defaults to 'python'
PATH="${PWD}/tools:${PATH}" rapids-wheels-anaconda beepboop

Copy link
Member

@ajschmidt8 ajschmidt8 left a comment

Choose a reason for hiding this comment

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

merge away!

@jameslamb jameslamb merged commit a7b01fc into rapidsai:main May 1, 2024
1 check passed
@jameslamb
Copy link
Member Author

Thanks for the reviews!

@jameslamb jameslamb deleted the cpp-wheels branch May 1, 2024 20:04
rapids-bot bot pushed a commit to rapidsai/cudf that referenced this pull request Aug 23, 2024
…lishing (#16650)

Follow-up to #15483.

Contributes to rapidsai/build-planning#33

Wheel publishing for `libcudf` is failing like this:

```text
Error:  File "./dist/*.whl" does not exist
```

([build link](https://github.com/rapidsai/cudf/actions/runs/10528569930/job/29176811683))

Because the `package-type` was not set to `cpp` in the `wheels-publish` CI workflow, and that workflow defaults to `python`. ([shared-workflows code link](https://github.com/rapidsai/shared-workflows/blob/157e9824e6e2181fca9aa5c4bea4defd4cc322b0/.github/workflows/wheels-publish.yaml#L23-L26)).

This fixes that, and makes that choice explicit for all wheel publishing jobs.

References for this `package-type` argument:

* rapidsai/shared-workflows#209
* rapidsai/gha-tools#105

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - Bradley Dice (https://github.com/bdice)

URL: #16650
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improves an existing functionality non-breaking Introduces a non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants