Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
1c6e5606
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1c6e5606
编写于
6月 18, 2019
作者:
T
tensor-tang
提交者:
GitHub
6月 18, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core replace x86cpu with py cpuinfo (#18151)
test=develop
上级
23f8a4b1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
12 deletion
+12
-12
Dockerfile
Dockerfile
+4
-4
paddle/scripts/Dockerfile.tmp
paddle/scripts/Dockerfile.tmp
+4
-4
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+1
-1
python/paddle/fluid/core.py
python/paddle/fluid/core.py
+2
-2
python/requirements.txt
python/requirements.txt
+1
-1
未找到文件。
Dockerfile
浏览文件 @
1c6e5606
...
@@ -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
x86cpu
==
0.4
&&
\
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
x86cpu
==
0.4
&&
\
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
x86cpu
==
0.4
&&
\
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
x86cpu
==
0.4
&&
\
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
浏览文件 @
1c6e5606
...
@@ -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
x86cpu==0.4
&& \
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
x86cpu==0.4
&& \
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
x86cpu==0.4
&& \
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
x86cpu==0.4
&& \
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/paddle_build.sh
浏览文件 @
1c6e5606
...
@@ -840,7 +840,7 @@ EOF
...
@@ -840,7 +840,7 @@ EOF
# run paddle version to install python packages first
# run paddle version to install python packages first
RUN apt-get update &&
${
NCCL_DEPS
}
RUN apt-get update &&
${
NCCL_DEPS
}
RUN apt-get install -y wget python3 python3-pip libgtk2.0-dev dmidecode python3-tk &&
\
RUN apt-get install -y wget python3 python3-pip libgtk2.0-dev dmidecode python3-tk &&
\
pip3 install opencv-python
x86cpu==0.4
&& pip3 install /*.whl; apt-get install -f -y &&
\
pip3 install opencv-python
py-cpuinfo==5.0.0
&& pip3 install /*.whl; apt-get install -f -y &&
\
apt-get clean -y &&
\
apt-get clean -y &&
\
rm -f /*.whl &&
\
rm -f /*.whl &&
\
${
PADDLE_VERSION
}
&&
\
${
PADDLE_VERSION
}
&&
\
...
...
python/paddle/fluid/core.py
浏览文件 @
1c6e5606
...
@@ -16,7 +16,7 @@ from __future__ import print_function
...
@@ -16,7 +16,7 @@ from __future__ import print_function
import
sys
import
sys
import
os
import
os
from
x86cpu
import
info
as
cpu
info
from
cpuinfo
import
get_cpu_
info
try
:
try
:
if
os
.
name
==
'nt'
:
if
os
.
name
==
'nt'
:
...
@@ -45,7 +45,7 @@ except Exception as e:
...
@@ -45,7 +45,7 @@ except Exception as e:
raise
e
raise
e
load_noavx
=
False
load_noavx
=
False
if
cpuinfo
.
supports_avx
:
if
'avx'
in
get_cpu_info
()[
'flags'
]
:
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
浏览文件 @
1c6e5606
...
@@ -16,4 +16,4 @@ funcsigs
...
@@ -16,4 +16,4 @@ funcsigs
pyyaml
pyyaml
decorator
decorator
prettytable
prettytable
x86cpu==0.4
py-cpuinfo==5.0.0
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录