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

Remove NumPy <2 pin, remove panel ceiling #622

Merged
merged 12 commits into from
Sep 24, 2024

Conversation

seberg
Copy link
Contributor

@seberg seberg commented Aug 19, 2024

This PR removes the NumPy<2 pin which is expected to work for
RAPIDS projects once CuPy 13.3.0 is released (CuPy 13.2.0 had
some issues preventing the use with NumPy 2).

EDIT: Sorry, converted back to draft again, NumPy 2 is not yet picked up.

@seberg seberg added non-breaking Non-breaking change improvement Improvement / enhancement to an existing function labels Aug 19, 2024
@seberg seberg closed this Aug 28, 2024
@seberg seberg reopened this Aug 28, 2024
@seberg seberg marked this pull request as ready for review August 28, 2024 11:22
@seberg seberg requested a review from a team as a code owner August 28, 2024 11:22
@seberg seberg requested a review from msarahan August 28, 2024 11:22
@seberg seberg marked this pull request as draft August 28, 2024 11:22
@jakirkham
Copy link
Member

Note that cuxfilter depends on cuspatial

- &cuspatial_unsuffixed cuspatial==24.10.*,>=0.0.0a0

So this depends on PR: rapidsai/cuspatial#1441

@jakirkham
Copy link
Member

cc @jameslamb (for awareness)

@seberg
Copy link
Contributor Author

seberg commented Aug 29, 2024

Yeah, sorry, I unmarked draft too early, but I think once things are in place and NumPy is picked up we can make it no-draft again and it should be good.

@jakirkham
Copy link
Member

All good. Was more looping in James as we had discussed the cuSpatial NumPy 2 PR earlier

@github-actions github-actions bot added the ci label Sep 19, 2024
@jameslamb jameslamb self-assigned this Sep 19, 2024
@jameslamb
Copy link
Member

I've taken over rapidsai/cuspatial#1441 and so am testing here too.

Got cuspatial to a state where it can be installed alongside Numpy (2.0.2): rapidsai/cuspatial#1441 (comment)

I pushed commits here to use the packages built from that PR's CI. Let's see if it'll be enough to loosen the pin here!

@github-actions github-actions bot removed the ci label Sep 24, 2024
@jameslamb
Copy link
Member

Putting an explicit >=2.0 floor here, I see all builds and tests passing!

  - numpy                                     1.26.4  py312heda63a1_0                      conda-forge             Cached
  + numpy                                      2.0.2  py312h58c1407_0                      conda-forge                8MB

(build link)

That's evidence that cuxfilter and its dependencies can be installed alongside NumPy 2.x.

Now that rapidsai/cuspatial#1441 is merged, I just pushed commits removing all the testing-only changes here and moving that pin back down to >=1.23,<3.0.0a0.

Hopefully we'll see everything pass here and use NumPy 2.x.

@@ -260,9 +260,6 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- output_types: conda
packages:
- panel>=1.0,<=1.3.4
Copy link
Member

Choose a reason for hiding this comment

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

Interested to see how this goes

If we need to ignore a specific version, maybe we can do !=

Though if this is just the case of working around a past solver issue or limiting to a set of tested releases, then simply dropping seems reasonable

Maybe we can follow up with the cuxfilter team on which makes more sense

Copy link
Member

Choose a reason for hiding this comment

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

Yep for sure!

Note this pin is only for the testing environment.... it's already unpinned (>=1.0) at runtime for users.

@AjayThorve could the ceiling on panel be removed?

I do see evidence that it helps conda find a solve with cuxftiler=24.10.* and numpy>=2.0.

  + bokeh                                      3.5.2  pyhd8ed1ab_0                         conda-forge                5MB
  + numpy                                      2.0.2  py312h58c1407_0                      conda-forge                8MB
  + panel                                      1.5.0  pyhd8ed1ab_0                         conda-forge               21MB

(build link)

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, AFAIK, there are no issues at runtime, so as long as the tests pass (seems like they do), this should be fine

Copy link
Member

Choose a reason for hiding this comment

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

Great, thank you!

@jameslamb jameslamb marked this pull request as ready for review September 24, 2024 13:19
Copy link
Member

@AjayThorve AjayThorve left a comment

Choose a reason for hiding this comment

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

LGTM!

@@ -260,9 +260,6 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- output_types: conda
packages:
- panel>=1.0,<=1.3.4
Copy link
Member

Choose a reason for hiding this comment

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

Yeah, AFAIK, there are no issues at runtime, so as long as the tests pass (seems like they do), this should be fine

@jameslamb jameslamb changed the title Remove NumPy <2 pin Remove NumPy <2 pin, remove panel ceiling Sep 24, 2024
@jameslamb jameslamb self-requested a review September 24, 2024 16:26
@jameslamb
Copy link
Member

/merge

@rapids-bot rapids-bot bot merged commit 516b1f0 into rapidsai:branch-24.10 Sep 24, 2024
31 checks passed
@jakirkham
Copy link
Member

Thanks all! 🙏

@seberg seberg deleted the my_new_branch branch September 25, 2024 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conda improvement Improvement / enhancement to an existing function non-breaking Non-breaking change Python
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants