-
Notifications
You must be signed in to change notification settings - Fork 55
Wheels: 0.17.0 #1833
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
Merged
Merged
Wheels: 0.17.0 #1833
Changes from 24 commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
aba9532
ADIOS2: 2.11.0 & Campaigns
ax3l c21a835
openPMD-api: 0.17.0
ax3l 3289c1f
macOS 13 -> 14/15
ax3l 953ace5
Build SQLite3
ax3l 6e5c9d5
Windows h_errno patch
franzpoeschel 3ef0b01
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] a82aeb5
GTKorvo patch
franzpoeschel 912c59f
Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks"
franzpoeschel 8b93824
Exclude patches from pre-commit
franzpoeschel 34d8829
Wrong path..
franzpoeschel 9c4a794
Use a better patch for GTKorvo upstream
franzpoeschel 4b309ed
Fix Windows paths
franzpoeschel 28b8035
Debug error
franzpoeschel 061f8b2
tmp: Use master branch of ADIOS2
franzpoeschel c4f9f07
more paths
franzpoeschel 49cacd9
Try Greg's suggestion
franzpoeschel 4e3b632
Unix: `-DFFS_USE_DILL=FALSE`
ax3l cd29e48
Ouch
ax3l e4ff045
Ouch
ax3l 740ab2e
Try fixing paths again..
franzpoeschel 98a79e6
use downloaded patch..
franzpoeschel dcc123f
[Patch] ADIOS macOS DILL
ax3l d519d04
Refresh ADIOS Patch w/ Diagnostics
ax3l 756c053
Patch?
ax3l e429032
Patch?
ax3l db112a5
Patchy patch
ax3l ac29414
MACOSX_DEPLOYMENT_TARGET: 14.0/15.0
ax3l 59a3bd8
"git am" committer
ax3l 8e70a4a
Patch Cleanup/Simplify
ax3l acb3927
macOS: keep master commit w/ EVPath Change
ax3l e588554
remove stray change
ax3l File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| From c7961dd9e12d72b279db75fd184d2b3b4f151560 Mon Sep 17 00:00:00 2001 | ||
| From: Greg Eisenhauer <eisen@cc.gatech.edu> | ||
| Date: Mon, 26 Jan 2026 15:55:08 -0500 | ||
| Subject: [PATCH 1/2] Fix MacOS Static build without FFI | ||
|
|
||
| --- | ||
| thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in | 4 +++- | ||
| thirdparty/ffs/CMakeLists.txt | 6 +++++- | ||
| 2 files changed, 8 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in b/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in | ||
| index 16afb7ef7d..9b35728090 100644 | ||
| --- a/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in | ||
| +++ b/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in | ||
| @@ -4,7 +4,9 @@ find_dependency(atl @atl_VERSION@) | ||
| find_dependency(ffs @ffs_VERSION@) | ||
|
|
||
| if(NOT @BUILD_SHARED_LIBS@) | ||
| - find_dependency(dill @dill_VERSION@) | ||
| + if(@HAVE_COD_H@) | ||
| + find_dependency(dill @dill_VERSION@) | ||
| + endif() | ||
|
|
||
| if(@NVML_FOUND@) | ||
| find_dependency(NVML) | ||
| diff --git a/thirdparty/ffs/CMakeLists.txt b/thirdparty/ffs/CMakeLists.txt | ||
| index e47512f581..ebead5095d 100644 | ||
| --- a/thirdparty/ffs/CMakeLists.txt | ||
| +++ b/thirdparty/ffs/CMakeLists.txt | ||
| @@ -4,7 +4,11 @@ set(BUILD_TESTING OFF) | ||
| set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty") | ||
|
|
||
| set(FFS_USE_ATL ON CACHE INTERNAL "") | ||
| -set(FFS_USE_DILL ON CACHE INTERNAL "") | ||
| +if(TARGET dill::dill) | ||
| + set(FFS_USE_DILL ON CACHE INTERNAL "") | ||
| +else() | ||
| + set(FFS_USE_DILL OFF CACHE INTERNAL "") | ||
| +endif() | ||
| set(FFS_LIBRARIES_ONLY ON CACHE INTERNAL "") | ||
| set(FFS_QUIET ON CACHE INTERNAL "") | ||
| set(FFS_LIBRARY_PREFIX adios2${ADIOS2_LIBRARY_SUFFIX}_ CACHE INTERNAL "") | ||
|
|
||
| From a582b6a0d96ea7ad2fcd170ce1211dc8a46be137 Mon Sep 17 00:00:00 2001 | ||
| From: Greg Eisenhauer <eisen@cc.gatech.edu> | ||
| Date: Mon, 26 Jan 2026 18:46:31 -0500 | ||
| Subject: [PATCH 2/2] diagnostics | ||
|
|
||
| --- | ||
| thirdparty/ffs/CMakeLists.txt | 2 ++ | ||
| 1 file changed, 2 insertions(+) | ||
|
|
||
| diff --git a/thirdparty/ffs/CMakeLists.txt b/thirdparty/ffs/CMakeLists.txt | ||
| index ebead5095d..8ddebe261a 100644 | ||
| --- a/thirdparty/ffs/CMakeLists.txt | ||
| +++ b/thirdparty/ffs/CMakeLists.txt | ||
| @@ -5,8 +5,10 @@ set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty") | ||
|
|
||
| set(FFS_USE_ATL ON CACHE INTERNAL "") | ||
| if(TARGET dill::dill) | ||
| + message(STATUS "ADIOS2 FFS: found dill::dill target, setting FFS_USE_DILL to ON") | ||
| set(FFS_USE_DILL ON CACHE INTERNAL "") | ||
| else() | ||
| + message(STATUS "ADIOS2 FFS: DID NOT FIND dill::dill target, setting FFS_USE_DILL to OFF") | ||
| set(FFS_USE_DILL OFF CACHE INTERNAL "") | ||
| endif() | ||
| set(FFS_LIBRARIES_ONLY ON CACHE INTERNAL "") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.