From 5a378324b55e5f47bce9fad1cc3679b0a8aec972 Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Mon, 7 Sep 2020 11:14:29 +0800 Subject: [PATCH] fix(whl/misc): easy whl local test, and fix export ALL_PYTHON at docker env when value include more than two python version GitOrigin-RevId: 8f1c0eb419970831be81d7b426c168ede4ee0e3f --- scripts/whl/BUILD_PYTHON_WHL_README.md | 10 +++++----- scripts/whl/manylinux2010/build_wheel.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/whl/BUILD_PYTHON_WHL_README.md b/scripts/whl/BUILD_PYTHON_WHL_README.md index a9510072..c25d3f7b 100644 --- a/scripts/whl/BUILD_PYTHON_WHL_README.md +++ b/scripts/whl/BUILD_PYTHON_WHL_README.md @@ -70,12 +70,12 @@ If you just want to build for a specific Python verison, you can use `ALL_PYTHON` environment variable. eg: ``` - ALL_PYTHON=35m ./scripts/whl/manylinux2010/build_wheel.sh + ALL_PYTHON="36m" ./scripts/whl/manylinux2010/build_wheel.sh ``` If you just want to build with cpu only version, you can set `BUILD_WHL_CPU_ONLY` environment 'ON'. eg: ``` - BUILD_WHL_CPU_ONLY=ON ALL_PYTHON=35m ./scripts/whl/manylinux2010/build_wheel.sh + BUILD_WHL_CPU_ONLY="ON" ALL_PYTHON="36m" ./scripts/whl/manylinux2010/build_wheel.sh ``` ## build for macos @@ -85,7 +85,7 @@ If you just want to build for a specific Python verison, you can use `ALL_PYTHON` environment variable. eg: ``` - ALL_PYTHON=3.5.9 ./scripts/whl/macos/macos_build_whl.sh + ALL_PYTHON="3.7.7" ./scripts/whl/macos/macos_build_whl.sh ``` ## build for windows ``` @@ -94,10 +94,10 @@ If you just want to build for a specific Python verison, you can use `ALL_PYTHON` environment variable. eg: ``` - ALL_PYTHON=3.5.4 ./scripts/whl/windows/windows_build_whl.sh + ALL_PYTHON="3.8.3" ./scripts/whl/windows/windows_build_whl.sh ``` If you just want to build with cpu only version, you can set `BUILD_WHL_CPU_ONLY` environment 'ON'. eg: ``` - BUILD_WHL_CPU_ONLY='ON' ALL_PYTHON=3.5.4 ./scripts/whl/windows/windows_build_whl.sh + BUILD_WHL_CPU_ONLY="ON" ALL_PYTHON="3.8.3" ./scripts/whl/windows/windows_build_whl.sh ``` diff --git a/scripts/whl/manylinux2010/build_wheel.sh b/scripts/whl/manylinux2010/build_wheel.sh index c4762356..b9d16150 100755 --- a/scripts/whl/manylinux2010/build_wheel.sh +++ b/scripts/whl/manylinux2010/build_wheel.sh @@ -100,4 +100,4 @@ if [ ${BUILD_WHL_CPU_ONLY} = "OFF" ]; then fi fi -docker run -it --rm $TMPFS_ARGS -e UID=${USERID} -e LOCAL_VERSION=${LOCAL_VERSION} -e BUILD_WHL_CPU_ONLY=${BUILD_WHL_CPU_ONLY} -e ALL_PYTHON=${ALL_PYTHON} -v ${CUDA_ROOT_DIR}:/usr/local/cuda -v ${CUDNN_ROOT_DIR}:/opt/cudnn -v ${TENSORRT_ROOT_DIR}:/opt/tensorrt -v ${BASEDIR}:/home/code -v ${OUTPUTDIR}:/home/output:rw env_manylinux2010:latest /home/code/scripts/whl/manylinux2010/do_build.sh +docker run -it --rm $TMPFS_ARGS -e UID=${USERID} -e LOCAL_VERSION=${LOCAL_VERSION} -e BUILD_WHL_CPU_ONLY=${BUILD_WHL_CPU_ONLY} -e ALL_PYTHON="${ALL_PYTHON}" -v ${CUDA_ROOT_DIR}:/usr/local/cuda -v ${CUDNN_ROOT_DIR}:/opt/cudnn -v ${TENSORRT_ROOT_DIR}:/opt/tensorrt -v ${BASEDIR}:/home/code -v ${OUTPUTDIR}:/home/output:rw env_manylinux2010:latest /home/code/scripts/whl/manylinux2010/do_build.sh -- GitLab