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

Add HDF5 support for building wheels #5

Merged
merged 52 commits into from
Jul 23, 2024
Merged

Add HDF5 support for building wheels #5

merged 52 commits into from
Jul 23, 2024

Conversation

bryanwweber
Copy link
Member

@bryanwweber bryanwweber commented Jul 15, 2024 •
edited
Loading

  • Build SDist and wheel packages for Linux (x86_64 + aarch64), macOS (x86_64 + arm64), and Windows (AMD64)
  • Bump cibuildwheel and update configuration
  • Add HDF5 to the dependencies for the wheel. Resolves Include HDF5 support in PyPI packages #3
  • Simplify the script by condensing to a single job definition
  • Simplify Boost installation on macOS and Windows by using an action
  • Simplify Linux building by using a custom manylinux image with dependencies built-in (see https://github.com/Cantera/hdf5-boost-manylinux)

I plan to squash-merge this PR once its approved, so I don't plan to clean up the commit history. I don't think it's very interesting for all this CI nonsense anyways.

bryanwweber added 21 commits July 14, 2024 10:56
@bryanwweber
Remove boost from sdist build, not needed
c8f5bf8
@bryanwweber
Bump cibuildwheel and some cleanup
4e896b6
@bryanwweber
Bump boost to 1.85.0
012eb0a
@bryanwweber
Config updates
6a3a464
@bryanwweber
Add hdf5 for macos and turn off fail fast
dada75e
@bryanwweber
Move some more config to pyproject.toml
f3feab2
@bryanwweber
Update some build steps from h5py
47645c3
@bryanwweber
Star the python config
171f2d4
@bryanwweber
Use boost install action on Linux
eca2fb8
@bryanwweber
Adapt windows builder from h5py
f33aed9
@bryanwweber
Update macos build after h5py
d61577f
@bryanwweber
Checkout the repo
700792b
@bryanwweber
D'oh
642cd1c
@bryanwweber
Hopefully fixes for boost
e179766
@bryanwweber
Fix boost locations
5d34ac0
@bryanwweber
Fix paths to script locations
a485158
@bryanwweber
Boost is built-in to the Linux cibuildwheel image now
cbabaee
@bryanwweber
Set MACOSX_DEPLOYMENT_TARGET for hdf5
153441b 
We need to set MACOSX_DEPLOYMENT_TARGET when building HDF5, explained here https://github.com/h5py/h5py/pull/2444/files#r1679541011
@bryanwweber
Fix boost arch for macos
89caeb1
@bryanwweber
Cache HDF5 after building
72fe7c4
@bryanwweber
Try setting up HDF5 libs for macOS
0a1ff24
@bryanwweber
Copy link
Member Author

Linux ARM builds are failing due to pypa/cibuildwheel#1771. Just leaving this breadcrumb to sort out the fix.

@bryanwweber bryanwweber force-pushed the add-hdf5 branch 2 times, most recently from 8725750 to 9dbf040 Compare July 18, 2024 21:37
@bryanwweber
Set CMAKE parallel level on Windows
f77f796 
The other platforms should use Ninja which is automatically parallel
@bryanwweber
Formatting and updates
3c91d41
@bryanwweber bryanwweber marked this pull request as ready for review July 22, 2024 00:45
speth
speth approved these changes Jul 22, 2024
View reviewed changes
Copy link
Member

@speth speth left a comment

Choose a reason for hiding this comment

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

Thanks for getting this working, @bryanwweber! I had just one small comment below. I tested out the macOS arm64 package and didn't have any problems.

@bryanwweber bryanwweber merged commit 2a48c5b into main Jul 23, 2024
@bryanwweber bryanwweber deleted the add-hdf5 branch September 12, 2024 22:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@speth speth speth approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Include HDF5 support in PyPI packages
2 participants
@bryanwweber @speth