[XPU] support XDNN downloading function#5365
[XPU] support XDNN downloading function#5365zhupengyang merged 2 commits intoPaddlePaddle:developfrom
Conversation
2718ca4 to
a2b3653
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #5365 +/- ##
==========================================
Coverage ? 59.25%
==========================================
Files ? 325
Lines ? 40214
Branches ? 6087
==========================================
Hits ? 23828
Misses ? 14551
Partials ? 1835
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
custom_ops/xpu_ops/setup_ops.py
Outdated
| XDNN_INC_PATH = os.path.join(XDNN_PATH, "include") | ||
| XDNN_LIB_DIR = os.path.join(XDNN_PATH, "so") | ||
| version_cmd = "python -c 'import paddle; paddle.version.show()' 2>&1 | grep xhpc | awk '{print $2}'" | ||
| XHPC_VERSION = subprocess.check_output(version_cmd, shell=True).strip().decode() |
There was a problem hiding this comment.
后续可以考虑对 subprocess.check_output 做个异常处理?如果 version_cmd 执行失败,给一个 paddle not found 之类的错误提示,对用户会更友好些
custom_ops/xpu_ops/setup_ops.py
Outdated
| version_cmd = "python -c 'import paddle; paddle.version.show()' 2>&1 | grep xhpc | awk '{print $2}'" | ||
| XHPC_VERSION = subprocess.check_output(version_cmd, shell=True).strip().decode() |
There was a problem hiding this comment.
paddle.version.xpu_xhpc()
custom_ops/xpu_ops/setup_ops.py
Outdated
| else: | ||
| download_and_extract(XHPC_URL, THIRD_PARTY_PATH) |
There was a problem hiding this comment.
这里打印warning log,显示本地xhpc版本和paddle xhpc版本,但是不要强制重新下载
- paddle使用本地xhpc编译的时候,从paddle.version.xhpc_xhpc()看到的版本可能和实际不同
- 会有需要强制使用本地xhpc的开发场景
| else: | ||
| download_and_extract(XHPC_URL, THIRD_PARTY_PATH) |
There was a problem hiding this comment.
download_and_extract函数中会打印
6b25695 to
12c38f6
Compare
|
Thanks for your contribution! |
hong19860320
left a comment
There was a problem hiding this comment.
LGTM,按照讨论的结果,后续再提一个 PR 保证优先使用 paddle 中的 xdnn.h,仅 plugin 编译所需的 kernel 头文件才在下载的xhpc 包中搜索。
Motivation
增加编译时的XDNN下载逻辑