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

simplify wheel CI scripts, other small packaging changes #6190

Open
wants to merge 8 commits into
base: branch-25.02
Choose a base branch
from

Conversation

jameslamb
Copy link
Member

@jameslamb jameslamb commented Dec 18, 2024

Fixes #6023

Proposes some miscellaneous packaging cleanup:

  • updates rapids-dependency-file-generator to its latest version (1.17.0) in pre-commit config
  • removes unused PACKAGE_CUDA_SUFFIX in build_wheel.sh
  • removes unnecessary pip install cmake in test_wheel.sh
  • CMake option cleanup:
  • dependencies.yaml changes:
    • breaks some dependencies out into depends_on_* groups to reduce duplication, and for consistency with other RAPIDS projects (docs explaining this)
    • alphabetizes dependency lists

@jameslamb jameslamb added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Dec 18, 2024

This comment was marked as resolved.

@jameslamb
Copy link
Member Author

/ok to test

@jameslamb jameslamb changed the title WIP: re-organize dependencies.yaml WIP: simplify wheel CI scripts, other small packaging changes Dec 23, 2024
@jameslamb
Copy link
Member Author

/ok to test

@github-actions github-actions bot added the Cython / Python Cython or Python issue label Dec 23, 2024
@jameslamb jameslamb changed the title WIP: simplify wheel CI scripts, other small packaging changes simplify wheel CI scripts, other small packaging changes Dec 23, 2024
@jameslamb jameslamb marked this pull request as ready for review December 23, 2024 22:24
@jameslamb jameslamb requested review from a team as code owners December 23, 2024 22:24
@@ -142,9 +173,7 @@ dependencies:
- cxx-compiler
- fmt>=11.0.2,<12
- libcumlprims==25.2.*,>=0.0.0a0
- libcuvs==25.2.*,>=0.0.0a0
- libraft-headers==25.2.*,>=0.0.0a0
Copy link
Contributor

Choose a reason for hiding this comment

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

We could move/remove libcumlprims and libraft-headers into their own depends_on_X lists. Or maybe we can remove libraft-headers here? We did that in cugraph, iirc. This is not a blocker, I defer to your judgment.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think we want to remove libraft-headers here. That was fine in rapidsai/cugraph#4805 (comment) because there, it was coming through transitively via libraft.

cuml's environments and conda recipes don't depend on libraft, so I think it's still needed here.

I just pushed b9a0bb0 moving libcumlprims and libraft-headers into depends_on lists. They were only used once so it doesn't remove any duplication today, but it's helpful for applying this depends_on convention consistently across RAPIDS, and keeps the diff of a future change using those packages in more places smaller.

I'll merge this once CI passes.

@jameslamb jameslamb force-pushed the dependencies-cleanup branch from 4d51566 to b9a0bb0 Compare December 24, 2024 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci CMake CUDA/C++ Cython / Python Cython or Python issue improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dropping CMake install in ARM wheel tests?
2 participants