Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[cmake] update pybind11 v2.10.3 to v2.12.0 #63741

Merged
merged 3 commits into from
Apr 23, 2024

Conversation

gouzil
Copy link
Member

@gouzil gouzil commented Apr 22, 2024

PR Category

Others

PR Types

Others

Description

为了解决在 #63694 遇到的不能使用 shared_ptr 的问题,升级的同时也会解决原来CUDA 12的问题(不再需要patch, pybind11 的修复PR#4893)

  • 删除 patch 测试问题是否重现(重现CI,单测为test_cpp_extension)
  • 升级至v2.12

Copy link

paddle-bot bot commented Apr 22, 2024

你的PR提交成功,感谢你对开源项目的贡献!
请关注后续CI自动化测试结果,详情请参考Paddle-CI手册
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@paddle-bot paddle-bot bot added the contributor External developers label Apr 22, 2024
@gouzil gouzil changed the title [WIP][cmake] update pybind11 to v2.12 [WIP][cmake] update pybind11 v2.10.3 to v2.12.0 Apr 22, 2024
@SigureMo SigureMo self-assigned this Apr 22, 2024
@@ -17,24 +17,12 @@ include(ExternalProject)
set(PYBIND_PREFIX_DIR ${THIRD_PARTY_PATH}/pybind)
set(PYBIND_SOURCE_DIR ${PYBIND_PREFIX_DIR}/src/extern_pybind)
set(PYBIND_INCLUDE_DIR ${PYBIND_SOURCE_DIR}/include)
set(PYBIND_TAG v2.10.3)
set(SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/pybind)
set(SOURCE_INCLUDE_DIR ${SOURCE_DIR}/include)

include_directories(${PYBIND_INCLUDE_DIR})

set(PYBIND_PATCH_COMMAND "")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这行和 50 行是不是也可以删掉了?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTMeow 🐾

@SigureMo SigureMo changed the title [WIP][cmake] update pybind11 v2.10.3 to v2.12.0 [cmake] update pybind11 v2.10.3 to v2.12.0 Apr 23, 2024
@gouzil
Copy link
Member Author

gouzil commented Apr 23, 2024

升级前:
466681713798865_ pic
升级后:
466671713798856_ pic
__doc__没有改变

Copy link
Contributor

@sunzhongkai588 sunzhongkai588 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gouzil gouzil merged commit 21b2f19 into PaddlePaddle:develop Apr 23, 2024
28 of 29 checks passed
co63oc pushed a commit to co63oc/Paddle that referenced this pull request Apr 24, 2024
co63oc pushed a commit to co63oc/Paddle that referenced this pull request Apr 25, 2024
@gouzil gouzil deleted the update_pybind11_v2.12 branch July 20, 2024 05:31
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
contributor External developers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants