Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
ce7a024c
P
Paddle
项目概览
机器未来
/
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看板
未验证
提交
ce7a024c
编写于
6月 29, 2019
作者:
T
tensor-tang
提交者:
GitHub
6月 29, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix py-cpuinfo mac random fail (#18383)
* fix py-cpuinfo mac random fail * differentiate version on windows
上级
2b4ef509
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
9 deletion
+10
-9
Dockerfile
Dockerfile
+4
-4
paddle/scripts/Dockerfile.tmp
paddle/scripts/Dockerfile.tmp
+4
-4
python/requirements.txt
python/requirements.txt
+2
-1
未找到文件。
Dockerfile
浏览文件 @
ce7a024c
...
...
@@ -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
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# version(1.7.1 for now), which causes building documentation failed.
RUN
pip3
--no-cache-dir
install
-U
wheel py-cpuinfo
==
5
.0.0
&&
\
RUN
pip3
--no-cache-dir
install
-U
wheel py-cpuinfo
==
4
.0.0
&&
\
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.6
--no-cache-dir
install
-U
wheel py-cpuinfo
==
5
.0.0
&&
\
pip3.6
--no-cache-dir
install
-U
wheel py-cpuinfo
==
4
.0.0
&&
\
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.7
--no-cache-dir
install
-U
wheel py-cpuinfo
==
5
.0.0
&&
\
pip3.7
--no-cache-dir
install
-U
wheel py-cpuinfo
==
4
.0.0
&&
\
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
&&
\
easy_install
-U
pip
&&
\
pip
--no-cache-dir
install
-U
pip setuptools wheel py-cpuinfo
==
5
.0.0
&&
\
pip
--no-cache-dir
install
-U
pip setuptools wheel py-cpuinfo
==
4
.0.0
&&
\
pip
--no-cache-dir
install
-U
docopt PyYAML
sphinx
==
1.5.6
&&
\
pip
--no-cache-dir
install
sphinx-rtd-theme
==
0.1.9 recommonmark
...
...
paddle/scripts/Dockerfile.tmp
浏览文件 @
ce7a024c
...
...
@@ -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
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# version(1.7.1 for now), which causes building documentation failed.
RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==
5
.0.0 && \
RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==
4
.0.0 && \
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.6 --no-cache-dir install -U wheel py-cpuinfo==
5
.0.0 && \
pip3.6 --no-cache-dir install -U wheel py-cpuinfo==
4
.0.0 && \
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.7 --no-cache-dir install -U wheel py-cpuinfo==
5
.0.0 && \
pip3.7 --no-cache-dir install -U wheel py-cpuinfo==
4
.0.0 && \
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 && \
easy_install -U pip && \
pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==
5
.0.0 && \
pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==
4
.0.0 && \
pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
...
...
python/requirements.txt
浏览文件 @
ce7a024c
...
...
@@ -16,4 +16,5 @@ funcsigs
pyyaml
decorator
prettytable
py-cpuinfo==5.0.0
py-cpuinfo==5.0.0 ; platform_system=="Windows"
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录