Skip to content

[build][ipu] cleanup 3.7 for build shell - Part2 #59876

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.

Sign up for GitHub

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

Merged
luotao1 merged 4 commits into from
Dec 14, 2023
Merged

[build][ipu] cleanup 3.7 for build shell - Part2 #59876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2467543
cleanup 3.7 build shell
gouzil Dec 10, 2023
a7e893f
clean
gouzil Dec 10, 2023
a518de0
Merge branch 'develop' of github.com:gouzil/Paddle into forbid-py37-2
gouzil Dec 12, 2023
4f19f41
rollback cicheck_py37
gouzil Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions paddle/scripts/conda_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,18 @@ def __init__(self):
self.blt_const = r"""
"""

self.python37 = r" - python>=3.7, <3.8"
self.python38 = r" - python>=3.8, <3.9"
self.python39 = r" - python>=3.9, <3.10"
self.python310 = r" - python>=3.10, <3.11"
self.python311 = r" - python>=3.11, <3.12"
self.python312 = r" - python>=3.12, <3.13"

self.python_version = [
self.python37,
self.python38,
self.python39,
self.python310,
self.python311,
self.python312,
]

self.cuda101 = r"""
Expand All @@ -120,29 +122,32 @@ def __init__(self):
(self.cuda102, "cuda10.2", ""),
(self.cuda112, "cuda11.2", ".post112"),
]
self.py_str = ["py37", "py38", "py39", "py310"]
self.py_str = ["py38", "py39", "py310", "py311", "py312"]
self.pip_end = ".whl --no-deps"
self.pip_prefix_linux = "pip install /package/paddlepaddle"
self.pip_prefix_windows = r"pip install C:\package\paddlepaddle"
self.pip_gpu = "_gpu-"
self.pip_cpu = "-"
self.mac_pip = [
"-cp37-cp37m-macosx_10_6_intel",
"-cp38-cp38-macosx_10_14_x86_64",
"-cp39-cp39-macosx_10_14_x86_64",
"-cp310-cp310-macosx_10_14_x86_64",
"-cp311-cp311-macosx_10_14_x86_64",
"-cp312-cp312-macosx_10_14_x86_64",
]
self.linux_pip = [
"-cp37-cp37m-linux_x86_64",
"-cp38-cp38-linux_x86_64",
"-cp39-cp39-linux_x86_64",
"-cp310-cp310-linux_x86_64",
"-cp311-cp311-linux_x86_64",
"-cp312-cp312-linux_x86_64",
]
self.windows_pip = [
"-cp37-cp37m-win_amd64",
"-cp38-cp38-win_amd64",
"-cp39-cp39-win_amd64",
"-cp310-cp310-win_amd64",
"-cp311-cp311-win_amd64",
"-cp312-cp312-win_amd64",
]


Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/fast_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ function checkMacPip(){
if [[ "$version_list" != "" ]];then
return 0
else
red "未找到可用的pip或pip3。PaddlePaddle目前支持：Python >= 3.7及其对应的pip, 请重新输入，或使用ctrl + c退出"
Copy link
Member Author

@gouzil gouzil Dec 10, 2023

Choose a reason for hiding this comment

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

这个脚本都太久没人维护了，看看是不是可以删了，或者在下个pr维护一下

red "未找到可用的pip或pip3。PaddlePaddle目前支持：Python >= 3.8及其对应的pip, 请重新输入，或使用ctrl + c退出"
echo
clearMacPythonEnv
return 1
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/musl_build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ make -j8
compiling docker building script. it use alpine linux 3.10 as musl linux build environment. it will try to install all the compiling tools, development packages, and python requirements for paddle musl compiling.

environment variables:
- PYTHON_VERSION: the version of python used for image building, default=3.7.
- PYTHON_VERSION: the version of python used for image building, default=3.8.
- WITH_PRUNE_DAYS: prune old docker images, with days limitation.
- WITH_REBUILD: force to rebuild the image, default=0.
- WITH_REQUIREMENT: build with the python requirements, default=1.
Expand Down
Loading