Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
81d3992c
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看板
未验证
提交
81d3992c
编写于
10月 12, 2020
作者:
T
tianshuo78520a
提交者:
GitHub
10月 12, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix docker build error (#27735)
上级
9b49f024
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
11 deletion
+8
-11
python/unittest_py/requirements.txt
python/unittest_py/requirements.txt
+1
-0
tools/dockerfile/Dockerfile.ubuntu
tools/dockerfile/Dockerfile.ubuntu
+1
-6
tools/dockerfile/ubuntu16_dev.sh
tools/dockerfile/ubuntu16_dev.sh
+5
-0
tools/manylinux1/Dockerfile.cuda10_cudnn7_gcc8_ubuntu16
tools/manylinux1/Dockerfile.cuda10_cudnn7_gcc8_ubuntu16
+1
-5
未找到文件。
python/unittest_py/requirements.txt
浏览文件 @
81d3992c
...
@@ -2,4 +2,5 @@ PyGithub
...
@@ -2,4 +2,5 @@ PyGithub
coverage
coverage
pycrypto ; platform_system != "Windows"
pycrypto ; platform_system != "Windows"
mock
mock
opencv-python<=4.2.0.32
visualdl ; python_version>="3.5"
visualdl ; python_version>="3.5"
tools/dockerfile/Dockerfile.ubuntu
浏览文件 @
81d3992c
...
@@ -156,19 +156,14 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
...
@@ -156,19 +156,14 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
RUN pip3 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
RUN pip3 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3 --no-cache-dir install opencv-python==4.2.0.32 && \
pip3.6 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.6 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.6 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.6 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.6 --no-cache-dir install opencv-python==4.2.0.32 && \
pip3.7 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.7 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.7 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.7 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.7 --no-cache-dir install opencv-python==4.2.0.32 && \
pip3.8 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.8 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.8 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.8 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.8 --no-cache-dir install opencv-python==4.2.0.32 && \
pip --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip --no-cache-dir install 'ipykernel==4.6.0'
pip --no-cache-dir install opencv-python==4.2.0.32
#For docstring checker
#For docstring checker
RUN pip3 --no-cache-dir install pylint pytest astroid isort && \
RUN pip3 --no-cache-dir install pylint pytest astroid isort && \
...
...
tools/dockerfile/ubuntu16_dev.sh
浏览文件 @
81d3992c
...
@@ -28,11 +28,13 @@ function ref_whl(){
...
@@ -28,11 +28,13 @@ function ref_whl(){
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp38-cp38-linux_x86_64
.whl
else
else
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp38-cp38-linux_x86_64
.whl
fi
fi
if
[[
${
PADDLE_BRANCH
}
!=
"0.0.0"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
if
[[
${
PADDLE_BRANCH
}
!=
"0.0.0"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
...
@@ -40,11 +42,13 @@ function ref_whl(){
...
@@ -40,11 +42,13 @@ function ref_whl(){
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp38-cp38-linux_x86_64
.whl
else
else
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp38-cp38-linux_x86_64
.whl
fi
fi
}
}
...
@@ -55,6 +59,7 @@ function install_whl(){
...
@@ -55,6 +59,7 @@ function install_whl(){
sed
-i
"
${
dockerfile_line
}
i RUN wget
${
ref_web
}
/
${
ref_paddle3_whl
}
&& pip3.5 install
${
ref_paddle3_whl
}
&& rm -f
${
ref_paddle3_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget
${
ref_web
}
/
${
ref_paddle3_whl
}
&& pip3.5 install
${
ref_paddle3_whl
}
&& rm -f
${
ref_paddle3_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget
${
ref_web
}
/
${
ref_paddle36_whl
}
&& pip3.6 install
${
ref_paddle36_whl
}
&& rm -f
${
ref_paddle36_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget
${
ref_web
}
/
${
ref_paddle36_whl
}
&& pip3.6 install
${
ref_paddle36_whl
}
&& rm -f
${
ref_paddle36_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget
${
ref_web
}
/
${
ref_paddle37_whl
}
&& pip3.7 install
${
ref_paddle37_whl
}
&& rm -f
${
ref_paddle37_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget
${
ref_web
}
/
${
ref_paddle37_whl
}
&& pip3.7 install
${
ref_paddle37_whl
}
&& rm -f
${
ref_paddle37_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget
${
ref_web
}
/
${
ref_paddle38_whl
}
&& pip3.8 install
${
ref_paddle38_whl
}
&& rm -f
${
ref_paddle38_whl
}
"
Dockerfile.tmp
}
}
function
install_gcc
(){
function
install_gcc
(){
...
...
tools/manylinux1/Dockerfile.cuda10_cudnn7_gcc8_ubuntu16
浏览文件 @
81d3992c
...
@@ -174,16 +174,12 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
...
@@ -174,16 +174,12 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
RUN pip3 --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
RUN pip3 --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
pip3 --no-cache-dir install ipykernel==4.6.0 jupyter==1.0.0 && \
pip3 --no-cache-dir install ipykernel==4.6.0 jupyter==1.0.0 && \
pip3 --no-cache-dir install opencv-python && \
pip3.6 --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
pip3.6 --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
pip3.6 --no-cache-dir install ipykernel==4.6.0 jupyter==1.0.0 && \
pip3.6 --no-cache-dir install ipykernel==4.6.0 jupyter==1.0.0 && \
pip3.6 --no-cache-dir install opencv-python && \
pip3.7 --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
pip3.7 --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
pip3.7 --no-cache-dir install ipykernel==4.6.0 jupyter==1.0.0 && \
pip3.7 --no-cache-dir install ipykernel==4.6.0 jupyter==1.0.0 && \
pip3.7 --no-cache-dir install opencv-python && \
pip --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
pip --no-cache-dir install pre-commit==1.10.4 ipython==5.3.0 && \
pip --no-cache-dir install ipykernel==4.6.0 jupyter==1.0.0 && \
pip --no-cache-dir install ipykernel==4.6.0
pip --no-cache-dir install opencv-python
#For docstring checker
#For docstring checker
RUN pip3 --no-cache-dir install pylint pytest astroid isort
RUN pip3 --no-cache-dir install pylint pytest astroid isort
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录