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

Add python3.12 In Docker #58069

Merged
merged 20 commits into from
Nov 10, 2023
Merged

Add python3.12 In Docker #58069

merged 20 commits into from
Nov 10, 2023

Conversation

tianshuo78520a
Copy link
Contributor

@tianshuo78520a tianshuo78520a commented Oct 13, 2023

PR types

Others

PR changes

Others

Description

在编包镜像中添加Python3.12
Pcard-67012

@paddle-bot
Copy link

paddle-bot bot commented Oct 13, 2023

你的PR提交成功,感谢你对开源项目的贡献!
请关注后续CI自动化测试结果,详情请参考Paddle-CI手册
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@@ -82,6 +82,7 @@ PY38_BIN=/opt/python/cp38-cp38/bin
PY39_BIN=/opt/python/cp39-cp39/bin
PY310_BIN=/opt/python/cp310-cp310/bin
PY311_BIN=/opt/python/cp311-cp311/bin
PY311_BIN=/opt/python/cp312-cp312/bin
Copy link
Contributor

Choose a reason for hiding this comment

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

这里为啥py311_bin不是py312_bin?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

写的有问题,稍后修改

@@ -13,7 +13,7 @@ ENV PATH /opt/rh/devtoolset-2/root/usr/bin:$PATH
ENV LD_LIBRARY_PATH /usr/local/ssl/lib:/opt/rh/devtoolset-2/root/usr/lib64:/opt/rh/devtoolset-2/root/usr/lib:/usr/local/lib64:/usr/local/lib:${LD_LIBRARY_PATH}
ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig

RUN yum install -y bzip2 gettext-devel sqlite-devel zlib-devel openssl-devel pcre-devel vim tk-devel tkinter libtool xz graphviz wget curl-devel
RUN yum install -y bzip2 gettext-devel sqlite-devel zlib-devel openssl-devel pcre-devel vim tk-devel tkinter libtool xz graphviz wget curl-devel patch
COPY build_scripts /build_scripts
Copy link
Contributor

Choose a reason for hiding this comment

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

这里的curl-devel-patch是干嘛的

Copy link
Contributor Author

Choose a reason for hiding this comment

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

安装gcc需要patch工具

Copy link
Contributor

Choose a reason for hiding this comment

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

安装gcc需要patch工具

这个是必须的吗,我记得之前也可以安装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.

原先安装gcc没有问题,PR55835为gcc打了patch,所以需要提前安装这个工具

@@ -31,7 +31,7 @@ fi

if [ "$1" == "gcc82" ]; then
wget -q --no-proxy https://paddle-ci.gz.bcebos.com/gcc-8.2.0.tar.xz
tar -xvf gcc-8.2.0.tar.xz && \
tar -xf gcc-8.2.0.tar.xz && \
Copy link
Contributor

Choose a reason for hiding this comment

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

这里为什么要改?

Copy link
Contributor

Choose a reason for hiding this comment

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

gcc12下面为xzf

Copy link
Contributor Author

Choose a reason for hiding this comment

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

日志没有必要输出,隐藏解压日志

@paddle-ci-bot
Copy link

paddle-ci-bot bot commented Oct 24, 2023

Sorry to inform you that 0f67b0f's CIs have passed for more than 7 days. To prevent PR conflicts, you need to re-run all CIs manually.

@@ -13,9 +13,9 @@ prettytable
distro
numpy>=1.20
autograd==1.4
librosa==0.8.1
librosa==0.8.1 ; python_version<"3.12"
Copy link
Contributor

Choose a reason for hiding this comment

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

这个python3.12的时候装不了对吧

Copy link
Contributor Author

Choose a reason for hiding this comment

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

是的

@@ -58,7 +57,7 @@
)

# check cmake
CMAKE = find_executable('cmake3') or find_executable('cmake')
CMAKE = shutil.which('cmake3') or shutil.which('cmake')
assert (
Copy link
Contributor

Choose a reason for hiding this comment

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

这是为啥?

Copy link
Contributor Author

@tianshuo78520a tianshuo78520a Nov 8, 2023

Choose a reason for hiding this comment

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

最新版本setuptools不支持find_executable方法了,使用shutil.which进行替换,参考链接:https://peps.python.org/pep-0632/#migration-advice

@risemeup1 risemeup1 merged commit 1dc0042 into PaddlePaddle:develop Nov 10, 2023
28 checks passed
danleifeng pushed a commit to danleifeng/Paddle that referenced this pull request Nov 14, 2023
* Update python3.12

* test=document_fix

* add python3.12

* add python3.12

* Add develop dockerfile

* Fix error

* Fix

* Fix error

* Fix error

* Fix

* Fix build python3.12,abs error

* Fix pip

* Fix pip

* Fix pip

* Fix cudnn

* Fix

* Fix gcc12

* Del py3.7

* Fix

* Fix code
SecretXV pushed a commit to SecretXV/Paddle that referenced this pull request Nov 28, 2023
* Update python3.12

* test=document_fix

* add python3.12

* add python3.12

* Add develop dockerfile

* Fix error

* Fix

* Fix error

* Fix error

* Fix

* Fix build python3.12,abs error

* Fix pip

* Fix pip

* Fix pip

* Fix cudnn

* Fix

* Fix gcc12

* Del py3.7

* Fix

* Fix code
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.

2 participants