Skip to content
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

[CINN] Remove some pybind interface in cinn to fix compile problem #55043

Merged
merged 9 commits into from Jul 7, 2023

Conversation

zyfncg
Copy link
Contributor

@zyfncg zyfncg commented Jun 30, 2023

PR types

Bug fixes

PR changes

Others

Description

Pcard-72384

移除部分CINN中在Python端未使用的pybind接口,以解决与Paddle主框架无法共用一套pybind三方库的问题。

@paddle-bot
Copy link

paddle-bot bot commented Jun 30, 2023

你的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.

@6clc
Copy link
Contributor

6clc commented Jul 3, 2023

要PaddleWithCINN的时候也有CINN wheel包,还需要修改下面3个文件

  1. Paddle/test/CMakeLists.txt +94
  if(WITH_CINN)
    add_subdirectory(cpp/cinn)
  endif()
  if(CINN_ONLY)
    add_subdirectory(cinn)
    return()
  endif()

改成

  if(WITH_CINN)
    add_subdirectory(cpp/cinn)
    add_subdirectory(cinn)
  endif()
  if(CINN_ONLY)
    return()
  endif()
  1. Paddle/paddle/cinn/CMakeLists.txt +15
if(CINN_ONLY)
  add_subdirectory(pybind)
endif()

删掉if判断,改为

add_subdirectory(pybind)
  1. Paddle/python/CMakeLists.txt +1
if(CINN_ONLY)
   ...
   ...
  return()
endif()

改为

if(WITH_CINN)
   ...
   ...
  if(CINN_ONLY)
    return()
  endif()
endif()

Copy link
Contributor

@6clc 6clc left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@thisjiang thisjiang left a comment

Choose a reason for hiding this comment

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

LGTM

@zyfncg zyfncg merged commit 2fc429f into PaddlePaddle:develop Jul 7, 2023
26 of 27 checks passed
@zyfncg zyfncg deleted the fix_cinn_pybind branch July 7, 2023 03:05
cqulilujia pushed a commit to cqulilujia/Paddle that referenced this pull request Jul 24, 2023
…addlePaddle#55043)

* remove some pybind interface in cinn to fix compile problem

* modify cmake

* fix cmake

* add log for build cinn whl

* fix ninja for cinn

* fix conflict
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants