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

NumPy 1.25 support (PR #9011) continued #9105

Merged
merged 32 commits into from Aug 1, 2023
Merged

NumPy 1.25 support (PR #9011) continued #9105

merged 32 commits into from Aug 1, 2023

Conversation

gmarkall
Copy link
Member

This continues PR #9011, which has been closed as the original author is no longer working on it. The branch for this PR is the same as it was on #9011, with the test_parfors.py change reverted as requested in https://github.com/numba/numba/pull/9011/files#r1261153152.

apmasell and others added 30 commits June 12, 2023 16:52
NumPy 1.25 has two major changes:

- allow mixed signed comparisons ufuncs (the `qQ->?` and `Qq->?`
  implementations for `>`, `<`, `>=`, `<=`, `==`, `!=`); this mode was not
  supported by Numba and an appropriate implementation is added to match the C
  implementation in NumPy.
- the implementation of `sin` and `cos` are changed in a way that produces
  slightly different numeric results. This either lowers the comparison
  precision where these functions are used in tests or replaces them with
  another function (mostly `exp`) to avoid the differences.
Changes the implementations to use `select` rather than a branching path for
better optimization potential.
The corresponding change was removed from NumPy 1.25 so any numeric changes for
sin/cos are also being reverted.
Switch `numpy.core.umath_tests.matrix_multiply`, which is private API, with
`numpy.matmul`, which is public.
Co-authored-by: stuartarchibald <stuartarchibald@users.noreply.github.com>
Co-authored-by: stuartarchibald <stuartarchibald@users.noreply.github.com>
This function has been renamed in 1.25
These use to be the same implementation, so only one was binding was required,
but now that they are deprecated, separate bindings necessary as the
implementations are split to trigger warnings.
As requested in review.
NumPy 1.25 packages are not provided for Python < 3.10 on the default
conda channel, so we need to use a newer version.
There isn't a suitable RAPIDS image with 3.10 that keeps the versions of
all other components the same, so instead we'll keep the 3.8 image and
create a 3.10 environment in it.
As titled.
This reverts commit 1a1c7c1.

Reverted as this should not be required, as per discussion on
https://github.com/numba/numba/pull/9011/files#r1261153152
@gmarkall
Copy link
Member Author

gpuci run tests

sklam
sklam previously approved these changes Jul 31, 2023
Copy link
Member

@sklam sklam left a comment

Choose a reason for hiding this comment

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

I went through this PR and all conversation in #9011. I believe all review suggestions are addressed.

@gmarkall
Copy link
Member Author

I just noticed we're only going up to NumPy 1.24 for Azure CI on Windows and macOS, which seems like an oversight. Going to update this to 1.25 and re-run CI.

@gmarkall
Copy link
Member Author

gpuci run tests

@gmarkall
Copy link
Member Author

@sklam @esc Just re-testing with NumPy 1.25 on Windows and macOS on Azure now (just added in the latest commit f409e3a)

@gmarkall
Copy link
Member Author

gpuci run tests

@esc esc added 4 - Waiting on CI Review etc done, waiting for CI to finish and removed 3 - Ready for Review labels Aug 1, 2023
@esc
Copy link
Member

esc commented Aug 1, 2023

This passed on our build farm as numba_yaml_380 🍏

@esc esc added 5 - Ready to merge Review and testing done, is ready to merge and removed 4 - Waiting on CI Review etc done, waiting for CI to finish labels Aug 1, 2023
Copy link
Member

@esc esc left a comment

Choose a reason for hiding this comment

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

Reviewed by @sklam and completed testing on the build-farm.

Copy link
Member

@esc esc left a comment

Choose a reason for hiding this comment

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

RTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5 - Ready to merge Review and testing done, is ready to merge highpriority numpy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants