| CARVIEW |
Select Language
HTTP/2 200
date: Sat, 26 Jul 2025 00:49:05 GMT
content-type: text/html; charset=utf-8
cache-control: no-cache
content-security-policy: default-src 'none'; base-uri 'self'; child-src github.githubassets.com github.com/assets-cdn/worker/ github.com/assets/ gist.github.com/assets-cdn/worker/; connect-src 'self' uploads.github.com www.githubstatus.com collector.github.com raw.githubusercontent.com api.github.com github-cloud.s3.amazonaws.com github-production-repository-file-5c1aeb.s3.amazonaws.com github-production-upload-manifest-file-7fdce7.s3.amazonaws.com github-production-user-asset-6210df.s3.amazonaws.com *.rel.tunnels.api.visualstudio.com wss://*.rel.tunnels.api.visualstudio.com objects-origin.githubusercontent.com copilot-proxy.githubusercontent.com proxy.individual.githubcopilot.com proxy.business.githubcopilot.com proxy.enterprise.githubcopilot.com *.actions.githubusercontent.com wss://*.actions.githubusercontent.com productionresultssa0.blob.core.windows.net/ productionresultssa1.blob.core.windows.net/ productionresultssa2.blob.core.windows.net/ productionresultssa3.blob.core.windows.net/ productionresultssa4.blob.core.windows.net/ productionresultssa5.blob.core.windows.net/ productionresultssa6.blob.core.windows.net/ productionresultssa7.blob.core.windows.net/ productionresultssa8.blob.core.windows.net/ productionresultssa9.blob.core.windows.net/ productionresultssa10.blob.core.windows.net/ productionresultssa11.blob.core.windows.net/ productionresultssa12.blob.core.windows.net/ productionresultssa13.blob.core.windows.net/ productionresultssa14.blob.core.windows.net/ productionresultssa15.blob.core.windows.net/ productionresultssa16.blob.core.windows.net/ productionresultssa17.blob.core.windows.net/ productionresultssa18.blob.core.windows.net/ productionresultssa19.blob.core.windows.net/ github-production-repository-image-32fea6.s3.amazonaws.com github-production-release-asset-2e65be.s3.amazonaws.com insights.github.com wss://alive.github.com api.githubcopilot.com api.individual.githubcopilot.com api.business.githubcopilot.com api.enterprise.githubcopilot.com; font-src github.githubassets.com; form-action 'self' github.com gist.github.com copilot-workspace.githubnext.com objects-origin.githubusercontent.com; frame-ancestors 'none'; frame-src viewscreen.githubusercontent.com notebooks.githubusercontent.com; img-src 'self' data: blob: github.githubassets.com media.githubusercontent.com camo.githubusercontent.com identicons.github.com avatars.githubusercontent.com private-avatars.githubusercontent.com github-cloud.s3.amazonaws.com objects.githubusercontent.com release-assets.githubusercontent.com secured-user-images.githubusercontent.com/ user-images.githubusercontent.com/ private-user-images.githubusercontent.com opengraph.githubassets.com copilotprodattachments.blob.core.windows.net/github-production-copilot-attachments/ github-production-user-asset-6210df.s3.amazonaws.com customer-stories-feed.github.com spotlights-feed.github.com objects-origin.githubusercontent.com *.githubusercontent.com; manifest-src 'self'; media-src github.com user-images.githubusercontent.com/ secured-user-images.githubusercontent.com/ private-user-images.githubusercontent.com github-production-user-asset-6210df.s3.amazonaws.com gist.github.com; script-src github.githubassets.com; style-src 'unsafe-inline' github.githubassets.com; upgrade-insecure-requests; worker-src github.githubassets.com github.com/assets-cdn/worker/ github.com/assets/ gist.github.com/assets-cdn/worker/
referrer-policy: no-referrer-when-downgrade
server-timing: pull_request_layout-fragment;desc="pull_request_layout fragment";dur=295.375725,conversation_content-fragment;desc="conversation_content fragment";dur=978.627754,conversation_sidebar-fragment;desc="conversation_sidebar fragment";dur=342.174635,nginx;desc="NGINX";dur=1.151101,glb;desc="GLB";dur=101.181081
strict-transport-security: max-age=31536000; includeSubdomains; preload
vary: X-PJAX, X-PJAX-Container, Turbo-Visit, Turbo-Frame, X-Requested-With,Accept-Encoding, Accept, X-Requested-With
x-content-type-options: nosniff
x-frame-options: deny
x-voltron-version: a2eb102
x-xss-protection: 0
server: github.com
content-encoding: gzip
accept-ranges: bytes
set-cookie: _gh_sess=iJCo%2BiOWq3vf3XAUBIRsQyCzdxr%2B%2Bj12peZZ4pJTEmdLO%2BjzOpGK6%2BapX226vaE5w%2BNjDEkhcrHSH5HgwG0gcY7k%2BDGTMLRQ8yj2y4zxYtB2RaWFFRTlWJ517%2BgX5wMN58ipoMMvPXom7%2FH1fQn4cVAieNNVcEIa9iqhiCCJAzGr4%2Bd61gsSXj2I%2Fx%2Be9XnyQ2E%2B%2BKntcioK6mxCvXPSIsxPnmIb7UqsVurCC7ASZ9LRKyf10MHXQDdA23Z%2FboKJxbh7AwJytjchLee%2F77kLUA%3D%3D--2JUZabjAwx2TCw%2FJ--tz4aiFswX%2FgqV3i2YskDew%3D%3D; Path=/; HttpOnly; Secure; SameSite=Lax
set-cookie: _octo=GH1.1.654805287.1753490944; Path=/; Domain=github.com; Expires=Sun, 26 Jul 2026 00:49:04 GMT; Secure; SameSite=Lax
set-cookie: logged_in=no; Path=/; Domain=github.com; Expires=Sun, 26 Jul 2026 00:49:04 GMT; HttpOnly; Secure; SameSite=Lax
x-github-request-id: A4DE:3240E6:68023:A6E52:68842600
[XPU] fix kl2 build on new version of xhpc by houj04 · Pull Request #65221 · PaddlePaddle/Paddle · GitHub
Skip to content
Navigation Menu
{{ message }}
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
[XPU] fix kl2 build on new version of xhpc #65221
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
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
|
你的PR提交成功，感谢你对开源项目的贡献! |
lj970926
approved these changes
Jun 17, 2024
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
lj970926
approved these changes
Jun 24, 2024
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
zhangyk0314
approved these changes
Jun 24, 2024
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
cqulilujia
approved these changes
Jun 24, 2024
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.
LHTM
runzhech
reviewed
Jun 24, 2024
| @@ -309,6 +332,28 @@ static void xblas_fc_wrapper(xpu::Context* ctx, | |||
| scale_w_mode); | |||
|
|
|||
| PADDLE_ENFORCE_XDNN_SUCCESS(r, "xblas_fc_fusion"); | |||
| #else | |||
| r = xpu::fc_fusion<XPUType, XPUType, XPUType, FCT>(ctx, | |||
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.
看到这边加了调用xdnn fc的逻辑，是不是之后kl2+xblas的场景下自动调用xdnn的逻辑不准备加回来了？
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.
现在block住的问题是没法方便升级xhpc的版本，这个堵住之后好多事情都干不了，所以先给拆开了……
等他们什么时候把“xblas内部能直接支持kl2”这个加回来之后再看？到时候可以保留现在的样子，也可以干掉本次新增的这堆条件编译。
runzhech
approved these changes
Jun 24, 2024
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
QingshuChen
approved these changes
Jun 24, 2024
co63oc
pushed a commit
to co63oc/Paddle
that referenced
this pull request
Jun 25, 2024
* [XPU] fix kl2 build on new version of xhpc * use xdnn fc on kl2
co63oc
pushed a commit
to co63oc/Paddle
that referenced
this pull request
Jun 25, 2024
* [XPU] fix kl2 build on new version of xhpc * use xdnn fc on kl2
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.
You can’t perform that action at this time.
PR Category
Custom Device
PR Types
Others
Description
在之前的 #64632 中，使用不同版本的XRE的时候，对应的XHPC的日期时间戳是不同的。其原因是，从某个版本的开始，XHPC里面的FA需要XRE5，但是KL2需要XRE4。
不过因为其实FA并不支持KL2，所以为了FA而卡住KL2使用新版本的XHPC是不太好的。
本PR的修改是：当不使用XRE5的时候，也同时关掉对FA的依赖。即：在算子绑定的地方通过条件编译走到
phi::errors::Unimplemented上去，并且通过xpu.cmake里面加上判断，不使用XPU_XFA_INC_DIR和XPU_XFA_LIB。此外，XHPC在6月份改了一波产出的名字，本PR也跟着改了。
此外，XHPC中的XBLAS从某天开始不再支持KL2了，因此本PR加上了条件编译，如果是KL2的话会走XDNN的矩阵乘法。
备注：本PR只是同步了不同分支下面XHPC的日期，之前一个是0515一个是0601，现在统一到了0601。后续再更新XHPC到最新版本。