Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support python39 and delete python35 in Dockerfile #32385

Merged
merged 6 commits into from Apr 25, 2021

Conversation

pangyoki
Copy link
Contributor

@pangyoki pangyoki commented Apr 20, 2021

PR types

Others

PR changes

Others

Describe

  • ubuntu镜像和centos镜像里支持python3.9,并删除对python3.5的支持
  • ubuntu16和ubuntu18脚本里,升级pip和setuptools版本
  • TODO:准备修复centos镜像里/usr/bin/gcc -v版本不对的问题,但是这个PR里的修改没有效果。这个问题对发包没影响,之后再修。

@paddle-bot-old
Copy link

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@@ -20,36 +20,36 @@ REPO="${REPO:-paddledocker}"

function make_cuda9cudnn7(){
sed 's/<baseimg>/9.0-cudnn7-devel-centos7/g' Dockerfile.centos >Dockerfile.tmp
sed -i "s#RUN bash build_scripts/build.sh#RUN bash build_scripts/install_gcc.sh gcc54 \nRUN mv /usr/bin/cc /usr/bin/cc.bak \&\& ln -s /usr/local/gcc-5.4/bin/gcc /usr/bin/cc \nENV PATH=/usr/local/gcc-5.4/bin:\$PATH \nRUN bash build_scripts/build.sh#g" Dockerfile.tmp
sed -i "s#RUN bash build_scripts/build.sh#RUN bash build_scripts/install_gcc.sh gcc54 \nRUN mv /usr/bin/gcc /usr/bin/gcc.bak \&\& ln -s /usr/local/gcc-5.4/bin/gcc /usr/bin/gcc \nENV PATH=/usr/local/gcc-5.4/bin:\$PATH \nRUN bash build_scripts/build.sh#g" Dockerfile.tmp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为什么把cc改成gcc?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

问题:
QA说manylinux镜像里,使用/usr/bin/gcc -v得到的gcc版本是gcc4.8(gcc -v是正确的gcc8.2版本)。
这里的解决方法:
在manylinux镜像里尝试ln -s /usr/local/gcc-5.4/bin/gcc /usr/bin/gcc后,/usr/bin/gcc -v得到的版本变成了gcc8.2。
仍然出现的问题:
在已经生成好的镜像里测试没问题,但是修改后重新生成镜像/usr/bin/gcc -v仍然是gcc4.8。感觉是修改gcc版本后续的某个步骤里,重新装了gcc4.8。
结论:
这个问题还没修复,不过对发包没影响,准备之后找时间修。这个改动也不影响正常功能,看能否先合入这个PR,后续再处理这个问题?

@tianshuo78520a
Copy link
Contributor

QA测试不影响发包,可以先合入,之后再修问题

Copy link
Contributor

@zhiqiu zhiqiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pangyoki pangyoki merged commit 78fc74b into PaddlePaddle:develop Apr 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants