`PYBIND11_PLATFORM_ABI_ID` Modernization Continued (platforms other than MSVC) #5439

rwgk · 2024-11-10T23:34:48Z

Description

This PR updates PYBIND11_PLATFORM_ABI_ID, which determines cross-extension ABI compatibility, to improve accuracy across all platforms other than MSVC (which was modernized previously in #4953). For context on the importance of PYBIND11_PLATFORM_ABI_ID, please refer to PRs #5296 and #5375.

The accuracy improvements can be seen by comparing the PYBIND11_INTERNALS_ID summaries before and after:

master @ 741d86f (logs_32284154734.zip, logs_32284154873.zip):

cat *.txt | grep 'C.. Info: .* __pybind11_internals_v' | sed 's/.* __pybind11_internals_v[0-9]*/__pybind11_internals_vX/' | cut -d' ' -f1 | sort | uniq -c

     27 __pybind11_internals_vX_clang_libcpp_cxxabi1002__
      5 __pybind11_internals_vX_clang_libstdcpp_cxxabi1002__
     27 __pybind11_internals_vX_gcc_libstdcpp_cxxabi1013__
      3 __pybind11_internals_vX_gcc_libstdcpp_cxxabi1014__
      3 __pybind11_internals_vX_gcc_libstdcpp_cxxabi1016__
      2 __pybind11_internals_vX_gcc_libstdcpp_cxxabi1017__
      5 __pybind11_internals_vX_gcc_libstdcpp_cxxabi1018__
      2 __pybind11_internals_vX_icc_libstdcpp_cxxabi1010__
      6 __pybind11_internals_vX_mingw_libstdcpp_cxxabi1019__
      1 __pybind11_internals_vX_pgi_libstdcpp__

This PR (pr5439_logs_32281771697.zip, pr5439_logs_32281771739.zip):

      6 __pybind11_internals_vX_mingw_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1__
     26 __pybind11_internals_vX_system_libcpp_abi1__
      1 __pybind11_internals_vX_system_libcpp_abi2__
     48 __pybind11_internals_vX_system_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1__

Note that the compiler-specific identifiers clang, gcc, icc, pgi no longer appear. ABI compatibility is now determined primarily by libstdcpp (gcc) or libcpp (clang) ABI preprocessor macros.

It is expected that overrides like those in pytorch will not be needed anymore. However, this PR ensures that existing overrides will still function, allowing for gradual community adoption.

Similar to #4953, silent fallbacks for unexpected situations have been replaced with #error ... PLEASE REVISE THIS CODE. directives. For such cases, command-line overrides for the affected macros can serve as temporary workarounds. To eliminate the need for such workarounds, users are encouraged to contribute updates to pybind11/conduit/pybind11_platform_abi_id.h as needed.

For completeness, the counts for MSVC (unchanged):

      3 __pybind11_internals_vX_msvc_md_mscver19__
     34 __pybind11_internals_vX_msvc_md_mscver19_debug__
      3 __pybind11_internals_vX_msvc_mt_mscver1942__

The work on this PR was informed by:

Suggested changelog entry:

``PYBIND11_PLATFORM_ABI_ID`` (which is used in composing ``PYBIND11_INTERNALS_ID``) was modernized to reflect actual ABI compatibility more accurately.

…bind#4953 and PR pybind#5437

rwgk · 2024-11-11T00:43:16Z

With this PR at commit 14f8425 and logs_30720380481.zip downloaded from here:

https://github.com/pybind/pybind11/actions/runs/11769449932/job/32780487991?pr=5439

$ cat *.txt | grep 'C.. Info: .* __pybind11_internals_v' | sed 's/.* __pybind11_internals_v[0-9]*/__pybind11_internals_vX/' | cut -d' ' -f1 | sort | uniq -c

     26 __pybind11_internals_vX_clang_libcpp_libcpp1__
     10 __pybind11_internals_vX_clang_libstdcpp_usecxx111__
     40 __pybind11_internals_vX_gcc_libstdcpp_usecxx111__
      2 __pybind11_internals_vX_icc_libstdcpp_usecxx111__
      6 __pybind11_internals_vX_mingw_libstdcpp_usecxx111__
      3 __pybind11_internals_vX_msvc_md_mscver19__
     34 __pybind11_internals_vX_msvc_md_mscver19_debug__
      3 __pybind11_internals_vX_msvc_mt_mscver1941__
      1 __pybind11_internals_vX_pgi_libstdcpp__

This doesn't look right, _LIBCPP_ABI_VERSION and _GLIBCXX_USE_CXX11_ABI always appear to be 1.

@robertmaynard I was trying to follow your #4953 (comment) but maybe I'm misunderstanding?

(I want to leave NVHPC for later.)

@wjakob @henryiii @isuruf @cryos for awareness.

robertmaynard · 2024-11-12T17:57:52Z

With this PR at commit 14f8425 and logs_30720380481.zip downloaded from here:

https://github.com/pybind/pybind11/actions/runs/11769449932/job/32780487991?pr=5439
$ cat *.txt | grep 'C.. Info: .* __pybind11_internals_v' | sed 's/.* __pybind11_internals_v[0-9]*/__pybind11_internals_vX/' | cut -d' ' -f1 | sort | uniq -c
     26 __pybind11_internals_vX_clang_libcpp_libcpp1__
     10 __pybind11_internals_vX_clang_libstdcpp_usecxx111__
     40 __pybind11_internals_vX_gcc_libstdcpp_usecxx111__
      2 __pybind11_internals_vX_icc_libstdcpp_usecxx111__
      6 __pybind11_internals_vX_mingw_libstdcpp_usecxx111__
      3 __pybind11_internals_vX_msvc_md_mscver19__
     34 __pybind11_internals_vX_msvc_md_mscver19_debug__
      3 __pybind11_internals_vX_msvc_mt_mscver1941__
      1 __pybind11_internals_vX_pgi_libstdcpp__
This doesn't look right, _LIBCPP_ABI_VERSION and _GLIBCXX_USE_CXX11_ABI always appear to be 1.

@robertmaynard I was trying to follow your #4953 (comment) but maybe I'm misunderstanding?

(I want to leave NVHPC for later.)

@wjakob @henryiii @isuruf @cryos for awareness.

_GLIBCXX_USE_CXX11_ABI is a boolean which represents which ABI for a set of the C++ std containers you are using ( std::string, list? ). It is an independent axis compared to __GXX_ABI_VERSION.

__GXX_ABI_VERSION	_GLIBCXX_USE_CXX11_ABI	Notes
102	0	Only compatible with 102. Predates _GLIBCXX_USE_CXX11_ABI
1002	0	Compatible with >= 1002 && < 2000 + CXX11 abi of 0
1002	1	Compatible with >= 1002 && < 2000 + CXX11 abi of 1
1013	0	Compatible with >= 1002 && < 2000 + CXX11 abi of 0
1013	1	Compatible with >= 1002 && < 2000 + CXX11 abi of 1

This presumes that GCC will rev the major value of __GXX_ABI_VERSION when it next breaks ABI compat

isuruf · 2024-11-12T18:05:00Z

One more thing to fix would be to remove the compiler id _gcc or _clang as they are compatible with each other. I think the current checks are supposed to protect against the C standard library, but is too broad.

wjakob · 2024-11-15T05:24:49Z

I am surprised by __pybind11_internals_vX_msvc_mt_mscver1941__ -- how does the current code manage to generate the number 1941? (I thought 19 was hardcoded).

rwgk · 2024-11-15T05:34:30Z

I am surprised by __pybind11_internals_vX_msvc_mt_mscver1941__ -- how does the current code manage to generate the number 1941? (I thought 19 was hardcoded).

It's generated in this line:

pybind11/include/pybind11/conduit/pybind11_platform_abi_id.h

Line 67 in 08095d9

    
           #            define PYBIND11_BUILD_ABI "_mt_mscver" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_MSC_VER)

wjakob · 2024-11-17T15:36:05Z

Ah, interesting. So for /MT, the whole _MSCVER should be included? @isuruf, can you confirm? I am not doing this in nanobind currently and will have to make a change if so.

isuruf · 2024-11-18T16:05:04Z

Yes. /MT means a static linkage of the C runtime, and it's better to have the full version.

Further constrain to GXX_ABI 1002 or greater and less than 2000, hopefully future proof by summarizing that as `1` along with CXX11 on or off.

cryos · 2024-11-20T21:52:45Z

I just pushed a new commit that produces something like

__pybind11_internals_v5_gcc_libstdcpp_gxx_abi_1_usecxx11_1__

It also ensures __GXX_ABI_VERSION is less than 2000, so labeling gxx_abi_1, maybe gxx_abi_1xxx would be better. The thought process was to include that as well should it be bumped in the future.

rwgk · 2024-11-20T22:54:37Z

Here are the results extracted from the latest CI logs:

https://github.com/pybind/pybind11/actions/runs/11942204141

(Click on any job, then the gear that appears in the top-right corner of the window with the log for that job, then "Download log archive".)

$ mkdir junk && cd junk
$ unzip ../logs_31139436091.zip
$ cat *.txt | grep 'C.. Info: .* __pybind11_internals_v' | sed 's/.* __pybind11_internals_v[0-9]*/__pybind11_internals_vX/' | cut -d' ' -f1 | sort | uniq -c

     26 __pybind11_internals_vX_clang_libcpp_libcpp1__
     10 __pybind11_internals_vX_clang_libstdcpp_gxx_abi_1_usecxx11_1__
     40 __pybind11_internals_vX_gcc_libstdcpp_gxx_abi_1_usecxx11_1__
      2 __pybind11_internals_vX_icc_libstdcpp_gxx_abi_1_usecxx11_1__
      6 __pybind11_internals_vX_mingw_libstdcpp_gxx_abi_1_usecxx11_1__
      3 __pybind11_internals_vX_msvc_md_mscver19__
     34 __pybind11_internals_vX_msvc_md_mscver19_debug__
      3 __pybind11_internals_vX_msvc_mt_mscver1942__
      1 __pybind11_internals_vX_pgi_libstdcpp__

On chat @cryos and I decided to go with gxx_abi_1xxx_ instead of gxx_abi_1_, for clarity.

Looking at these:

__pybind11_internals_vX_clang_libstdcpp_gxx_abi_1_usecxx11_1__
__pybind11_internals_vX_gcc_libstdcpp_gxx_abi_1_usecxx11_1__

I think we want to omit clang and gcc here, based on my understanding of suggestions by @robertmaynard and @isuruf.

But what about
__pybind11_internals_vX_icc_libstdcpp_gxx_abi_1_usecxx11_1__
?

Does anyone know if icc-compiled code is ABI-compatible with clang and gcc?

And what should we do about this one? __pybind11_internals_vX_clang_libcpp_libcpp1__

Could/should we just omit these lines

#    elif defined(_LIBCPP_ABI_VERSION) // https://libcxx.llvm.org/DesignDocs/ABIVersioning.html
#        define PYBIND11_BUILD_ABI "_libcpp" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_LIBCPP_ABI_VERSION)

and rely on the new __GXX_ABI_VERSION, _GLIBCXX_USE_CXX11_ABI logic instead?

After discussions with Ralf Grosse-Kunstleve we think these would make good identifiers that are concise and clear.

Within the `__GXX_ABI_VERSION` block this should always be defined, guard against unexpected defines and make the error obvious.

rwgk · 2024-11-21T02:27:55Z

Here are the results extracted from the latest CI logs:

https://github.com/pybind/pybind11/actions/runs/11944671063/job/33296033078?pr=5439 (attempt 1, 1 flake)
https://github.com/pybind/pybind11/actions/runs/11944671063?pr=5439 (deflaked)

     26 __pybind11_internals_vX_clang_libcpp_abi1__
     10 __pybind11_internals_vX_clang_libstdcpp_gxx_abi_1xxx_usecxx11_1__
     42 __pybind11_internals_vX_gcc_libstdcpp_gxx_abi_1xxx_usecxx11_1__
      2 __pybind11_internals_vX_icc_libstdcpp_gxx_abi_1xxx_usecxx11_1__
      6 __pybind11_internals_vX_mingw_libstdcpp_gxx_abi_1xxx_usecxx11_1__
      3 __pybind11_internals_vX_msvc_md_mscver19__
     34 __pybind11_internals_vX_msvc_md_mscver19_debug__
      3 __pybind11_internals_vX_msvc_mt_mscver1942__
      1 __pybind11_internals_vX_pgi_libstdcpp__

rwgk · 2024-11-24T20:39:26Z

The current changes affect icc, therefore it'll be best if we settle the PYBIND11_PLATFORM_ABI_ID also for that compiler in this PR. According to

https://www.intel.com/content/www/us/en/docs/dpcpp-cpp-compiler/developer-guide-reference/2023-2/gcc-compatibility-and-interoperability.html

"C language object files created with the compiler are binary compatible with the GCC and C/C++ language library."

AFAICT, the compiler also links against the systemlibstdcpp, therefore I figure it must be binary compatible for C++ as well.

Upshot: I think we should also omit icc in the PYBIND11_PLATFORM_ABI_ID.

…X_USE_CXX11_ABI` (similarly to `gxx_abi` for `__GXX_ABI_VERSION`).

…`_gcc` with `_system`

rwgk · 2024-11-24T21:16:20Z

I just pushed up the experimental commit fe2dbcb which changes PYBIND11_COMPILER_TYPE.

Rationale:

Test for special cases first, system compiler last.
Replace "unknown" fall-through with #error, similar to the elimination of fall-throughs for PYBIND11_BUILD_ABI. (Possibly we may want to enable fall-throughs for releases, but always #error in the pybind11 CI jobs.)
Assume __MINGW32__ and __CYGWIN__ are not binary compatible with MSVC.
Use _system for gcc, clang, icc.
Leave __PGI untouched for now. (Possibly after we're sure about gcc, clang, icc, we can also settle the case for PGI in this PR.)

I'll post a new PYBIND11_PLATFORM_ABI_ID overview when all jobs are done and green.

rwgk · 2024-11-25T04:01:34Z

Latest PYBIND11_INTERNALS_ID overview (this PR at commit fe2dbcb):

logs_31272968106.zip — https://github.com/pybind/pybind11/actions/runs/11999580827/job/33447666543?pr=5439

$ cat *.txt | grep 'C.. Info: .* __pybind11_internals_v' | sed 's/.* __pybind11_internals_v[0-9]*/__pybind11_internals_vX/' | c
ut -d' ' -f1 | sort | uniq -c

      6 __pybind11_internals_vX_mingw_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1__
      3 __pybind11_internals_vX_msvc_md_mscver19__
     34 __pybind11_internals_vX_msvc_md_mscver19_debug__
      3 __pybind11_internals_vX_msvc_mt_mscver1942__
      1 __pybind11_internals_vX_pgi_libstdcpp__
     26 __pybind11_internals_vX_system_libcpp_abi1__
     52 __pybind11_internals_vX_system_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1__

rwgk · 2024-11-25T04:20:21Z

@robertmaynard do you have a moment to look at this PR? (The changes are small and all in just one file.)

Is the PYBIND11_COMPILER_TYPE and PYBIND11_BUILD_ABI logic good as-is for gcc and clang (Linux, macOS)?
Do we have to worry about _DEBUG under Linux, macOS?
Should we leave NVHPC (PGI) for later, or try to handle that in this PR as well?

robertmaynard · 2024-11-25T19:16:25Z

@robertmaynard do you have a moment to look at this PR? (The changes are small and all in just one file.)

Is the PYBIND11_COMPILER_TYPE and PYBIND11_BUILD_ABI logic good as-is for gcc and clang (Linux, macOS)?

Looks good to me

Do we have to worry about _DEBUG under Linux, macOS?

_DEBUG is a MSVCism. Linux and macOS have NDEBUG but that doesn't change ABI.

Should we leave NVHPC (PGI) for later, or try to handle that in this PR as well?

NVHPC should be ABI compatible with gcc. I am fine either way in how you want to manage that integration from a PR perspective.

@robertmaynard

…piler. See comment by @robertmaynard: pybind#5439 (comment)

rwgk · 2024-11-25T19:40:40Z

Thanks a lot @robertmaynard for the review!

NVHPC should be ABI compatible with gcc.

Based on your comment, I added commit 9fc9515:

Add NVHPC (__PGI) to the list of compilers (assumed to be) compatible with system compiler.

rwgk · 2024-12-01T20:52:56Z

What I learned from the work on #5439 (comment) got me to add

commit 3f90808, and while I was at it, also
commit b47be2d.

I don't expect any extra fallout from those two changes. The PYBIND11_STDLIB change consolidates the logic related to libc++ and libstdc++. The logic is now easier to understand and certain to be self-consistent.

rwgk · 2024-12-01T21:01:27Z

Just to double-check, the latest PYBIND11_INTERNALS_ID overview (this PR at commit b47be2d) is still identical to that posted under #5439 (comment):

logs_31527439795.zip — https://github.com/pybind/pybind11/actions/runs/12108518322/job/33756607834?pr=5439

$ cat *.txt | grep 'C.. Info: .* __pybind11_internals_v' | sed 's/.* __pybind11_internals_v[0-9]*/__pybind11_internals_vX/' | c
ut -d' ' -f1 | sort | uniq -c

      6 __pybind11_internals_vX_mingw_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1__
      3 __pybind11_internals_vX_msvc_md_mscver19__
     34 __pybind11_internals_vX_msvc_md_mscver19_debug__
      3 __pybind11_internals_vX_msvc_mt_mscver1942__
     26 __pybind11_internals_vX_system_libcpp_abi1__
     53 __pybind11_internals_vX_system_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1__

This makes it possible to achieve these two goals: * Avoid the leading underscore in `PYBIND11_PLATFORM_ABI_ID` (see pybind#5439 (comment)) * Maintain backward compatibility for use cases as reported under pybind#5439 (comment) `PYBIND11_INTERNALS_KIND` is removed in this commit to ensure that `PYBIND11_COMPILER_TYPE` is the first element of the `PYBIND11_PLATFORM_ABI_ID`, so that `PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE` can meaningfully be used as a prefix for `PYBIND11_PLATFORM_ABI_ID` in pybind11/detail/internals.h.

rwgk · 2024-12-02T20:55:26Z

This idea randomly crossed my mind when I woke up this morning: e071edc

With that, I think it's best to go ahead and remove PYBIND11_INTERNALS_KIND already in this PR.

(Waiting for CI to finish.)

rwgk · 2024-12-02T23:09:47Z

Double-checked again, this PR @ commit e071edc:

https://github.com/pybind/pybind11/actions/runs/12127756713/job/33812721391?pr=5439
logs_31572888500.zip
cat ... uniq -c output identical to what's shown under PYBIND11_PLATFORM_ABI_ID Modernization Continued (platforms other than MSVC) #5439 (comment)

rwgk · 2024-12-03T18:16:45Z

Hi @isuruf, is there a chance that you could take a quick look, especially with a view on how this will work for Conda? I believe this PR is a massive simplification for the purposes of Conda: in the pybind11 CI, all builds using libstdc++ are mutually compatible, and all builds using libc++ are mutually compatible. See #5439 (comment).

If it looks good to you I'll rewrite the PR description.

isuruf · 2024-12-03T18:23:04Z

include/pybind11/conduit/pybind11_platform_abi_id.h

+#    elif defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__)
+#        define PYBIND11_COMPILER_TYPE "system" // Assumed compatible with system compiler.


This still feels weird.

How about?

Suggested change

# elif defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__)

# define PYBIND11_COMPILER_TYPE "system" // Assumed compatible with system compiler.

# elif defined(__GLIBC__) && (defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__))

# define PYBIND11_COMPILER_TYPE "glibc" // Assumed compatible with system compiler.

# elif defined(__APPLE__) && (defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__))

# define PYBIND11_COMPILER_TYPE "macos" // Assumed compatible with system compiler.

I really like this. Trying it out in the CI right now: ca9e699

The code is exactly as suggested, but I revised the comments.

Hmm. On second thought, this would break musl, android builds etc. Let's keep the earlier one.

Oh, gee: sorry I missed your last comment before.

I don't know about musl and android builds.

But I just revert ... simpler is better here, I think.

…ted).

… more general. The main motivation is to resolve these "Manylinux on 🐍 3.13t • GIL" and "Pyodide wheel" failures: ``` /__w/pybind11/pybind11/include/pybind11/conduit/pybind11_platform_abi_id.h:35:10: error: #error "Unknown PYBIND11_COMPILER_TYPE: PLEASE REVISE THIS CODE." 35 | # error "Unknown PYBIND11_COMPILER_TYPE: PLEASE REVISE THIS CODE." | ^~~~~ ``` (All other CI jobs succeeded.) Further thought: Essentially, under Linux and macOS the `PYBIND11_COMPILER_TYPE` is only for informational purposes. ABI compatibility is determined by the libstdc++ or libc++ ABI version.

This reverts commit 75da5fb.

This reverts commit e34dc8b.

…"glibc"` more general." This reverts commit 41daaa4.

…s suggested)." This reverts commit ca9e699.

hpkfft · 2024-12-17T20:13:50Z

include/pybind11/conduit/pybind11_platform_abi_id.h

+#        define PYBIND11_COMPILER_TYPE "gcc_cygwin"
+#    elif defined(_MSC_VER)
+#        define PYBIND11_COMPILER_TYPE "msvc"
+#    elif defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__)


In the interest of simplification, consider removing defined(__INTEL_COMPILER)

The Intel classic compilers, icc for C and icpc for C++, define __GNUC__ as well as __INTEL_COMPILER.
The last version was 2021.10 and it stopped shipping in 2023.

The "Intel(R) oneAPI DPC++/C++ Compilers", icx for C and icpx for C++, do not define __INTEL_COMPILER.
They do define all of these: __GNUC__, __clang__, __INTEL_CLANG_COMPILER, and __INTEL_LLVM_COMPILER.

Done: 738b7ec

Thanks @hpkfft for the suggestion!

…nd#5439 (comment)

wjakob · 2024-12-20T05:42:31Z

This PR looks great to me now, are there any other planned changes?

rwgk · 2024-12-20T05:56:48Z

This PR looks great to me now, are there any other planned changes?

Only some work on the PR description. Sadly Flu + RSV have wiped out a lot of my time. I'll try to do it tonight.

rwgk · 2024-12-20T09:39:22Z

I updated the PR description.

Thanks so much Everybody for all the input and feedback!

THIS IS JUST A START: First attempt to combine information from PR py…

14f8425

…bind#4953 and PR pybind#5437

rwgk mentioned this pull request Nov 10, 2024

Build platform ABI tag improvements #5437

Open

rwgk marked this pull request as ready for review November 11, 2024 00:43

rwgk and others added 3 commits November 18, 2024 09:06

Merge branch 'master' into pybind11_platform_abi_id_cont

e46982c

Include GXX_ABI and USE_CXX in the identifier

b72c42d

Further constrain to GXX_ABI 1002 or greater and less than 2000, hopefully future proof by summarizing that as `1` along with CXX11 on or off.

style: pre-commit fixes

8369fdc

cryos added 2 commits November 20, 2024 19:47

Use gxx_abi_1xxx and simplify the Clang string

476c322

After discussions with Ralf Grosse-Kunstleve we think these would make good identifiers that are concise and clear.

Error if _GLIBCXX_USE_CXX11_ABI is not defined

271720f

Within the `__GXX_ABI_VERSION` block this should always be defined, guard against unexpected defines and make the error obvious.

rwgk added 3 commits November 24, 2024 12:39

Merge branch 'master' into pybind11_platform_abi_id_cont

970a7eb

Change usecxx11 to use_cxx11_abi for correspondence with `_GLIBCX…

28081fc

…X_USE_CXX11_ABI` (similarly to `gxx_abi` for `__GXX_ABI_VERSION`).

PYBIND11_COMPILER_TYPE overhaul, mainly: replace _icc, _clang, …

fe2dbcb

…`_gcc` with `_system`

robertmaynard approved these changes Nov 25, 2024

View reviewed changes

rwgk added 2 commits November 25, 2024 11:30

Merge branch 'master' into pybind11_platform_abi_id_cont

9acf764

Add NVHPC (__PGI) to the list of compilers compatible with system com…

9fc9515

…piler. See comment by @robertmaynard: pybind#5439 (comment)

traversaro mentioned this pull request Dec 2, 2024

Disable automerge conda-forge/pybind11-feedstock#104

Open

5 tasks

isuruf reviewed Dec 3, 2024

View reviewed changes

rwgk added 11 commits December 3, 2024 10:47

Apply suggestion by @isuruf, with revised comments (code is as sugges…

ca9e699

…ted).

Add PYBIND11_COMPILER_TYPE emscripten

e34dc8b

Add PYBIND11_COMPILER_TYPE graalvm

75da5fb

Merge branch 'master' into pybind11_platform_abi_id_cont

f4cc9b9

Revert "Add PYBIND11_COMPILER_TYPE graalvm"

fb38f03

This reverts commit 75da5fb.

Revert "Add PYBIND11_COMPILER_TYPE emscripten"

09131c5

This reverts commit e34dc8b.

Revert "Make determination of PYBIND11_COMPILER_TYPE "macos" or `…

d05ea53

…"glibc"` more general." This reverts commit 41daaa4.

Revert "Apply suggestion by @isuruf, with revised comments (code is a…

776d163

…s suggested)." This reverts commit ca9e699.

Merge branch 'master' into pybind11_platform_abi_id_cont

70639c1

Merge branch 'master' into pybind11_platform_abi_id_cont

7fb89ca

hpkfft reviewed Dec 17, 2024

View reviewed changes

rwgk mentioned this pull request Dec 18, 2024

pybind11-abi test script is silently broken for pybind11 2.12, and may be missing ABI version 5 conda-forge/pybind11-feedstock#96

Open

1 task

Remove defined(__INTEL_COMPILER) as suggested by @hpkfft under pybi…

738b7ec

…nd#5439 (comment)

rwgk changed the title ~~PYBIND11_PLATFORM_ABI_ID Modernization Continued (WIP)~~ PYBIND11_PLATFORM_ABI_ID Modernization Continued (platforms other than MSVC) Dec 20, 2024

rwgk merged commit 3e41948 into pybind:master Dec 20, 2024
76 checks passed

github-actions bot added the needs changelog Possibly needs a changelog entry label Dec 20, 2024

rwgk deleted the pybind11_platform_abi_id_cont branch December 20, 2024 09:40

rwgk mentioned this pull request Dec 26, 2024

best practice for including compiler version in abi for dependencies (pybind11/nanobind) conda-forge/conda-forge.github.io#2326

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`PYBIND11_PLATFORM_ABI_ID` Modernization Continued (platforms other than MSVC) #5439

`PYBIND11_PLATFORM_ABI_ID` Modernization Continued (platforms other than MSVC) #5439

rwgk commented Nov 10, 2024 •

edited

Loading

rwgk commented Nov 11, 2024

robertmaynard commented Nov 12, 2024

isuruf commented Nov 12, 2024

wjakob commented Nov 15, 2024

rwgk commented Nov 15, 2024

wjakob commented Nov 17, 2024

isuruf commented Nov 18, 2024

cryos commented Nov 20, 2024

rwgk commented Nov 20, 2024 •

edited

Loading

rwgk commented Nov 21, 2024

rwgk commented Nov 24, 2024

rwgk commented Nov 24, 2024

rwgk commented Nov 25, 2024

rwgk commented Nov 25, 2024

robertmaynard commented Nov 25, 2024

rwgk commented Nov 25, 2024

rwgk commented Dec 1, 2024

rwgk commented Dec 1, 2024

rwgk commented Dec 2, 2024

rwgk commented Dec 2, 2024

rwgk commented Dec 3, 2024 •

edited

Loading

isuruf Dec 3, 2024

rwgk Dec 3, 2024

isuruf Dec 3, 2024

rwgk Dec 12, 2024

hpkfft Dec 17, 2024

rwgk Dec 19, 2024

wjakob commented Dec 20, 2024

rwgk commented Dec 20, 2024

rwgk commented Dec 20, 2024

		# elif defined(__INTEL_COMPILER) \|\| defined(__clang__) \|\| defined(__GNUC__)
		# define PYBIND11_COMPILER_TYPE "system" // Assumed compatible with system compiler.

-#    elif defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__)
-#        define PYBIND11_COMPILER_TYPE "system" // Assumed compatible with system compiler.
+#    elif defined(__GLIBC__) && (defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__))
+#        define PYBIND11_COMPILER_TYPE "glibc"    // Assumed compatible with system compiler.
+#    elif defined(__APPLE__) && (defined(__INTEL_COMPILER) || defined(__clang__) || defined(__GNUC__))
+#        define PYBIND11_COMPILER_TYPE "macos" // Assumed compatible with system compiler.

PYBIND11_PLATFORM_ABI_ID Modernization Continued (platforms other than MSVC) #5439

PYBIND11_PLATFORM_ABI_ID Modernization Continued (platforms other than MSVC) #5439

Conversation

rwgk commented Nov 10, 2024 • edited Loading

Description

Suggested changelog entry:

rwgk commented Nov 11, 2024

robertmaynard commented Nov 12, 2024

isuruf commented Nov 12, 2024

wjakob commented Nov 15, 2024

rwgk commented Nov 15, 2024

wjakob commented Nov 17, 2024

isuruf commented Nov 18, 2024

cryos commented Nov 20, 2024

rwgk commented Nov 20, 2024 • edited Loading

rwgk commented Nov 21, 2024

rwgk commented Nov 24, 2024

rwgk commented Nov 24, 2024

rwgk commented Nov 25, 2024

rwgk commented Nov 25, 2024

robertmaynard commented Nov 25, 2024

rwgk commented Nov 25, 2024

rwgk commented Dec 1, 2024

rwgk commented Dec 1, 2024

rwgk commented Dec 2, 2024

rwgk commented Dec 2, 2024

rwgk commented Dec 3, 2024 • edited Loading

isuruf Dec 3, 2024

Choose a reason for hiding this comment

rwgk Dec 3, 2024

Choose a reason for hiding this comment

isuruf Dec 3, 2024

Choose a reason for hiding this comment

rwgk Dec 12, 2024

Choose a reason for hiding this comment

hpkfft Dec 17, 2024

Choose a reason for hiding this comment

rwgk Dec 19, 2024

Choose a reason for hiding this comment

wjakob commented Dec 20, 2024

rwgk commented Dec 20, 2024

rwgk commented Dec 20, 2024

`PYBIND11_PLATFORM_ABI_ID` Modernization Continued (platforms other than MSVC) #5439

`PYBIND11_PLATFORM_ABI_ID` Modernization Continued (platforms other than MSVC) #5439

rwgk commented Nov 10, 2024 •

edited

Loading

rwgk commented Nov 20, 2024 •

edited

Loading

rwgk commented Dec 3, 2024 •

edited

Loading