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.

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

Jump to bottom

Forward-merge branch-24.08 into branch-24.10 #1410

Merged
merged 12 commits into from
Jul 26, 2024
Merged

Forward-merge branch-24.08 into branch-24.10 #1410

merged 12 commits into from
Jul 26, 2024

Conversation

jakirkham
Copy link
Member

@jakirkham jakirkham commented Jul 19, 2024 •
edited by bdice
Loading

Description

Resolve conflicts in forward merger: #1408

Closes #1416.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

KyleFromNVIDIA and others added 3 commits July 19, 2024 19:14
@KyleFromNVIDIA
Build and test with CUDA 12.5.1 (rapidsai#1405)
068f461 
This PR updates the latest CUDA build/test version 12.2.2 to 12.5.1.

Contributes to rapidsai/build-planning#73

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - https://github.com/jakirkham

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

URL: rapidsai#1405
@KyleFromNVIDIA
Use verify-alpha-spec hook (rapidsai#1399)
76e6113 
Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

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

URL: rapidsai#1399
@jakirkham
Conda: Move cmake to requirements/build (rapidsai#1409)
2bbb904 
Previously `cmake` was added to `requirements/host`. However it is a build tool. So should be placed in `requirements/build`. This makes that change in relevant recipes.

Authors:
  - https://github.com/jakirkham

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

URL: rapidsai#1409
@jakirkham jakirkham requested review from a team as code owners July 19, 2024 23:18
@github-actions github-actions bot added the conda Related to conda and conda configuration label Jul 19, 2024
@jakirkham jakirkham mentioned this pull request Jul 19, 2024
Merged
vyasr
vyasr approved these changes Jul 19, 2024
View reviewed changes
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.

Contents look fine but you need to run pre-commit.

@jakirkham
Copy link
Member Author

Hmm...ran RDFG locally and it didn't change anything. What am I missing?

jakirkham
jakirkham commented Jul 19, 2024
View reviewed changes
.pre-commit-config.yaml
Comment on lines +45 to -53
- repo: https://github.com/rapidsai/pre-commit-hooks
rev: v0.2.0
hooks:
- id: verify-copyright
- id: verify-alpha-spec
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.13.11
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
- repo: https://github.com/rapidsai/pre-commit-hooks
rev: v0.0.3
hooks:
- id: verify-copyright
Copy link
Member Author

Choose a reason for hiding this comment

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

The updates to RAPIDS pre-commit-hooks meant that branch-24.10 is out-of-date relative to the pre-commit-hooks expectations. So resolving conflicts in this case also means using the new pre-commit-hooks

Maybe it is worth figuring out a better way to update pre-commit hooks so that we are not accidentally introducing conflicts in bot forward (or backward) auto-mergers

@jakirkham
Copy link
Member Author

Also CI is failing now as 24.10 nightlies are not available. So may be a bit before this is resolved

@jakirkham jakirkham added bug Something isn't working non-breaking Non-breaking change improvement Improvement / enhancement to an existing function and removed bug Something isn't working labels Jul 20, 2024
mroeschke and others added 7 commits July 25, 2024 02:07
@mroeschke
Ensure _from_data accepts columns objects only (rapidsai#1415)
7f76560 
rapidsai/cudf#16285 makes `_from_data` explicitly requires the `data.values()` to all be a `ColumnBase`. This PR either ensures they are columns or just goes through the normal `GeoDataFrame`/`DataFrame` constructor if they are not.

Authors:
  - Matthew Roeschke (https://github.com/mroeschke)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#1415
@jameslamb
split up CUDA-suffixed dependencies in dependencies.yaml (rapidsai#1414)
58d4212 
Contributes to rapidsai/build-planning#31

In short, RAPIDS DLFW builds want to produce wheels with unsuffixed dependencies, e.g. `cudf` depending on `rmm`, not `rmm-cu12`.

This PR is part of a series across all of RAPIDS to try to support that type of build by setting up CUDA-suffixed and CUDA-unsuffixed dependency lists in `dependencies.yaml`.

For more details, see:
* rapidsai/build-planning#31 (comment)
* rapidsai/cudf#16183

## Notes for Reviewers

### Why target 24.08?

This is targeting 24.08 because:

1. it should be very low-risk
2. getting these changes into 24.08 prevents the need to carry around patches for every library in DLFW builds using RAPIDS 24.08

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

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: rapidsai#1414
@bdice
Fix alpha specs in dependencies.yaml.
71b7a1a
@bdice
Update dependencies.
3e155a3
@bdice
Use CUDA 12.5 devcontainers.
f7ec971
@bdice
Fix CUDA 12.5.
35e4cc1
@bdice
Merge branch 'fix-update-version-dependencies-alpha-spec' into branch…
84dd6aa 
…-24.10-merge-24.08
@github-actions github-actions bot added the ci label Jul 26, 2024
@bdice
Copy link
Contributor

bdice commented Jul 26, 2024

I started fixing some things in #1417 and realized this PR has most of the same diff. I pushed a fix to update-version.sh to this PR. Hopefully CI will run now. I will close #1417 and request an admin to non-squash merge this PR once CI passes.

@bdice bdice mentioned this pull request Jul 26, 2024
Closed
3 tasks
@jakirkham
Copy link
Member Author

Thanks Bradley! 🙏

@bdice bdice requested a review from a team as a code owner July 26, 2024 20:00
@bdice bdice requested review from thomcom and harrism July 26, 2024 20:00
@github-actions github-actions bot added the Python Related to Python code label Jul 26, 2024
@AyodeAwe AyodeAwe merged commit 5eca3b4 into rapidsai:branch-24.10 Jul 26, 2024
67 of 68 checks passed
@bdice bdice mentioned this pull request Jul 26, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vyasr vyasr vyasr approved these changes

@raydouglass raydouglass Awaiting requested review from raydouglass raydouglass is a code owner automatically assigned from rapidsai/packaging-codeowners

@thomcom thomcom Awaiting requested review from thomcom thomcom is a code owner automatically assigned from rapidsai/cuspatial-python-codeowners

@harrism harrism Awaiting requested review from harrism harrism is a code owner automatically assigned from rapidsai/cuspatial-python-codeowners

Assignees
No one assigned
Labels
ci conda Related to conda and conda configuration improvement Improvement / enhancement to an existing function non-breaking Non-breaking change Python Related to Python code
Projects
cuSpatial
Status: Todo
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jakirkham @bdice @vyasr @AyodeAwe @KyleFromNVIDIA @mroeschke @jameslamb