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

Build with Numpy 2.0 #231

Open
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

Build with Numpy 2.0 #231

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b251f64
Use Numpy 2.0
jaimergp Jun 18, 2024
859ca72
update this requirement too
jaimergp Jun 18, 2024
2fb939d
Ask for py39
jaimergp Jun 19, 2024
d3ba030
Add PR triggers for workflows, and control for concurrency
jaimergp Jul 1, 2024
82e225e
Merge branch 'develop' into numpy2
jaimergp Jul 1, 2024
a3e75dc
All pushes trigger workflows
jaimergp Jul 7, 2024
14f6c99
Force Python3 in Appveyor?
jaimergp Jul 7, 2024
5d92985
enable interactive debugging temporarily
jaimergp Jul 7, 2024
2af8987
Adjust VM images
jaimergp Jul 7, 2024
b03dc38
exit if PYTHON_DIR does not exist
jaimergp Jul 7, 2024
b2daf40
python3 doesn't exist; use pip3
jaimergp Jul 7, 2024
e284c5b
negate equality
jaimergp Jul 7, 2024
5974a8c
revert to powershell here
jaimergp Jul 7, 2024
0335986
exists -> exist
jaimergp Jul 7, 2024
65fecfe
adjust generator
jaimergp Jul 7, 2024
cf073f1
use -A instead of architecture in -G
jaimergp Jul 7, 2024
cd5d726
debug again
jaimergp Jul 7, 2024
ce547a5
remove PYTHON_INCLUDE_DIR workarounds
jaimergp Jul 7, 2024
f05d9d2
do not debug
jaimergp Jul 7, 2024
62ba300
define PYTHON_INCLUDE_DIR
jaimergp Jul 8, 2024
642846c
pass PYTHON_INCLUDE_DIR
jaimergp Jul 8, 2024
b5212a7
pass directly
jaimergp Jul 8, 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
2 changes: 1 addition & 1 deletion .github/workflows/debug-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Zfpy Dependencies
run: |
python -m pip install cython
python -m pip install oldest-supported-numpy
python -m pip install "numpy>=2.0"
python -m pip install setuptools

- name: Install OpenMP
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/debug-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Zfpy Dependencies
run: |
python -m pip install cython
python -m pip install oldest-supported-numpy
python -m pip install "numpy>=2.0"
python -m pip install setuptools

- name: Install OpenMP
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Install zfpy dependencies
run: |
python -m pip install cython
python -m pip install oldest-supported-numpy
python -m pip install "numpy>=2.0"
python -m pip install setuptools

- name: Setup OpenMP (Linux)
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PLATFORM: x64
BUILD_TYPE: Release
PYTHON_VERSION: 38
PYTHON_VERSION: 39

- COMPILER: msvc
GENERATOR: Visual Studio 15 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PLATFORM: Win32
BUILD_TYPE: Release
PYTHON_VERSION: 38
PYTHON_VERSION: 39

- COMPILER: msvc
GENERATOR: Visual Studio 14 2015 Win64
PLATFORM: x64
BUILD_TYPE: Release
PYTHON_VERSION: 38
PYTHON_VERSION: 39

- COMPILER: msvc
GENERATOR: Visual Studio 14 2015
PLATFORM: Win32
BUILD_TYPE: Release
PYTHON_VERSION: 38
PYTHON_VERSION: 39

- COMPILER: mingw
GENERATOR: MinGW Makefiles
Copy link
Contributor

Choose a reason for hiding this comment

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

Think these MinGW builds also need Python version set to 3.9. Appears they use Python 2.7 otherwise

Expand Down
2 changes: 1 addition & 1 deletion python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ find_package(PythonInterp REQUIRED)
find_package(PythonLibs REQUIRED)
find_package(PythonExtensions REQUIRED)
find_package(Cython 0.28 REQUIRED) # >= v0.28 required for const memoryview support
find_package(NumPy REQUIRED)
find_package(NumPy 2.0 REQUIRED)

include_directories(${ZFP_SOURCE_DIR}/include)
include_directories(${NumPy_INCLUDE_DIR})
Expand Down
2 changes: 1 addition & 1 deletion python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cython>=0.22
numpy>=1.8.0
numpy>=2.0
Copy link
Contributor

Choose a reason for hiding this comment

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

is this a runtime requirements file or a build time requirements file?

1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
author_email="[email protected]",
url="https://zfp.llnl.gov",
description="zfp compression in Python",
python_requires=">=3.9",
long_description="zfp is a compressed format for representing multidimensional floating-point and integer arrays. zfp provides compressed-array classes that support high throughput read and write random access to individual array elements. zfp also supports serial and parallel compression of whole arrays using both lossless and lossy compression with error tolerances. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.",
ext_modules=[Extension("zfpy", ["build/python/zfpy.c"],
include_dirs=["include", np.get_include()],
Expand Down