Skip to content

fix: handle pybind11 macro defined as 0 instead of non-exist #227

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

Merged
XuehaiPan merged 2 commits into from
Jun 2, 2025
Merged

fix: handle pybind11 macro defined as 0 instead of non-exist #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2aad26
fix: handle pybind11 macro defined as 0
XuehaiPan Jun 1, 2025
7eb87d5
docs(CHANGELOG): update CHANGELOG.md
XuehaiPan Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

-
- Handle `pybind11` macro defined as 0 instead of non-exist by [@XuehaiPan](https://github.com/XuehaiPan) in [#227](https://github.com/metaopt/optree/pull/227).

### Removed

Expand Down
2 changes: 1 addition & 1 deletion include/optree/treespec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ using size_t = py::size_t;
using ssize_t = py::ssize_t;

// The maximum depth of a pytree.
#if defined(MS_WINDOWS) || defined(Py_DEBUG) || defined(PYPY_VERSION) || \
#if defined(Py_DEBUG) || defined(PYPY_VERSION) || defined(MS_WINDOWS) || \
(defined(__wasm__) || defined(__wasm32__) || defined(__wasm64__) || defined(__wasi__) || \
defined(__EMSCRIPTEN__))
constexpr ssize_t MAX_RECURSION_DEPTH = 500;
Expand Down
24 changes: 15 additions & 9 deletions src/optree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ void BuildModule(py::module_& mod) { // NOLINT[runtime/references]
std::string(__FILE_RELPATH_FROM_PROJECT_ROOT__) + ")";
mod.attr("Py_TPFLAGS_BASETYPE") = py::int_(Py_TPFLAGS_BASETYPE);

// NOLINTNEXTLINE[bugprone-macro-parentheses]
#define NONZERO_OR_EMPTY(MACRO) ((MACRO + 0 != 0) || (0 - MACRO - 1 >= 0))

// Meta information during build
py::dict BUILDTIME_METADATA{};
BUILDTIME_METADATA["PY_VERSION"] = py::str(PY_VERSION);
Expand All @@ -61,40 +64,43 @@ void BuildModule(py::module_& mod) { // NOLINT[runtime/references]
BUILDTIME_METADATA["PYPY_VERSION_NUM"] = py::int_(PYPY_VERSION_NUM);
BUILDTIME_METADATA["PYPY_VERSION_HEX"] = py::int_(PYPY_VERSION_NUM);
#endif
#if defined(Py_DEBUG)
#if defined(Py_DEBUG) && NONZERO_OR_EMPTY(Py_DEBUG)
BUILDTIME_METADATA["Py_DEBUG"] = py::bool_(true);
#else
BUILDTIME_METADATA["Py_DEBUG"] = py::bool_(false);
#endif
#if defined(Py_GIL_DISABLED)
#if defined(Py_GIL_DISABLED) && NONZERO_OR_EMPTY(Py_GIL_DISABLED)
BUILDTIME_METADATA["Py_GIL_DISABLED"] = py::bool_(true);
#else
BUILDTIME_METADATA["Py_GIL_DISABLED"] = py::bool_(false);
#endif
BUILDTIME_METADATA["PYBIND11_VERSION_HEX"] = py::int_(PYBIND11_VERSION_HEX);
BUILDTIME_METADATA["PYBIND11_INTERNALS_VERSION"] = py::int_(PYBIND11_INTERNALS_VERSION);
#if defined(PYBIND11_HAS_NATIVE_ENUM)
#if defined(PYBIND11_HAS_NATIVE_ENUM) && NONZERO_OR_EMPTY(PYBIND11_HAS_NATIVE_ENUM)
BUILDTIME_METADATA["PYBIND11_HAS_NATIVE_ENUM"] = py::bool_(true);
#else
BUILDTIME_METADATA["PYBIND11_HAS_NATIVE_ENUM"] = py::bool_(false);
#endif
#if defined(PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT)
#if defined(PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT) && \
NONZERO_OR_EMPTY(PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT)
BUILDTIME_METADATA["PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT"] = py::bool_(true);
#else
BUILDTIME_METADATA["PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT"] = py::bool_(false);
#endif
#if defined(PYBIND11_HAS_SUBINTERPRETER_SUPPORT)
#if defined(PYBIND11_HAS_SUBINTERPRETER_SUPPORT) && \
NONZERO_OR_EMPTY(PYBIND11_HAS_SUBINTERPRETER_SUPPORT)
BUILDTIME_METADATA["PYBIND11_HAS_SUBINTERPRETER_SUPPORT"] = py::bool_(true);
#else
BUILDTIME_METADATA["PYBIND11_HAS_SUBINTERPRETER_SUPPORT"] = py::bool_(false);
#endif
#if defined(_GLIBCXX_USE_CXX11_ABI)
BUILDTIME_METADATA["GLIBCXX_USE_CXX11_ABI"] =
// NOLINTNEXTLINE[modernize-use-bool-literals]
py::bool_(static_cast<bool>(_GLIBCXX_USE_CXX11_ABI));
#if defined(_GLIBCXX_USE_CXX11_ABI) && NONZERO_OR_EMPTY(_GLIBCXX_USE_CXX11_ABI)
BUILDTIME_METADATA["GLIBCXX_USE_CXX11_ABI"] = py::bool_(true);
#else
BUILDTIME_METADATA["GLIBCXX_USE_CXX11_ABI"] = py::bool_(false);
#endif

#undef NONZERO_OR_EMPTY

mod.attr("BUILDTIME_METADATA") = std::move(BUILDTIME_METADATA);
py::exec(
R"py(
Expand Down
Loading