Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
5a9513b4
P
Paddle
项目概览
Crayon鑫
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
5a9513b4
编写于
7月 01, 2019
作者:
T
tensor-tang
提交者:
GitHub
7月 01, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cherry pick fix mac ci random fail (#18437)
* fix mac ci random fail * use platform instead test=release/1.5
上级
157f1380
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
29 addition
and
11 deletion
+29
-11
Dockerfile
Dockerfile
+4
-4
paddle/scripts/Dockerfile.tmp
paddle/scripts/Dockerfile.tmp
+4
-4
python/paddle/fluid/core.py
python/paddle/fluid/core.py
+20
-1
python/requirements.txt
python/requirements.txt
+1
-2
未找到文件。
Dockerfile
浏览文件 @
5a9513b4
...
@@ -92,17 +92,17 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
...
@@ -92,17 +92,17 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# version(1.7.1 for now), which causes building documentation failed.
# version(1.7.1 for now), which causes building documentation failed.
RUN
pip3
--no-cache-dir
install
-U
wheel py-cpuinfo
==
4
.0.0
&&
\
RUN
pip3
--no-cache-dir
install
-U
wheel py-cpuinfo
==
5
.0.0
&&
\
pip3
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip3
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip3
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
&&
\
pip3
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
&&
\
pip3.6
--no-cache-dir
install
-U
wheel py-cpuinfo
==
4
.0.0
&&
\
pip3.6
--no-cache-dir
install
-U
wheel py-cpuinfo
==
5
.0.0
&&
\
pip3.6
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip3.6
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip3.6
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
&&
\
pip3.6
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
&&
\
pip3.7
--no-cache-dir
install
-U
wheel py-cpuinfo
==
4
.0.0
&&
\
pip3.7
--no-cache-dir
install
-U
wheel py-cpuinfo
==
5
.0.0
&&
\
pip3.7
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip3.7
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip3.7
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
&&
\
pip3.7
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
&&
\
easy_install
-U
pip
&&
\
easy_install
-U
pip
&&
\
pip
--no-cache-dir
install
-U
pip setuptools wheel py-cpuinfo
==
4
.0.0
&&
\
pip
--no-cache-dir
install
-U
pip setuptools wheel py-cpuinfo
==
5
.0.0
&&
\
pip
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
pip
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
...
...
paddle/scripts/Dockerfile.tmp
浏览文件 @
5a9513b4
...
@@ -92,17 +92,17 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
...
@@ -92,17 +92,17 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# version(1.7.1 for now), which causes building documentation failed.
# version(1.7.1 for now), which causes building documentation failed.
RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==
4
.0.0 && \
RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==
5
.0.0 && \
pip3 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.6 --no-cache-dir install -U wheel py-cpuinfo==
4
.0.0 && \
pip3.6 --no-cache-dir install -U wheel py-cpuinfo==
5
.0.0 && \
pip3.6 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.6 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.6 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.6 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.7 --no-cache-dir install -U wheel py-cpuinfo==
4
.0.0 && \
pip3.7 --no-cache-dir install -U wheel py-cpuinfo==
5
.0.0 && \
pip3.7 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.7 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.7 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.7 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
easy_install -U pip && \
easy_install -U pip && \
pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==
4
.0.0 && \
pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==
5
.0.0 && \
pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
...
...
python/paddle/fluid/core.py
浏览文件 @
5a9513b4
...
@@ -58,7 +58,26 @@ except Exception as e:
...
@@ -58,7 +58,26 @@ except Exception as e:
raise
e
raise
e
load_noavx
=
False
load_noavx
=
False
if
'avx'
in
get_cpu_info
()[
'flags'
]:
has_avx
=
False
if
sys
.
platform
==
'darwin'
:
try
:
has_avx
=
os
.
popen
(
'sysctl machdep.cpu.features | grep -i avx'
).
read
(
)
!=
''
except
Exception
as
e
:
sys
.
stderr
.
write
(
'Can not get the AVX flag from machdep.cpu.features.
\n
'
)
if
not
has_avx
:
try
:
has_avx
=
os
.
popen
(
'sysctl machdep.cpu.leaf7_features | grep -i avx'
).
read
()
!=
''
except
Exception
as
e
:
sys
.
stderr
.
write
(
'Can not get the AVX flag from machdep.cpu.leaf7_features.
\n
'
)
else
:
has_avx
=
'avx'
in
get_cpu_info
()[
'flags'
]
if
has_avx
:
try
:
try
:
from
.core_avx
import
*
from
.core_avx
import
*
from
.core_avx
import
__doc__
,
__file__
,
__name__
,
__package__
from
.core_avx
import
__doc__
,
__file__
,
__name__
,
__package__
...
...
python/requirements.txt
浏览文件 @
5a9513b4
...
@@ -16,5 +16,4 @@ funcsigs
...
@@ -16,5 +16,4 @@ funcsigs
pyyaml
pyyaml
decorator
decorator
prettytable
prettytable
py-cpuinfo==5.0.0 ; platform_system=="Windows"
py-cpuinfo==5.0.0
py-cpuinfo==4.0.0 ; platform_system!="Windows"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录