Skip to content

[CustomOp]Remove paddle_custom_op dynamic libraries, and link to FLUID_CORE on Windows#32583

Merged
zhwesky2010 merged 5 commits intoPaddlePaddle:developfrom
zhwesky2010:fix_windows_customop
May 7, 2021
Merged

[CustomOp]Remove paddle_custom_op dynamic libraries, and link to FLUID_CORE on Windows#32583
zhwesky2010 merged 5 commits intoPaddlePaddle:developfrom
zhwesky2010:fix_windows_customop

Conversation

@zhwesky2010
Copy link
Contributor

@zhwesky2010 zhwesky2010 commented Apr 26, 2021

PR types

New features

PR changes

OPs

Describe

移除旧的paddle_custom_op动态库生成过程,并在Windows上复用到已有的core动态库

paddle_custom_op动态库存在两个问题:

  1. paddle_custom_op动态库core动态库,两个动态库会存在全局instance冲突,例如op_info_map;
  2. 通过python进行初始化的一些单例instance,例如deviceContextPool,只有通过import paddle后才会初始并存在于core动态库里,那么paddle_custom_op动态库将会缺失这种类型的instance,导致某些功能无法使用。

这些问题在Unix、Windows均会存在,因此需要复用core动态库,该PR调整了Windows动态库的设计,使用Windows软链+硬链的组合方式给用户提供core动态库的链接方式,是#31976 的后续。

@zhwesky2010 zhwesky2010 changed the title Remove paddle_custom_op dynamic libraries, and link to FLUID_CORE on windows Remove paddle_custom_op dynamic libraries, and link to FLUID_CORE on Windows Apr 26, 2021
@paddle-bot-old
Copy link

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 4292a39 to 906c992 Compare April 26, 2021 11:36
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 906c992 to d9ba542 Compare April 28, 2021 11:09
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from d9ba542 to 20f6e11 Compare April 28, 2021 13:54
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 20f6e11 to e802ef4 Compare April 28, 2021 14:30
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from e802ef4 to 4ec1a90 Compare April 29, 2021 09:28
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 4ec1a90 to d811d05 Compare April 29, 2021 09:32
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from d811d05 to 8eb2e4c Compare April 29, 2021 09:37
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 8eb2e4c to aff31aa Compare April 29, 2021 13:47
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from aff31aa to 225a4af Compare April 30, 2021 04:06
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 225a4af to 3290850 Compare April 30, 2021 04:08
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from acc6289 to 51d428f Compare April 30, 2021 04:20
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 51d428f to 21f2875 Compare April 30, 2021 04:30
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 21f2875 to 859197e Compare April 30, 2021 04:33
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 2457a08 to e743594 Compare April 30, 2021 04:54
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from e743594 to 4a78456 Compare April 30, 2021 05:31
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 4a78456 to 829beca Compare April 30, 2021 06:41
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch from 829beca to ed398ab Compare April 30, 2021 08:45
@zhwesky2010 zhwesky2010 force-pushed the fix_windows_customop branch 3 times, most recently from 469a64b to c060331 Compare April 30, 2021 09:36
Copy link
Contributor

@chenwhql chenwhql left a comment

Choose a reason for hiding this comment

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

LGTM

@zhwesky2010 zhwesky2010 merged commit 7610c2b into PaddlePaddle:develop May 7, 2021
zhwesky2010 added a commit to zhwesky2010/Paddle that referenced this pull request May 7, 2021
…Windows (PaddlePaddle#32583)

* Remove paddle_custom_op dynamic libraries, change link to FLUID_CORE on windows, and check copy_to

* fix CI
lanxianghit pushed a commit that referenced this pull request May 7, 2021
…to FLUID_CORE on windows (#32583) (#32769)

* Remove paddle_custom_op dynamic libraries, change link to FLUID_CORE on windows, and check copy_to

* fix CI
@zhwesky2010 zhwesky2010 changed the title Remove paddle_custom_op dynamic libraries, and link to FLUID_CORE on Windows [CustomOp]Remove paddle_custom_op dynamic libraries, and link to FLUID_CORE on Windows Sep 28, 2021
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.

3 participants