-
Notifications
You must be signed in to change notification settings - Fork 1.6k
[BugFix][OPENCL] Fix initalization sequence of opencl backend valid API. test=develop #4003
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xiebaiyuan
previously approved these changes
Jul 29, 2020
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.
LGTM
xiebaiyuan
reviewed
Jul 29, 2020
xiebaiyuan
reviewed
Jul 29, 2020
…into fix-gpu-load-cpu-model
xiebaiyuan
approved these changes
Jul 30, 2020
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.
LGTM
ysh329
added a commit
to ysh329/Paddle-Lite-1
that referenced
this pull request
Jul 30, 2020
…PI. test=develop (PaddlePaddle#4003) * fix opencl backend. test=develop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
状态:等待review
主要内容
修正OpenCL的预判API导致的初始化顺序问题。先前的预判API会让CLRuntime调用CLWrapper去检查库是否找到,符号加载是否正常。但因为该顺序问题导致后续segfault bug(如加载cpu+gpu库,但加载cpu模型,在不支持gpu的手机上面会挂的问题)。
因先初始化CLRuntime会初始化相关平台设备等等,二者存在交叉依赖的问题。现改为,预判API先不调用CLRuntime,而是先通过CLWrapper获取是否找到lib和符号方法,在做CLRuntime层面的检查(fp16的支持等等)。
再就是RuntimeProgram创建的时候,有针对opencl设置每个kernel的kernelContext,这部分之前咱们是每个kernel共用一个kernelContext,因为
cl::Context
是唯一的。这里也需要考虑到当跑CPU模型时,遇到这里需要预判是否硬件支持opencl。否则出现segfault(gdb定位到这里),因而这里加上了预判再去setContext。