Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
c94a4b94
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
c94a4b94
编写于
1月 14, 2021
作者:
Z
Zhou Wei
提交者:
GitHub
1月 14, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Separate AVX and NO_AVX compilation, enhance installation error message (#30413)
上级
6e0da01c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
6 deletion
+20
-6
cmake/cuda.cmake
cmake/cuda.cmake
+1
-1
python/paddle/fluid/core.py
python/paddle/fluid/core.py
+19
-5
未找到文件。
cmake/cuda.cmake
浏览文件 @
c94a4b94
...
@@ -15,7 +15,7 @@ else()
...
@@ -15,7 +15,7 @@ else()
set
(
paddle_known_gpu_archs7
"30 35 50 52"
)
set
(
paddle_known_gpu_archs7
"30 35 50 52"
)
set
(
paddle_known_gpu_archs8
"30 35 50 52 60 61"
)
set
(
paddle_known_gpu_archs8
"30 35 50 52 60 61"
)
set
(
paddle_known_gpu_archs9
"30 35 50 52 60 61 70"
)
set
(
paddle_known_gpu_archs9
"30 35 50 52 60 61 70"
)
set
(
paddle_known_gpu_archs10
"3
0 3
5 50 52 60 61 70 75"
)
set
(
paddle_known_gpu_archs10
"35 50 52 60 61 70 75"
)
set
(
paddle_known_gpu_archs11
"52 60 61 70 75 80"
)
set
(
paddle_known_gpu_archs11
"52 60 61 70 75 80"
)
endif
()
endif
()
...
...
python/paddle/fluid/core.py
浏览文件 @
c94a4b94
...
@@ -283,16 +283,24 @@ if avx_supported():
...
@@ -283,16 +283,24 @@ if avx_supported():
from
.core_avx
import
_remove_tensor_list_mmap_fds
from
.core_avx
import
_remove_tensor_list_mmap_fds
except
Exception
as
e
:
except
Exception
as
e
:
if
has_avx_core
:
if
has_avx_core
:
sys
.
stderr
.
write
(
'Error: Can not import avx core while this file exists: '
+
current_path
+
os
.
sep
+
'core_avx.'
+
core_suffix
+
'
\n
'
)
raise
e
raise
e
else
:
else
:
from
..
import
compat
as
cpt
from
..
import
compat
as
cpt
sys
.
stderr
.
write
(
sys
.
stderr
.
write
(
'WARNING: Do not have avx core. You may not build with AVX, '
"WARNING: AVX is supported on local machine, but you have installed "
'but AVX is supported on local machine.
\n
You could build paddle '
"paddlepaddle without avx core. Hence, no_avx core which has worse "
'WITH_AVX=ON to get better performance.
\n
'
"preformance will be imported.
\n
You could reinstall paddlepaddle by "
'The original error is: %s
\n
'
%
cpt
.
get_exception_message
(
e
))
"'python -m pip install -U paddlepaddle-gpu[==version]' or rebuild "
"paddlepaddle WITH_AVX=ON to get better performance.
\n
"
"The original error is: %s
\n
"
%
cpt
.
get_exception_message
(
e
))
load_noavx
=
True
load_noavx
=
True
else
:
else
:
sys
.
stderr
.
write
(
"WARNING: AVX is not support on your machine. Hence, no_avx core will be imported, "
"It has much worse preformance than avx core.
\n
"
)
load_noavx
=
True
load_noavx
=
True
if
load_noavx
:
if
load_noavx
:
...
@@ -330,8 +338,14 @@ if load_noavx:
...
@@ -330,8 +338,14 @@ if load_noavx:
except
Exception
as
e
:
except
Exception
as
e
:
if
has_noavx_core
:
if
has_noavx_core
:
sys
.
stderr
.
write
(
sys
.
stderr
.
write
(
'Error: Can not import noavx core while this file exists '
+
'Error: Can not import noavx core while this file exists
:
'
+
current_path
+
os
.
sep
+
'core_noavx.'
+
core_suffix
+
'
\n
'
)
current_path
+
os
.
sep
+
'core_noavx.'
+
core_suffix
+
'
\n
'
)
else
:
sys
.
stderr
.
write
(
"Error: AVX is not support on your machine, but you have installed "
"paddlepaddle with avx core, you should reinstall paddlepaddle by "
"'python -m pip install -U paddlepaddle-gpu[==version] -f "
"https://paddlepaddle.org.cn/whl/stable_noavx.html'
\n
"
)
raise
e
raise
e
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录