-
-
Notifications
You must be signed in to change notification settings - Fork 50
[main] Rebuild for pybind11 3 and pybind11_abi 11 #415
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
Open
regro-cf-autotick-bot
wants to merge
10
commits into
conda-forge:main
Choose a base branch
from
regro-cf-autotick-bot:rebuild-pybind11_abi11-0-1_h834e9b
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+142
−151
Open
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
edb591a
Rebuild for pybind11 3 and pybind11_abi 11
regro-cf-autotick-bot afe3805
MNT: Re-rendered with conda-smithy 3.52.2 and conda-forge-pinning 202…
regro-cf-autotick-bot f7abe7e
add patch to save PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE
isuruf b6b5e70
revert conda-build.yml changes
isuruf d88e681
fix windows patch
isuruf 21ea747
fix compilation
isuruf c8abef5
fix patches
isuruf 6c04162
no signature
isuruf d692caf
fix patches again
isuruf 762c281
fix patches for good
h-vetinari 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
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,8 @@ | ||
| __migrator: | ||
| build_number: 1 | ||
| commit_message: Rebuild for pybind11 3 and pybind11_abi 11 | ||
| kind: version | ||
| migration_number: 1 | ||
| migrator_ts: 1752454025.946169 | ||
| pybind11_abi: | ||
| - '11' |
This file was deleted.
Oops, something went wrong.
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
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
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
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 |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| From c7b809486c9401ea5a9abaaf598803c88a9d7da5 Mon Sep 17 00:00:00 2001 | ||
| From 06cded81b27b8cb69397406335076e26dd6484b6 Mon Sep 17 00:00:00 2001 | ||
| From: Mark Harfouche <[email protected]> | ||
| Date: Sun, 1 Sep 2024 17:35:40 -0400 | ||
| Subject: [PATCH 01/17] Force usage of python 3 and error without numpy | ||
| Subject: [PATCH 01/16] Force usage of python 3 and error without numpy | ||
|
|
||
| --- | ||
| cmake/Dependencies.cmake | 6 +++--- | ||
| 1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake | ||
| index 5227204b041..47917899943 100644 | ||
| index a93386c27f8..96988e89d09 100644 | ||
| --- a/cmake/Dependencies.cmake | ||
| +++ b/cmake/Dependencies.cmake | ||
| @@ -871,9 +871,9 @@ if(BUILD_PYTHON) | ||
| @@ -819,9 +819,9 @@ if(BUILD_PYTHON) | ||
| if(USE_NUMPY) | ||
| list(APPEND PYTHON_COMPONENTS NumPy) | ||
| endif() | ||
|
|
@@ -23,7 +23,7 @@ index 5227204b041..47917899943 100644 | |
| endif() | ||
|
|
||
| if(NOT Python_Interpreter_FOUND) | ||
| @@ -890,7 +890,7 @@ if(BUILD_PYTHON) | ||
| @@ -838,7 +838,7 @@ if(BUILD_PYTHON) | ||
| if(Python_Development.Module_FOUND) | ||
| if(USE_NUMPY) | ||
| if(NOT Python_NumPy_FOUND) | ||
|
|
@@ -32,3 +32,6 @@ index 5227204b041..47917899943 100644 | |
| caffe2_update_option(USE_NUMPY OFF) | ||
| else() | ||
| caffe2_update_option(USE_NUMPY ON) | ||
| -- | ||
| 2.45.2 | ||
|
|
||
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,31 @@ | ||
| From ffbdd8bb8fa38397ad6d7958a8c4ddd80ff738eb Mon Sep 17 00:00:00 2001 | ||
| From: Isuru Fernando <[email protected]> | ||
| Date: Thu, 31 Jul 2025 12:34:30 -0500 | ||
| Subject: [PATCH] Use Intel/LLVM openmp | ||
h-vetinari marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| This make MSVC use __kmp_* symbols available in both libiomp.dll | ||
| and libiomp5md.dll instead of vcomp* symbols which are only in | ||
| vcomp140.dll and libiomp5md.dll, but are missing in libiomp.dll | ||
| --- | ||
| cmake/Modules/FindOpenMP.cmake | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/cmake/Modules/FindOpenMP.cmake b/cmake/Modules/FindOpenMP.cmake | ||
| index 8a9abff398..336a9a927a 100644 | ||
| --- a/cmake/Modules/FindOpenMP.cmake | ||
| +++ b/cmake/Modules/FindOpenMP.cmake | ||
| @@ -122,9 +122,9 @@ function(_OPENMP_FLAG_CANDIDATES LANG) | ||
| set(OMP_FLAG_MIPSpro "-mp") | ||
| if(__header_dir MATCHES ".*Microsoft Visual Studio.*") | ||
| # MSVC header. No need to pass it as additional include. | ||
| - set(OMP_FLAG_MSVC "-openmp:experimental" "-openmp") | ||
| + set(OMP_FLAG_MSVC "-openmp:llvm" "-openmp:experimental" "-openmp") | ||
| else() | ||
| - set(OMP_FLAG_MSVC "-openmp:experimental -I${__header_dir}" "-openmp -I${__header_dir}") | ||
| + set(OMP_FLAG_MSVC "-openmp:llvm" "-openmp:experimental -I${__header_dir}" "-openmp -I${__header_dir}") | ||
| endif() | ||
| set(OMP_FLAG_PathScale "-openmp") | ||
| set(OMP_FLAG_NAG "-openmp") | ||
| -- | ||
| 2.45.2 | ||
|
|
||
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 |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| From dbafa6c2e900de35d5d4b2633bf80669dde3c9d6 Mon Sep 17 00:00:00 2001 | ||
| From 58feee2ca68a7192008ed732064ba89a02190db7 Mon Sep 17 00:00:00 2001 | ||
| From: Mark Harfouche <[email protected]> | ||
| Date: Tue, 1 Oct 2024 00:28:40 -0400 | ||
| Subject: [PATCH 02/17] Help find numpy | ||
| Subject: [PATCH 02/16] Help find numpy | ||
|
|
||
| --- | ||
| tools/setup_helpers/cmake.py | 6 ++++++ | ||
| 1 file changed, 6 insertions(+) | ||
|
|
||
| diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py | ||
| index ad0d0fb014b..73495989fa0 100644 | ||
| index 678ba7ab207..92052f9bc5c 100644 | ||
| --- a/tools/setup_helpers/cmake.py | ||
| +++ b/tools/setup_helpers/cmake.py | ||
| @@ -305,9 +305,15 @@ class CMake: | ||
| @@ -313,9 +313,15 @@ class CMake: | ||
| sys.exit(1) | ||
| build_options.update(cmake__options) | ||
|
|
||
|
|
@@ -27,3 +27,6 @@ index ad0d0fb014b..73495989fa0 100644 | |
| TORCH_BUILD_VERSION=version, | ||
| **build_options, | ||
| ) | ||
| -- | ||
| 2.45.2 | ||
|
|
||
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 |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| From c244e05d6bbef0b34777ec15ff98ae69bcc5db86 Mon Sep 17 00:00:00 2001 | ||
| From ef2ba4a066dd68555ac787887270b2d2522ff44e Mon Sep 17 00:00:00 2001 | ||
| From: Jeongseok Lee <[email protected]> | ||
| Date: Sun, 3 Nov 2024 01:12:36 -0700 | ||
| Subject: [PATCH 03/17] Fix duplicate linker script | ||
| Subject: [PATCH 03/16] Fix duplicate linker script | ||
|
|
||
| --- | ||
| setup.py | 4 +++- | ||
| 1 file changed, 3 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/setup.py b/setup.py | ||
| index 61ee9363fc2..4fa1c3ed5c5 100644 | ||
| index b4ebc92f592..7f88ade34bf 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -1146,7 +1146,9 @@ def main(): | ||
| @@ -1198,7 +1198,9 @@ def main(): | ||
| filein="cmake/prioritized_text.txt", fout="cmake/linker_script.ld" | ||
| ) | ||
| linker_script_path = os.path.abspath("cmake/linker_script.ld") | ||
|
|
@@ -22,3 +22,6 @@ index 61ee9363fc2..4fa1c3ed5c5 100644 | |
| os.environ["CFLAGS"] = ( | ||
| os.getenv("CFLAGS", "") + " -ffunction-sections -fdata-sections" | ||
| ) | ||
| -- | ||
| 2.45.2 | ||
|
|
||
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.