[CodeStyle][py36] Update dockerfile and some script #49558
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,19 +77,7 @@ function cmake_base() { | |
| SYSTEM=`uname -s` | ||
| if [ "$SYSTEM" == "Darwin" ]; then | ||
| echo "Using python abi: $1" | ||
| if [ "$1" == "cp37-cp37m" ] || [ "$1" == "" ]; then | ||
| if [ -d "/Library/Frameworks/Python.framework/Versions/3.7" ]; then | ||
| export LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.7/lib/ | ||
| export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/Library/Frameworks/Python.framework/Versions/3.7/lib/ | ||
|
|
@@ -141,14 +129,7 @@ function cmake_base() { | |
| else | ||
| if [ "$1" != "" ]; then | ||
| echo "using python abi: $1" | ||
| if [ "$1" == "cp37-cp37m" ]; then | ||
| export LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} | ||
| export PATH=/opt/_internal/cpython-3.7.0/bin/:${PATH} | ||
| export PYTHON_FLAGS="-DPYTHON_EXECUTABLE:FILEPATH=/opt/_internal/cpython-3.7.0/bin/python3.7 | ||
|
|
@@ -641,9 +622,7 @@ EOF | |
| set -x | ||
|
|
||
| set +ex | ||
| if [ "$1" == "cp37-cp37m" ]; then | ||
| pip3.7 uninstall -y paddlepaddle | ||
| elif [ "$1" == "cp38-cp38" ]; then | ||
| pip3.8 uninstall -y paddlepaddle | ||
|
|
@@ -654,10 +633,7 @@ EOF | |
| fi | ||
| set -ex | ||
|
|
||
| if [ "$1" == "cp37-cp37m" ]; then | ||
| pip3.7 install --user ${INSTALL_PREFIX:-/paddle/build}/opt/paddle/share/wheels/*.whl | ||
| pip3.7 install --user hypothesis | ||
| elif [ "$1" == "cp38-cp38" ]; then | ||
|
|
@@ -3004,44 +2980,27 @@ EOF | |
|
|
||
| ref_web=https://paddle-wheel.bj.bcebos.com/${PADDLE_BRANCH}-${ref_gpu}-${ref_mkl} | ||
|
|
||
| ref_paddle37=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp37-cp37m-linux_x86_64.whl | ||
| ref_paddle38=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp38-cp38-linux_x86_64.whl | ||
| ref_paddle39=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp39-cp39-linux_x86_64.whl | ||
| ref_paddle310=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp310-cp310-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 | ||
| ref_paddle39_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp39-cp39-linux_x86_64.whl | ||
| ref_paddle310_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp310-cp310-linux_x86_64.whl | ||
|
|
||
| if [[ ${PADDLE_BRANCH} != "0.0.0" && ${WITH_MKL} == "ON" && ${WITH_GPU} == "ON" ]]; then | ||
| ref_paddle37=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp37-cp37m-linux_x86_64.whl | ||
| ref_paddle38=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp38-cp38-linux_x86_64.whl | ||
| ref_paddle39=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp39-cp39-linux_x86_64.whl | ||
| ref_paddle310=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp310-cp310-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 | ||
| ref_paddle39_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp39-cp39-linux_x86_64.whl | ||
| ref_paddle310_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp310-cp310-linux_x86_64.whl | ||
| fi | ||
|
|
||
| cat > ${PADDLE_ROOT}/build/Dockerfile <<EOF | ||
| FROM ${BASE_IMAGE} | ||
| MAINTAINER PaddlePaddle Authors <[email protected]> | ||
|
|
@@ -3072,25 +3031,6 @@ EOF | |
| ${DOCKERFILE_CUBLAS_DSO} | ||
| ${DOCKERFILE_CUBLASLT_DSO} | ||
| ${DOCKERFILE_GPU_ENV} | ||
| EOF | ||
| cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF | ||
| # run paddle version to install python packages first | ||
|
|
@@ -3874,10 +3814,6 @@ function main() { | |
| cmake_gen_and_build_mac ${PYTHON_ABI:-""} | ||
| run_mac_test ${PYTHON_ABI:-""} ${PROC_RUN:-1} | ||
| ;; | ||
| macbuild) | ||
| cmake_gen ${PYTHON_ABI:-""} | ||
| build_mac | ||
|
|
@@ -3889,12 +3825,6 @@ function main() { | |
| test_cicheck_py37) | ||
| run_linux_cpu_test ${PYTHON_ABI:-""} ${PROC_RUN:-1} | ||
| ;; | ||
| build_gpubox) | ||
| run_setup ${PYTHON_ABI:-""} install | ||
| ;; | ||
|
|
@@ -3927,10 +3857,6 @@ function main() { | |
| parallel_test | ||
| check_coverage | ||
| ;; | ||
| cmake_gen) | ||
| cmake_gen ${PYTHON_ABI:-""} | ||
| ;; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,7 +64,7 @@ function do_cpython_build { | |
| local prefix="/opt/_internal/cpython-${py_ver}${dir_suffix}" | ||
| mkdir -p ${prefix}/lib | ||
| # -Wformat added for https://bugs.python.org/issue17547 on Python 2.6 | ||
| # TODO(gsq7474741): 这里要求的python版本是否需要更新？ | ||
|
||
| if [ $(lex_pyver $py_ver) -ge $(lex_pyver 3.6) ]; then | ||
| wget -q --no-check-certificate https://www.sqlite.org/2018/sqlite-autoconf-3250300.tar.gz | ||
| tar -zxf sqlite-autoconf-3250300.tar.gz | ||
|
|
@@ -93,9 +93,6 @@ function do_cpython_build { | |
| rm -rf Python-$py_ver | ||
| # Some python's install as bin/python3. Make them available as | ||
| # bin/python. | ||
| if [ -e ${prefix}/bin/python3.7 ]; then | ||
| ln -s python3.7 ${prefix}/bin/python | ||
| fi | ||
|
|
@@ -106,6 +103,7 @@ function do_cpython_build { | |
| ln -s python3.9 ${prefix}/bin/python | ||
| fi | ||
| # NOTE Make libpython shared library visible to python calls below | ||
| # TODO(gsq7474741): 这里要求的python版本是否需要更新？ | ||
gsq7474741 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if [ -e ${prefix}/bin/python3.6 ]; then | ||
| LD_LIBRARY_PATH="/usr/local/ssl/lib:${prefix}/lib" ${prefix}/bin/python ez_setup.py | ||
| LD_LIBRARY_PATH="/usr/local/ssl/lib:${prefix}/lib" ${prefix}/bin/python -m easy_install pip | ||
|
|
@@ -136,7 +134,7 @@ function build_cpython { | |
| rm -f Python-$py_ver.tgz | ||
| } | ||
|
|
||
| # TODO(gsq7474741): 这里不知道怎么解决 | ||
gsq7474741 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| function build_cpythons { | ||
| for py_ver in $@; do | ||
| if [ ${py_ver} == "2.7.15" ]; then | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里[ "$1" == "" ]的case是不是漏掉了？py37判断时加上这个case吧