Skip to content

Pipeline changes for python 3.8 #2753

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
Changming Sun (snnn) merged 14 commits into from
Jan 2, 2020
Merged

Pipeline changes for python 3.8 #2753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
19deadd
python 3.8
Dec 27, 2019
c6214e1
update
Dec 27, 2019
edd8ec4
python 3.8
Dec 27, 2019
e3f368f
update
Dec 27, 2019
2942f82
update
Dec 27, 2019
c1c7705
update
Dec 27, 2019
150f264
update
Dec 27, 2019
9c4361f
update
Dec 28, 2019
8ca0781
a
Dec 28, 2019
ee8fd6f
update
Dec 28, 2019
dad0eba
Merge remote-tracking branch 'origin/master' into snnn/py38
Dec 28, 2019
ee4d5ec
fix
Dec 28, 2019
f17f3a7
Merge remote-tracking branch 'origin/master' into snnn/py38
Dec 30, 2019
02919a9
update
Jan 2, 2020
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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def run(self):
py_modules=python_modules_list,
install_requires=[
'onnx>=1.2.3',
'numpy>=1.18.0,<2'
'numpy>=1.18.0'
],
entry_points= {
'console_scripts': [
Expand Down
24 changes: 21 additions & 3 deletions tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,19 @@ jobs:
Python35:
python.version: '3.5'
python.dir: '/opt/python/cp35-cp35m'
python.include.dir: '/opt/python/cp35-cp35m/include/python3.5m'
Python36:
python.version: '3.6'
python.dir: '/opt/python/cp36-cp36m'
python.include.dir: '/opt/python/cp36-cp36m/include/python3.6m'
Python37:
python.version: '3.7'
python.dir: '/opt/python/cp37-cp37m'
python.include.dir: '/opt/python/cp37-cp37m/include/python3.7m'
Python38:
python.version: '3.8'
python.dir: '/opt/python/cp38-cp38'
python.include.dir: '/opt/python/cp38-cp38/include/python3.8'
steps:
- template: templates/set-test-data-variables-step.yml

Expand All @@ -40,7 +47,7 @@ jobs:
- task: CmdLine@2
inputs:
script: |
docker run --rm --volume $(Build.SourcesDirectory):/onnxruntime_src --volume $(Build.BinariesDirectory):/build -e NIGHTLY_BUILD onnxruntime-manylinux-$(python.version) $(python.dir)/bin/python3 /onnxruntime_src/tools/ci_build/build.py --build_dir /build --config Release --skip_submodule_sync --parallel --build_shared_lib --use_openmp --cmake_path /usr/bin/cmake --ctest_path /usr/bin/ctest --use_featurizers --build_wheel --enable_onnx_tests --cmake_extra_defines PYTHON_INCLUDE_DIR=$(python.dir)/include/python$(python.version)m PYTHON_LIBRARY=/usr/lib64/librt.so
docker run --rm --volume $(Build.SourcesDirectory):/onnxruntime_src --volume $(Build.BinariesDirectory):/build -e NIGHTLY_BUILD onnxruntime-manylinux-$(python.version) $(python.dir)/bin/python3 /onnxruntime_src/tools/ci_build/build.py --build_dir /build --config Release --skip_submodule_sync --parallel --build_shared_lib --use_openmp --cmake_path /usr/bin/cmake --ctest_path /usr/bin/ctest --use_featurizers --build_wheel --enable_onnx_tests --cmake_extra_defines PYTHON_INCLUDE_DIR=$(python.include.dir) PYTHON_LIBRARY=/usr/lib64/librt.so
workingDirectory: $(Build.SourcesDirectory)

- task: CopyFiles@2
Expand Down Expand Up @@ -69,12 +76,19 @@ jobs:
Python35:
python.version: '3.5'
python.dir: '/opt/python/cp35-cp35m'
python.include.dir: '/opt/python/cp35-cp35m/include/python3.5m'
Python36:
python.version: '3.6'
python.dir: '/opt/python/cp36-cp36m'
python.include.dir: '/opt/python/cp36-cp36m/include/python3.6m'
Python37:
python.version: '3.7'
python.dir: '/opt/python/cp37-cp37m'
python.include.dir: '/opt/python/cp37-cp37m/include/python3.7m'
Python38:
python.version: '3.8'
python.dir: '/opt/python/cp38-cp38'
python.include.dir: '/opt/python/cp38-cp38/include/python3.8'
steps:
- template: templates/set-test-data-variables-step.yml

Expand All @@ -101,7 +115,7 @@ jobs:
- task: CmdLine@2
inputs:
script: |
docker run --gpus all -e NVIDIA_VISIBLE_DEVICES=all --rm --volume $(Build.SourcesDirectory):/onnxruntime_src --volume $(Build.BinariesDirectory):/build -e NIGHTLY_BUILD onnxruntime-manylinux-gpu-$(python.version) $(python.dir)/bin/python3 /onnxruntime_src/tools/ci_build/build.py --build_dir /build --config Release --skip_submodule_sync --parallel --build_shared_lib --cmake_path /usr/bin/cmake --ctest_path /usr/bin/ctest --use_featurizers --build_wheel --enable_onnx_tests --cmake_extra_defines PYTHON_INCLUDE_DIR=$(python.dir)/include/python$(python.version)m PYTHON_LIBRARY=/usr/lib64/librt.so --use_cuda --cuda_version=10.0 --cuda_home=/usr/local/cuda-10.0 --cudnn_home=/usr/local/cuda-10.0
docker run --gpus all -e NVIDIA_VISIBLE_DEVICES=all --rm --volume $(Build.SourcesDirectory):/onnxruntime_src --volume $(Build.BinariesDirectory):/build -e NIGHTLY_BUILD onnxruntime-manylinux-gpu-$(python.version) $(python.dir)/bin/python3 /onnxruntime_src/tools/ci_build/build.py --build_dir /build --config Release --skip_submodule_sync --parallel --build_shared_lib --cmake_path /usr/bin/cmake --ctest_path /usr/bin/ctest --use_featurizers --build_wheel --enable_onnx_tests --cmake_extra_defines PYTHON_INCLUDE_DIR=$(python.include.dir) PYTHON_LIBRARY=/usr/lib64/librt.so --use_cuda --cuda_version=10.0 --cuda_home=/usr/local/cuda-10.0 --cudnn_home=/usr/local/cuda-10.0
workingDirectory: $(Build.SourcesDirectory)

- task: CopyFiles@2
Expand Down Expand Up @@ -131,6 +145,8 @@ jobs:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
variables:
OrtPackageId: 'Microsoft.ML.OnnxRuntime'
MsbuildArguments: '-maxcpucount'
Expand Down Expand Up @@ -199,7 +215,7 @@ jobs:
workspace:
clean: all
pool: 'Win-GPU-2019'
timeoutInMinutes: 120
timeoutInMinutes: 60
variables:
CUDA_VERSION: '10.0'
EnvSetupScript: setup_env.bat
Expand Down Expand Up @@ -276,6 +292,8 @@ jobs:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
steps:
- task: UsePythonVersion@0
displayName: 'Use Python'
Expand Down
2 changes: 2 additions & 0 deletions tools/ci_build/github/linux/docker/scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ elif [[ "$PYTHON_VER" = "3.6" && -d "/opt/python/cp36-cp36m" ]]; then
PYTHON_EXE="/opt/python/cp36-cp36m/bin/python3.6"
elif [[ "$PYTHON_VER" = "3.7" && -d "/opt/python/cp37-cp37m" ]]; then
PYTHON_EXE="/opt/python/cp37-cp37m/bin/python3.7"
elif [[ "$PYTHON_VER" = "3.8" && -d "/opt/python/cp38-cp38" ]]; then
PYTHON_EXE="/opt/python/cp38-cp38/bin/python3.8"
else
PYTHON_EXE="/usr/bin/python${PYTHON_VER}"
fi
Expand Down
8 changes: 4 additions & 4 deletions tools/ci_build/github/linux/docker/scripts/install_onnx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ PYTHON_VER=$1

if [[ "$PYTHON_VER" = "3.5" && -d "/opt/python/cp35-cp35m" ]]; then
PYTHON_EXE="/opt/python/cp35-cp35m/bin/python3.5"
export PATH=/opt/python/cp35-cp35m/bin:$PATH
elif [[ "$PYTHON_VER" = "3.6" && -d "/opt/python/cp36-cp36m" ]]; then
PYTHON_EXE="/opt/python/cp36-cp36m/bin/python3.6"
export PATH=/opt/python/cp36-cp36m/bin:$PATH
elif [[ "$PYTHON_VER" = "3.7" && -d "/opt/python/cp37-cp37m" ]]; then
PYTHON_EXE="/opt/python/cp37-cp37m/bin/python3.7"
export PATH=/opt/python/cp37-cp37m/bin:$PATH
elif [[ "$PYTHON_VER" = "3.8" && -d "/opt/python/cp38-cp38" ]]; then
PYTHON_EXE="/opt/python/cp38-cp38/bin/python3.8"
else
PYTHON_EXE="/usr/bin/python${PYTHON_VER}"
fi
Expand Down Expand Up @@ -57,5 +56,6 @@ for v2t in ${version2tag[*]}; do
mv /tmp/src/onnx-$onnx_version/tools/repl_protoc-gen-mypy.py /tmp/src/onnx-$onnx_version/tools/protoc-gen-mypy.py
mkdir -p /data/onnx/${onnx_tag}
${PYTHON_EXE} -m pip install .
backend-test-tools generate-data -o /data/onnx/$onnx_tag
cd /tmp
${PYTHON_EXE} -m onnx.backend.test.cmd_tools generate-data -o /data/onnx/$onnx_tag
done