Skip to content

fix: correct dtypes for numpy v2 #3159

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

Merged
merged 8 commits into from
Jun 21, 2024
+12 −18
Merged

fix: correct dtypes for numpy v2 #3159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a13a949
fix: import numpy for tests
ianna Jun 19, 2024
facb5a0
fix: use the platform integer type
ianna Jun 20, 2024
894594c
fix: use type
ianna Jun 20, 2024
c4c1be0
fix: np.intp type
ianna Jun 20, 2024
fa313c4
fix: only for numpy 2+
ianna Jun 20, 2024
23fab58
fix: remove duplicate workflows and test windows with numpy v1.xx
ianna Jun 20, 2024
10142f3
fix: add coverage
ianna Jun 21, 2024
430413c
fix: remove duplicate test
ianna Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ jobs:
python-architecture: x86
runs-on: windows-latest
dependencies-kind: full
- python-version: '3.9'
python-architecture: x86
runs-on: windows-latest
dependencies-kind: numpy1
- python-version: '3.8'
python-architecture: x64
runs-on: ubuntu-latest
Expand All @@ -61,18 +65,6 @@ jobs:
python-architecture: x64
runs-on: ubuntu-latest
dependencies-kind: pypy
- python-version: '3.11'
python-architecture: x64
runs-on: ubuntu-latest
dependencies-kind: numpy2
- python-version: '3.11'
python-architecture: x64
runs-on: macos-11
dependencies-kind: numpy2
- python-version: '3.11'
python-architecture: x64
runs-on: windows-latest
dependencies-kind: numpy2

runs-on: ${{ matrix.runs-on }}

Expand Down
1 change: 1 addition & 0 deletions dev/generate-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ def genspectests(specdict):
"""
)
f.write("import pytest\nimport kernels\n\n")
f.write("import pytest\nimport numpy as np\nimport kernels\n\n")
num = 1
if spec.tests == []:
f.write(
Expand Down
4 changes: 4 additions & 0 deletions requirements-test-numpy1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
numpy<2.0.0
pytest>=6
pytest-cov
pytest-xdist
5 changes: 0 additions & 5 deletions requirements-test-numpy2.txt
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/awkward/_reducers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ def _dtype_for_kernel(cls, dtype: DTypeLike) -> DTypeLike:
else:
return dtype

_use32 = (ak._util.win or ak._util.bits32) and not ak._util.numpy2
_use32 = ((ak._util.win or ak._util.bits32) and not ak._util.numpy2) or (
ak._util.numpy2 and np.intp is np.int32
)

@classmethod
def _promote_integer_rank(cls, given_dtype: DTypeLike) -> DTypeLike:
Expand Down