-
Notifications
You must be signed in to change notification settings - Fork 7
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
Introduce py::native_enum_kind
(mandatory argument without a default).
#30118
Conversation
🐍 3 • Clang dev • C++11 • x64 ``` -- The CXX compiler identification is Clang 19.0.0 ``` ``` /__w/pybind11k/pybind11k/include/pybind11/detail/function_record_pyobject.h:38:26: error: cast from 'PyObject *(*)(PyObject *, PyObject *, PyObject *)' (aka '_object *(*)(_object *, _object *, _object *)') to 'PyCFunction' (aka '_object *(*)(_object *, _object *)') converts to incompatible function type [-Werror,-Wcast-function-type-mismatch] 38 | = {{"__reduce_ex__", (PyCFunction) reduce_ex_impl, METH_VARARGS | METH_KEYWORDS, nullptr}, ```
@@ -36,7 +36,7 @@ class native_enum_data { | |||
std::string was_not_added_error_message() const { | |||
return "`native_enum` was not added to any module." | |||
" Use e.g. `m += native_enum<...>(\"" | |||
+ enum_name_encoded + "\")` to fix."; | |||
+ enum_name_encoded + "\", py::native_enum_kind::IntEnum)` to fix."; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might give an impression that the IntEnum
kind is preferred, which isn't really true, right? Should this just use a placeholder ellipsis , or full suggestion of both versions? (e.g., "Use m += native_enum<...>("Name", Enum)
or m += native_enum<...>("Name", IntEnum)
to fix)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed (f3b8a03) to ...
. — I wasn't sure about this myself before. Considering that the +=
part is the critical part of the error message, I believe using ...
is best (will distract people the least from the critical part).
This update needs corresponding small changes in third_party/clif/pybind11/enums.py third_party/clif/testing/python/t3_test.py TGP-tested via temporary cl/626240839: http://tap/OCL:626240839:BASE:626375750:1713541129757:e746a257 Note: Currently codesearch finds matches for `pybind11 native_enum` only in third_party/pybind11 and third_party/clif/pybind11. This CL fixes 15 PyCLIF-pybind11 TGP failures: b/287289622#comment73 #MIGRATION_3P_PYBIND11__DEFAULT - 9f5899480ce875ad99daad0874110aba2658ee7b Introduce `py::native_enum_kind` (mandatory argument with... by Ralf W. Grosse-Kunstleve <[email protected]> PiperOrigin-RevId: 626432303
Description
The core change here is to introduce
and to change the
native_enum
constructor to require passing one of those two values, e.g.:py::native_enum<smallenum>("smallenum", py::native_enum_kind::IntEnum)
This completely replaces the automatic mechanism for the determination of
use_int_enum
(a member ofpybind11::detail::native_enum_data
).All other changes are of the boilerplate kind (updating one error message and the
native_enum
unit tests).The rationale for this change is:
For manually written code: Simply put it in the hands of the author what native enum type is used. This also makes the bindings more self-documenting.
For automatically generated code (PyCLIF): Leave the choice of native enum type up to the code generator (PyCLIF-C-API has the corresponding logic already).
Google-internal global test ID: OCL:626240839:BASE:626375750:1713541129757:e746a257
For completeness: This is what happens if a user chooses
IntEnum
for a C++enum
with achar
underlying type:Note regarding commit history: this PR was originally based on #30117.
Suggested changelog entry: