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

[PyOV] Enable Python 3.10 on Azure CI #12578

Merged
merged 258 commits into from Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from 199 commits
Commits
Show all changes
258 commits
Select commit Hold shift + click to select a range
90238ca
Fix mypy for numpy==1.21.6
p-wysocki Jul 25, 2022
ca60f1d
Merge branch 'drop_python3.6' of https://github.com/p-wysocki/openvin…
p-wysocki Jul 25, 2022
47c12c5
Merge branch 'master' into drop_python3.6
p-wysocki Jul 25, 2022
1a504b8
Apply CR changes
p-wysocki Jul 26, 2022
2940cd8
Merge branch 'drop_python3.6' of https://github.com/p-wysocki/openvin…
p-wysocki Jul 26, 2022
7f9f5f0
Allow Python 3.6 for open source
p-wysocki Jul 26, 2022
ed0fd6f
Attempt to silence mypy
p-wysocki Jul 26, 2022
97e5021
Revert to 3.6 in setup.pys
p-wysocki Jul 26, 2022
324a771
Fix merge conflict
p-wysocki Jul 27, 2022
4c118cb
Fix merge conflict
p-wysocki Jul 27, 2022
c63f202
Add newline
p-wysocki Jul 27, 2022
824d984
Fix Python version assert
p-wysocki Aug 1, 2022
ad74f2c
Test Python 3.10 CI
p-wysocki Aug 2, 2022
0899b94
Try bumping up pybind to 2.10
p-wysocki Aug 2, 2022
5492999
Link default python to python 3.10
p-wysocki Aug 3, 2022
2a6d6fb
Add sudo to changing default python
p-wysocki Aug 3, 2022
2af72d0
Merge branch 'master' into drop_python3.6
p-wysocki Aug 4, 2022
74dd405
Bump python version in setupvars
p-wysocki Aug 4, 2022
b9d596d
Merge branch 'drop_python3.6' of https://github.com/p-wysocki/openvin…
p-wysocki Aug 4, 2022
f2e63e6
Fix exception in test
p-wysocki Aug 4, 2022
e55b20e
Do the same for compatibility
p-wysocki Aug 4, 2022
5ee5c1b
Apply same CI changes to other pipelines
p-wysocki Aug 4, 2022
2d4463d
Attempt to fix arm and windows CIs
p-wysocki Aug 4, 2022
dd0452b
Fix win py lib version and links?
mmikolajcz Aug 8, 2022
bac83cd
Merge branch 'master' into drop_python3.6
mmikolajcz Aug 8, 2022
d415e93
Try to fix CI
mmikolajcz Aug 8, 2022
4296710
Merge branch 'drop_python3.6' of https://github.com/p-wysocki/openvin…
mmikolajcz Aug 8, 2022
5a29b32
Fix win python path
mmikolajcz Aug 9, 2022
a940820
Update win path
mmikolajcz Aug 9, 2022
dea4659
Test disable PDPD
mmikolajcz Aug 9, 2022
9a2b77e
Disable TF for testing CI
mmikolajcz Aug 9, 2022
89803bc
Add sudo to rm
p-wysocki Aug 9, 2022
46a713d
Merge branch 'master' into drop_python3.6
p-wysocki Aug 9, 2022
87a4657
Test linux
mmikolajcz Aug 10, 2022
9ca9d2d
Update requirements
mmikolajcz Aug 10, 2022
2c8af38
RM sudo
mmikolajcz Aug 10, 2022
5816395
Add debug step to CI on ARM
p-wysocki Aug 10, 2022
f3b8b4b
build py from source on linux
mmikolajcz Aug 10, 2022
c347331
Remove debug step from ARM
p-wysocki Aug 10, 2022
f23bc9d
Merge branch 'drop_python3.6' of https://github.com/p-wysocki/openvin…
p-wysocki Aug 10, 2022
05076e4
Fix err
mmikolajcz Aug 10, 2022
06996d5
Fill num_proc
mmikolajcz Aug 10, 2022
57eebf4
Fic py installation
mmikolajcz Aug 10, 2022
80b3109
Bump pdpd to 2.3.1
p-wysocki Aug 10, 2022
4cd7e8a
Merge branch 'openvinotoolkit:master' into drop_python3.6
p-wysocki Aug 10, 2022
52acf44
Bump np vers
mmikolajcz Aug 10, 2022
06dc16e
Try to upgrade onnx to 1.12.0
mmikolajcz Aug 11, 2022
206a3b4
Revert onnx upgrade, enable frontends
mmikolajcz Aug 11, 2022
33154b8
Build py shared
mmikolajcz Aug 11, 2022
868bf67
Export library
mmikolajcz Aug 11, 2022
205063a
activate py env
mmikolajcz Aug 11, 2022
9f378f3
Bump scipy for py3.10
mmikolajcz Aug 11, 2022
936c053
Another scipy bump
mmikolajcz Aug 11, 2022
ae512ed
Merge branch 'master' into enable_python3.10
p-wysocki Aug 16, 2022
713be7c
Merge branch 'master' into enable_python3.10
p-wysocki Aug 22, 2022
8c252c5
Fix Windows path, add nfs helper for mount
p-wysocki Aug 22, 2022
ccee378
Attempt to fix win_cc
p-wysocki Aug 22, 2022
018f63b
Merge branch 'master' into enable_python3.10
p-wysocki Aug 23, 2022
81220c3
Merge branch 'master' into enable_python3.10
p-wysocki Aug 23, 2022
56878e8
Batch of changes
p-wysocki Aug 23, 2022
0825897
Try to fix ngraph-onnx-lin
p-wysocki Aug 23, 2022
da39962
Install lsb-release for docker on ngraph-onnx-lin
p-wysocki Aug 23, 2022
49a928d
Link lsb_release
p-wysocki Aug 23, 2022
ba1a22f
Try bumping Ubuntu to 22.04
p-wysocki Aug 23, 2022
7d5a1ad
Revert ubuntu change in dockerfile
p-wysocki Aug 23, 2022
807d056
Merge branch 'master' into enable_python3.10
p-wysocki Aug 25, 2022
9cdc44b
Merge branch 'master' into enable_python3.10
p-wysocki Aug 30, 2022
a119261
Refactor tests for onnx1.12
p-wysocki Aug 30, 2022
a2d6e11
Fix ONNX compatibility and numpy warnings
p-wysocki Aug 30, 2022
30fc11a
fix conflicts
p-wysocki Aug 30, 2022
e71d6c6
Refactor tests for onnx1.12
p-wysocki Aug 30, 2022
cd8a0e6
Fix ONNX compatibility and numpy warnings
p-wysocki Aug 30, 2022
d25f957
Upgrade ONNX to 1.12 in cpp
p-wysocki Aug 31, 2022
336c4c6
Skip unsupported ops
p-wysocki Aug 31, 2022
81039eb
Revert "Fix ONNX compatibility and numpy warnings"
p-wysocki Aug 31, 2022
4fb6987
Small changes
p-wysocki Aug 31, 2022
10fc8a4
Remove unnecessary changes
p-wysocki Aug 31, 2022
90bbaf3
Bump Python version in github workflows
p-wysocki Aug 31, 2022
a8aa361
Fix flake error
p-wysocki Aug 31, 2022
8987799
Another flake error
p-wysocki Aug 31, 2022
958c9ae
Even more flake errors
p-wysocki Aug 31, 2022
1108df0
Xfail more tests
p-wysocki Sep 2, 2022
1dbfe55
Fix mypy errors
p-wysocki Sep 2, 2022
572bd0b
Merge branch 'master' into pwysocki/enable_onnx1_12
p-wysocki Sep 2, 2022
a334c09
Merge remote-tracking branch 'upstream/master' into pwysocki/enable_o…
p-wysocki Sep 2, 2022
d619736
Change onnx version in tests
p-wysocki Sep 2, 2022
1857307
Merge branch 'pwysocki/enable_onnx1_12' of https://github.com/p-wysoc…
p-wysocki Sep 2, 2022
547d2c7
Bump ONNX in MO
p-wysocki Sep 2, 2022
ea92a52
Merge remote-tracking branch 'upstream/master' into pwysocki/enable_o…
p-wysocki Sep 5, 2022
c8d81f2
Fix onnx utils in comp
p-wysocki Sep 5, 2022
dc59f53
Minor changes
p-wysocki Sep 5, 2022
e8e2a90
Import pathlib
p-wysocki Sep 5, 2022
d6e7e91
Add xfails to compatibility tests
p-wysocki Sep 5, 2022
45c0415
Skip segfaulting tests
p-wysocki Sep 5, 2022
5ad9bc1
Merge branch 'pwysocki/enable_onnx1_12' of https://github.com/p-wysoc…
mmikolajcz Sep 5, 2022
0903bb0
Fix onnx nametuple
p-wysocki Sep 5, 2022
2d841e6
Fix flake
p-wysocki Sep 5, 2022
250c1b3
Try to fix py3.6 onnx
p-wysocki Sep 6, 2022
144c679
Switch to venv in windows
mmikolajcz Sep 6, 2022
c61725b
Fix model importer and reqs
p-wysocki Sep 6, 2022
9a186ff
Add __test__
p-wysocki Sep 6, 2022
f1bc0bb
Debug print
mmikolajcz Sep 7, 2022
cb3d487
Fix flake
mmikolajcz Sep 7, 2022
b6d60ea
Merge branch 'master' into enable_python3.10
mmikolajcz Sep 7, 2022
75e906c
Update linux.yml
mmikolajcz Sep 8, 2022
e26820e
Update windows.yml
mmikolajcz Sep 8, 2022
68102f9
Update linux.yml
mmikolajcz Sep 8, 2022
c24c5d1
Update windows.yml
mmikolajcz Sep 8, 2022
bbff8ed
Merge branch 'master' into enable_python3.10
mmikolajcz Sep 8, 2022
305dd05
Install python3.10
mmikolajcz Sep 8, 2022
5daa29b
Update windows.yml
mmikolajcz Sep 8, 2022
5ff1d68
Update windows.yml
mmikolajcz Sep 8, 2022
c90594f
Update windows.yml
mmikolajcz Sep 8, 2022
3535156
Update windows.yml
mmikolajcz Sep 8, 2022
84f3ebb
Update windows.yml
mmikolajcz Sep 8, 2022
ee06bb6
Update windows.yml
mmikolajcz Sep 8, 2022
10b44f2
Update windows.yml
mmikolajcz Sep 8, 2022
caa1acd
Update windows.yml
mmikolajcz Sep 8, 2022
eb5e489
Merge branch 'master' into pwysocki/enable_onnx1_12
p-wysocki Sep 9, 2022
98d9d49
Install py embedded
mmikolajcz Sep 9, 2022
b0b536c
Fix dir
mmikolajcz Sep 9, 2022
452eae3
Fix curl
mmikolajcz Sep 9, 2022
3b61c59
Add complete file
mmikolajcz Sep 9, 2022
c62b28d
CP file
mmikolajcz Sep 9, 2022
d2bc164
Bump py ver
mmikolajcz Sep 9, 2022
82cd7e9
Fix missing venv
mmikolajcz Sep 9, 2022
6914003
Try to install
mmikolajcz Sep 9, 2022
28f0acc
Disable venv
mmikolajcz Sep 9, 2022
7a79f65
Bump OMZ commit
p-wysocki Sep 12, 2022
27c4703
Merge branch 'pwysocki/enable_onnx1_12' of https://github.com/p-wysoc…
p-wysocki Sep 12, 2022
e16a3c5
checkout omz
p-wysocki Sep 12, 2022
8d3c34d
Revert omz
p-wysocki Sep 12, 2022
fbc34b4
Bump omz
p-wysocki Sep 12, 2022
7812931
Revert pybind bump
mmikolajcz Sep 12, 2022
93030ee
Update .gitmodules
mmikolajcz Sep 12, 2022
82197c0
Merge branch 'master' into enable_python3.10
mmikolajcz Sep 12, 2022
40ea771
Change pybind to fork
mmikolajcz Sep 12, 2022
56a1ba5
change ssize_t to size_t
mmikolajcz Sep 12, 2022
649719a
Install bz2 for py build
mmikolajcz Sep 12, 2022
6c5c39e
Bump omz
p-wysocki Sep 13, 2022
ee07eeb
Bump pandas requirement version
mmikolajcz Sep 13, 2022
809f73e
Revert omz
p-wysocki Sep 13, 2022
0358308
Merge branch 'master' into pwysocki/enable_onnx1_12
p-wysocki Sep 13, 2022
49055d4
Install missing clang
mmikolajcz Sep 13, 2022
3f81a01
Bump omz
p-wysocki Sep 13, 2022
5e49f3e
Merge branch 'pwysocki/enable_onnx1_12' of https://github.com/p-wysoc…
p-wysocki Sep 13, 2022
abbb13c
Bump versions on fork
mmikolajcz Sep 13, 2022
3316720
Bump numpy in model zoo
mmikolajcz Sep 13, 2022
7fed0e8
Merge branch 'openvinotoolkit:master' into enable_python3.10
p-wysocki Sep 14, 2022
3a52f45
Merge branch 'openvinotoolkit:master' into pwysocki/enable_onnx1_12
p-wysocki Sep 14, 2022
c445cc4
Fix clang
p-wysocki Sep 14, 2022
d5a19c5
Merge branch 'pwysocki/enable_onnx1_12' of https://github.com/p-wysoc…
mmikolajcz Sep 14, 2022
efc08c5
Skip segfaulting pdpd test
p-wysocki Sep 14, 2022
9d72e77
Skip another pdpd test
p-wysocki Sep 14, 2022
c6f2137
Skip pdpd places.cpp
p-wysocki Sep 14, 2022
bdfdb74
Bump py ver in setupvars.bat
mmikolajcz Sep 15, 2022
2504c38
Disable paddle tests
mmikolajcz Sep 15, 2022
84e7034
Merge branch 'enable_python3.10' of https://github.com/p-wysocki/open…
mmikolajcz Sep 15, 2022
148bafb
Use int instead of str
mmikolajcz Sep 15, 2022
b71ee4f
Fix requirements path
mmikolajcz Sep 15, 2022
acb611f
Enable lin-cc
p-wysocki Sep 16, 2022
db9a249
Fixes in CI
mmikolajcz Sep 16, 2022
7d7dec7
lin-cc and ngrpah-onnx changes
p-wysocki Sep 16, 2022
3149494
Merge branch 'enable_python3.10' of https://github.com/p-wysocki/open…
p-wysocki Sep 16, 2022
2cab833
Update num_proc
p-wysocki Sep 16, 2022
cc7afdc
Merge branch 'master' into enable_python3.10
p-wysocki Sep 16, 2022
23dff2f
Update ngraph-onnx
p-wysocki Sep 16, 2022
6167c6f
Minor change
p-wysocki Sep 16, 2022
e068bfe
Fix env var
p-wysocki Sep 16, 2022
51e5434
Change ubuntu to 20
p-wysocki Sep 16, 2022
fc34d7a
Get compiler on ngraph-onnx
p-wysocki Sep 16, 2022
e8d41d0
Add sudo to apt-get
p-wysocki Sep 16, 2022
5c06f44
Add SSL
p-wysocki Sep 16, 2022
86cd86d
Download ssl
p-wysocki Sep 16, 2022
540e924
Different way of installing ssl
p-wysocki Sep 16, 2022
7499d9c
Minor changes
p-wysocki Sep 16, 2022
446efc0
install zlib
p-wysocki Sep 16, 2022
02a92cc
Fix env var
p-wysocki Sep 16, 2022
4ddc5e5
Fix docker building error
p-wysocki Sep 16, 2022
67c8de4
Revert changes
p-wysocki Sep 16, 2022
9a783ac
Modify dockerfile
p-wysocki Sep 16, 2022
d594163
Merge branch 'master' into pwysocki/enable_onnx1_12
p-wysocki Sep 21, 2022
097169a
Merge branch 'master' into enable_python3.10
p-wysocki Sep 23, 2022
5f44d82
Merge remote-tracking branch 'upstream/master' into pwysocki/enable_o…
p-wysocki Sep 23, 2022
28ac103
Change pychecks python version
p-wysocki Sep 23, 2022
c504505
Cleanup
p-wysocki Sep 26, 2022
54526d4
Add LayerNorm to expanded ONNX functions
p-wysocki Oct 5, 2022
4741bbb
Revert previous commit
p-wysocki Oct 5, 2022
6e3ef10
Add LayerNorm to expanded ONNX functions
p-wysocki Oct 5, 2022
f0877b0
Merge branch 'pwysocki/enable_onnx1_12' of https://github.com/p-wysoc…
p-wysocki Oct 5, 2022
a3e2897
Apply clang
p-wysocki Oct 5, 2022
f49b257
Merge branch 'master' into pwysocki/enable_onnx1_12
p-wysocki Oct 7, 2022
94ad9ec
Merge remote-tracking branch 'upstream/master' into pwysocki/enable_o…
p-wysocki Oct 12, 2022
8e7f892
Merge remote-tracking branch 'upstream/master' into pwysocki/enable_o…
p-wysocki Oct 17, 2022
963c79b
Move LayerNorm tests to skip_segfault
p-wysocki Oct 18, 2022
1310718
Merge upstream, fix conflicts
p-wysocki Oct 18, 2022
f0ced34
Unskip pdpd tests
p-wysocki Oct 18, 2022
b9d7c85
Enable pdpd tests on linux
p-wysocki Oct 18, 2022
13ba9ba
Fix conflict
p-wysocki Oct 19, 2022
fb4eec8
Merge master
p-wysocki Oct 26, 2022
0f0515b
Refactoring
p-wysocki Oct 26, 2022
aa917d1
Remove 3.6 from reqs
p-wysocki Oct 26, 2022
7880557
Merge upstream
p-wysocki Oct 26, 2022
9e0a6e5
Refactoring
p-wysocki Oct 26, 2022
4a2ff42
Minor changes
p-wysocki Oct 26, 2022
175243c
Minor changes
p-wysocki Oct 26, 2022
70383ef
Relax MO reqs
p-wysocki Oct 26, 2022
b88499e
Bump torch version
p-wysocki Oct 27, 2022
9bc5587
Merge ONNX 1.12 PR
p-wysocki Oct 28, 2022
6e03658
Merge branch 'master' into enable_python3.10
p-wysocki Oct 28, 2022
057ac3f
relax pytest
p-wysocki Oct 31, 2022
d60849e
Merge branch 'enable_python3.10' of https://github.com/p-wysocki/open…
p-wysocki Oct 31, 2022
57cb716
Specify pytest version
p-wysocki Nov 1, 2022
d2d58f5
Fix pytest pip conflict
p-wysocki Nov 2, 2022
d3950f4
Bump pybind11 to v2.10.1 release tag
jiwaszki Nov 2, 2022
2ec10d7
Specify separate pytest version for py3.10
p-wysocki Nov 2, 2022
e79ef49
Bump attrs
p-wysocki Nov 2, 2022
1c6cf0c
Add py dependency
p-wysocki Nov 2, 2022
215ee7e
Merge branch 'master' into enable_python3.10
p-wysocki Nov 2, 2022
104dada
Refactor versions
p-wysocki Nov 3, 2022
a00909b
Add venv activation to tf tests
p-wysocki Nov 3, 2022
e1e9dbf
Fix fdupes
p-wysocki Nov 3, 2022
bc8d12d
Bump OMZ submodule
p-wysocki Nov 3, 2022
afc690e
Remove find and replace
p-wysocki Nov 3, 2022
43071a3
Change pybind to upstream fork
p-wysocki Nov 3, 2022
b8b8dc7
Set pybind to proper commit
p-wysocki Nov 3, 2022
7fc5d69
Merge remote-tracking branch 'upstream/master' into enable_python3.10
p-wysocki Nov 3, 2022
5617329
Minor changes
p-wysocki Nov 3, 2022
c37cf44
Merge remote-tracking branch 'upstream/master' into enable_python3.10
p-wysocki Nov 4, 2022
1337420
Try to fix scipy
p-wysocki Nov 4, 2022
c9a70f0
Merge remote-tracking branch 'upstream/master' into enable_python3.10
p-wysocki Nov 4, 2022
b19ed47
Updated exclude patterns for nlohmann json
ilya-lavrenov Nov 4, 2022
26c93c2
Merge remote-tracking branch 'ilya_lavrenov/nlohmann' into enable_pyt…
p-wysocki Nov 4, 2022
b28fa7d
[PyOV] Fix wheel requirements for new package versions
jiwaszki Nov 4, 2022
467315f
Merge remote-tracking branch 'upstream/master' into jiwaszki/fix_whee…
jiwaszki Nov 4, 2022
bdd2931
Merge remote-tracking branch 'jiwaszki/jiwaszki/fix_wheels_platform' …
p-wysocki Nov 4, 2022
26bf9ff
Merge branch 'master' into enable_python3.10
p-wysocki Nov 5, 2022
c2952c8
Merge branch 'master' into enable_python3.10
p-wysocki Nov 5, 2022
1b29f24
Merge remote-tracking branch 'upstream/master' into enable_python3.10
p-wysocki Nov 5, 2022
3e787de
Merge branch 'enable_python3.10' of https://github.com/p-wysocki/open…
p-wysocki Nov 5, 2022
09dd822
Merge master
p-wysocki Nov 6, 2022
5a05421
Specify CPU plugin versions
p-wysocki Nov 6, 2022
d55de6a
Bump OMZ version
p-wysocki Nov 7, 2022
33b1a08
Merge branch 'master' into enable_python3.10
p-wysocki Nov 7, 2022
1f27a29
Merge branch 'master' into enable_python3.10
p-wysocki Nov 7, 2022
e74bade
Merge branch 'master' into enable_python3.10
p-wysocki Nov 8, 2022
659eaab
Fix linter
p-wysocki Nov 8, 2022
ec037fb
Fix linter 2
p-wysocki Nov 8, 2022
678275f
Fix linter 3
p-wysocki Nov 8, 2022
d7dd13f
Disable linter
p-wysocki Nov 8, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .ci/azure/android_arm64.yml
Expand Up @@ -63,6 +63,9 @@ jobs:
curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
whoami
uname -a
echo ls /usr/bin/python3.10
rm -rf /usr/bin/python3
sudo ln -s /usr/bin/python3.10 /usr/bin/python3
echo Python3 info ; which python3 ; python3 --version
echo Python info ; which python ; python --version
echo Java info ; which java ; java -version
Expand Down
55 changes: 39 additions & 16 deletions .ci/azure/linux.yml
Expand Up @@ -62,7 +62,7 @@ jobs:
CMAKE_CPACK_GENERATOR:
SAMPLES_INSTALL_DIR: $(INSTALL_DIR)/samples
PYTHON_SAMPLES_INSTALL_DIR: $(SAMPLES_INSTALL_DIR)/python
RUN_PREFIX: . $(SETUPVARS) -pyver 3.8 &&
RUN_PREFIX: . $(SETUPVARS) -pyver 3.10 &&
maxParallel: 2

# About 150% of total time
Expand Down Expand Up @@ -91,14 +91,17 @@ jobs:
TMP_DIR: /mnt/tmp
SHARE_DIR: /mount/cinfsshare/onnxtestdata
CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux
BUILD_PYTHON: $(WORK_DIR)/build_python
INSTALL_PYTHON: $(INSTALL_OPENVINO)/extras/python
PY_VENV: $(WORK_DIR)/.venv
PYTHON_VERSION: 3.10.7

steps:
- script: |
curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
whoami
uname -a
echo Python3 info ; which python3 ; python3 --version
echo Python info ; which python ; python --version
echo Java info ; which java ; java -version
echo gcc info ; which gcc ; gcc --version
echo cmake info ; which cmake ; cmake --version
Expand Down Expand Up @@ -144,8 +147,21 @@ jobs:
$(REPO_DIR)/install_build_dependencies.sh
# Move jdk into contrib
# 'clang' compiler is to check that samples can be built using it
sudo apt --assume-yes install openjdk-11-jdk clang
sudo apt --assume-yes install openjdk-11-jdk libbz2-dev clang
# For opencv-python: python3-setuptools and pip upgrade
wget https://www.python.org/ftp/python/"$PYTHON_VERSION"/Python-"$PYTHON_VERSION".tgz
tar -xzf Python-"$PYTHON_VERSION".tgz
cd Python-"$PYTHON_VERSION" || exit
./configure --enable-optimizations --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib"
ilya-lavrenov marked this conversation as resolved.
Show resolved Hide resolved
make python
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Avoiding building Python from source is being discussed in ticket 92189. It can be done later.

sudo make install
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
/usr/local/bin/python3.10 -m venv $(PY_VENV)
. $(PY_VENV)/bin/activate
echo Python3 info ; which python3 ; python3 --version
python3 --version
python3.10 --version
curl https://bootstrap.pypa.io/get-pip.py | python3
Copy link
Contributor

Choose a reason for hiding this comment

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

why do we need all of this? can we just switch azure on U22? where python 3.10 is default

Copy link
Contributor Author

Choose a reason for hiding this comment

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

AFAIK U22 support is not ready yet, we wanted to avoid debugging issues originating from two different sources at once - enabling new OS and a new Python version. We will switch Azure to U22 as soon as possible.

python3 -m pip install --upgrade pip
python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt
python3 -m pip install -r $(REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt
Expand Down Expand Up @@ -185,7 +201,7 @@ jobs:
-DENABLE_PYTHON=ON
-DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS)
-DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS)
-DPYTHON_EXECUTABLE=/usr/bin/python3.8
-DPYTHON_EXECUTABLE=$(PY_VENV)/bin/python3.10
-DENABLE_TESTS=ON
-DENABLE_OV_ONNX_FRONTEND=ON
-DENABLE_FASTER_BUILD=ON
Expand Down Expand Up @@ -225,8 +241,8 @@ jobs:
inputs:
cmakeArgs: >
-GNinja
-S $(REPO_DIR)/tests/layer_tests
-B $(BUILD_LAYER_TESTS_DIR)
$(REPO_DIR)/tests/layer_tests
workingDirectory: $(BUILD_LAYER_TESTS_DIR)

- script: ninja -C $(BUILD_LAYER_TESTS_DIR)
displayName: 'Build Layer Tests'
Expand All @@ -235,26 +251,24 @@ jobs:
displayName: 'Remove debian dependencies'
condition: eq(variables['CMAKE_CPACK_GENERATOR'], 'DEB')
continueOnError: false

- script: cmake -DCOMPONENT=python_wheels -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_DIR)/cmake_install.cmake
displayName: 'Install wheel packages'

- script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_LAYER_TESTS_DIR)/cmake_install.cmake
displayName: 'Install Layer Tests'

- script: python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools
- script: |
. $(PY_VENV)/bin/activate
python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools
displayName: 'Install python wheels'

- script: |
set -e
cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P $(BUILD_DIR)/cmake_install.cmake
displayName: 'Install tests'

- script: ls -alR $(INSTALL_DIR)
displayName: 'List install test files'

# Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time
- script: |
. $(PY_VENV)/bin/activate
export DATA_PATH=$(MODELS_PATH)
export MODELS_PATH=$(MODELS_PATH)
# because of static build libgna is needed for python binary
Expand All @@ -268,6 +282,7 @@ jobs:

# Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time
- script: |
. $(PY_VENV)/bin/activate
export DATA_PATH=$(MODELS_PATH)
export MODELS_PATH=$(MODELS_PATH)
# because of static build libgna is needed for python binary and mock_py frontend library
Expand All @@ -285,6 +300,7 @@ jobs:
continueOnError: false

- script: |
. $(PY_VENV)/bin/activate
# because of static build libgna is needed for python binary
export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1815.1/linux/x64:$LD_LIBRARY_PATH
python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml
Expand Down Expand Up @@ -434,17 +450,23 @@ jobs:
inputs:
cmakeArgs: >
-GNinja
-S $(REPO_DIR)/tests/samples_tests
-B $(BUILD_SAMPLES_TESTS_DIR)
$(REPO_DIR)/tests/samples_tests
workingDirectory: $(BUILD_SAMPLES_TESTS_DIR)

- script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_SAMPLES_TESTS_DIR)/cmake_install.cmake
- script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
workingDirectory: $(BUILD_SAMPLES_TESTS_DIR)
displayName: 'Install Samples Tests'

- script: python3 -m pip install -r $(INSTALL_TEST_DIR)/smoke_tests/requirements.txt
- script: |
. $(PY_VENV)/bin/activate
python3 -m pip install -r $(INSTALL_TEST_DIR)/smoke_tests/requirements.txt
workingDirectory: $(INSTALL_TEST_DIR)

displayName: 'Install dependencies for samples smoke tests'
continueOnError: false

- script: |
. $(PY_VENV)/bin/activate
export PATH=$HOME/.local/bin:$PATH
export IE_APP_PATH=$(INSTALL_DIR)/samples_bin
export LD_LIBRARY_PATH=$IE_APP_PATH:$LD_LIBRARY_PATH
Expand All @@ -456,6 +478,7 @@ jobs:
continueOnError: false

- script: |
. $(PY_VENV)/bin/activate
python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt
export PYTHONPATH=$(REPO_DIR)/tools/mo/:$(LAYER_TESTS_DIR):$PYTHONPATH
export OV_FRONTEND_PATH=$(INSTALL_DIR)/runtime/lib/intel64
Expand Down
25 changes: 15 additions & 10 deletions .ci/azure/linux_arm64.yml
Expand Up @@ -46,8 +46,8 @@ jobs:
system.debug: true
VSTS_HTTP_RETRY: 5
VSTS_HTTP_TIMEOUT: 200
PYTHON_ARM_VERSION: "3.8.12"
PYTHON_EXEC: "python3.8"
PYTHON_ARM_VERSION: "3.10.6"
PYTHON_EXEC: "python3.10"
OPENVINO_ARCH: 'aarch64'
NUM_PROC: 1
BUILD_TYPE: Release
Expand Down Expand Up @@ -79,7 +79,9 @@ jobs:
curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
whoami
uname -a
echo Python3 info ; which python3 ; python3 --version
echo ls /usr/bin/python3.10
rm -rf /usr/bin/python3
sudo ln -s /usr/bin/python3.10 /usr/bin/python3 echo Python3 info ; which python3 ; python3 --version
echo Python info ; which python ; python --version
echo Java info ; which java ; java -version
echo gcc info ; which gcc ; gcc --version
Expand Down Expand Up @@ -146,6 +148,9 @@ jobs:
export OPENCV_REPO_DIR=$(OPENCV_REPO_DIR)
export BUILD_OPENCV=$(BUILD_OPENCV)
export INSTALL_OPENVINO=$(INSTALL_OPENVINO)
sed -i 's;make -j "$NUM_PROC" python Parser/pgen;make -j "$NUM_PROC" python;' $(OPENVINO_CONTRIB_REPO_DIR)/modules/arm_plugin/scripts/install_build_dependencies.sh
sed -i 's;cp -r Parser/pgen "$BUILD_PYTHON";;' $(OPENVINO_CONTRIB_REPO_DIR)/modules/arm_plugin/scripts/install_build_dependencies.sh
sed -i 's; HOSTPGEN="$BUILD_PYTHON"/Parser/pgen;;' $(OPENVINO_CONTRIB_REPO_DIR)/modules/arm_plugin/scripts/install_build_dependencies.sh
$(OPENVINO_CONTRIB_REPO_DIR)/modules/arm_plugin/scripts/install_build_dependencies.sh
workingDirectory: $(BUILD_OPENVINO)
displayName: 'Install dependencies'
Expand All @@ -158,8 +163,8 @@ jobs:
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF
-DOpenCV_DIR=$(INSTALL_OPENCV)/cmake
-DPYTHON_INCLUDE_DIRS=$(INSTALL_PYTHON)/include/python3.8
-DPYTHON_LIBRARY=$(INSTALL_PYTHON)/lib/libpython3.8.so
-DPYTHON_INCLUDE_DIRS=$(INSTALL_PYTHON)/include/python3.10
-DPYTHON_LIBRARY=$(INSTALL_PYTHON)/lib/libpython3.10.so
-DENABLE_PYTHON=ON
-DPYTHON_MODULE_EXTENSION=".so"
-DENABLE_TESTS=ON
Expand Down Expand Up @@ -204,10 +209,10 @@ jobs:
-DOpenVINODeveloperPackage_DIR=$(BUILD_OPENVINO)
-DENABLE_PYTHON=ON
-DTHREADING=TBB
-DPYTHON_EXECUTABLE=$(INSTALL_PYTHON)/bin/python3.8
-DPYTHON_INCLUDE_DIRS=$(INSTALL_PYTHON)/include/python3.8
-DPYTHON_EXECUTABLE=$(INSTALL_PYTHON)/bin/python3.10
-DPYTHON_INCLUDE_DIRS=$(INSTALL_PYTHON)/include/python3.10
-DPYTHON_LIBRARIES=$(INSTALL_PYTHON)/lib
-DPYTHON3_NUMPY_INCLUDE_DIRS=/usr/local/lib/python3.8/site-packages/numpy/core/include
-DPYTHON3_NUMPY_INCLUDE_DIRS=/usr/local/lib/python3.10/site-packages/numpy/core/include
-DPYTHON_MODULE_EXTENSION=".so"
-DPYBIND11_FINDPYTHON=OFF
-DPYBIND11_NOPYTHON=OFF
Expand Down Expand Up @@ -245,8 +250,8 @@ jobs:
-GNinja
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-DENABLE_PYTHON=ON
-DPYTHON_EXECUTABLE=/usr/local/bin/python3.8
-DPYTHON_INCLUDE_DIR=$(INSTALL_PYTHON)/include/python3.8
-DPYTHON_EXECUTABLE=/usr/local/bin/python3.10
-DPYTHON_INCLUDE_DIR=$(INSTALL_PYTHON)/include/python3.10
-DPYTHON_LIBRARY=$(INSTALL_PYTHON)/lib
-DCMAKE_TOOLCHAIN_FILE=$(OPENVINO_REPO_DIR)/cmake/arm64.toolchain.cmake
-DOpenVINO_DIR=$(BUILD_OPENVINO)
Expand Down
14 changes: 14 additions & 0 deletions .ci/azure/linux_conditional_compilation.yml
Expand Up @@ -79,6 +79,19 @@ jobs:
- script: |
set -e
$(REPO_DIR)/install_build_dependencies.sh
wget https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tgz
tar -xzf Python-3.10.6.tgz
cd Python-3.10.6 || exit
./configure --enable-optimizations --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib"
make -j 1 python
sudo make -j 1 install
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
/usr/local/bin/python3.10 -m venv $(WORK_DIR)/.venv
. $(WORK_DIR)/.venv/bin/activate
echo Python3 info ; which python3 ; python3 --version
python3 --version
python3.10 --version
curl https://bootstrap.pypa.io/get-pip.py | python3
python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt
# Speed up build
wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
Expand All @@ -97,6 +110,7 @@ jobs:
-DENABLE_FASTER_BUILD=ON
-DENABLE_PROFILING_ITT=ON
-DSELECTIVE_BUILD=COLLECT
-DPYTHON_EXECUTABLE=$(WORK_DIR)/.venv/bin/python3.10
$(REPO_DIR)
workingDirectory: $(BUILD_DIR)

Expand Down
3 changes: 3 additions & 0 deletions .ci/azure/linux_coverity.yml
Expand Up @@ -35,6 +35,9 @@ jobs:
curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
whoami
uname -a
echo ls /usr/bin/python3.10
rm -rf /usr/bin/python3
sudo ln -s /usr/bin/python3.10 /usr/bin/python3
echo Python3 info ; which python3 ; python3 --version
echo Python info ; which python ; python --version
echo Java info ; which java ; java -version
Expand Down
24 changes: 22 additions & 2 deletions .ci/azure/linux_ngraph_onnx.yml
Expand Up @@ -80,6 +80,7 @@ jobs:
rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
sudo mkdir -p $(MODELS_DIR)
sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common
sudo apt install nfs-common -y
sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(MODELS_DIR) -o vers=4,minorversion=1,sec=sys
mkdir -p $(MODELS_DIR)/models_data
displayName: 'Make dirs'
Expand All @@ -92,17 +93,36 @@ jobs:

- script: |
set -e
apt-get update && apt-get install -y lsb-release && apt-get clean all
sudo apt-get -y install libssl-dev zlib1g-dev
sudo apt-get -y install build-essential
wget https://www.python.org/ftp/python/3.10.7/Python-3.10.7.tgz
tar -xzf Python-3.10.7.tgz
cd Python-3.10.7 || exit
./configure --enable-optimizations --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib"
make python
sudo make install
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
/usr/local/bin/python3.10 -m venv $(WORK_DIR)/.venv
. $(WORK_DIR)/.venv/bin/activate
echo Python3 info ; which python3 ; python3 --version
python3 --version
python3.10 --version
curl https://bootstrap.pypa.io/get-pip.py | python3
sudo apt --assume-yes install git-lfs uidmap
curl -fsSL https://get.docker.com -o get-docker.sh
sudo sh get-docker.sh
workingDirectory: $(WORK_DIR)
displayName: 'Install dependencies'

- script: src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)"
- script:
. $(WORK_DIR)/.venv/bin/activate
src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)"
displayName: 'Update models'
condition: ne(variables['BUILD_TYPE'], 'Debug')

- script: sudo docker build --tag=openvino-onnx-ci-image --file=.ci/openvino-onnx/Dockerfile --build-arg BUILD_TYPE=$(BUILD_TYPE) --build-arg PROTOBUF_LITE=$(PROTOBUF_LITE) .
- script:
sudo docker build --tag=openvino-onnx-ci-image --file=.ci/openvino-onnx/Dockerfile --build-arg BUILD_TYPE=$(BUILD_TYPE) --build-arg PROTOBUF_LITE=$(PROTOBUF_LITE) .
displayName: 'Docker build $(BUILD_TYPE)'

- script: sudo fallocate -l 64G /swapfile ; sudo mkswap /swapfile ; sudo swapon /swapfile ; df ; free -h
Expand Down