Skip to content

Commit ff7bd35

Browse files
Alexander Zhogovandrei-cv
Alexander Zhogov
authored andcommitted
Azure CI: Move Linux check to Ubuntu 20.04 (openvinotoolkit#6907)
* Azure CI: Move Linux check to Ubuntu 20.04 * Fix onnx * Fix onnx docker install * add dockerd-rootless-setuptool.sh install * add uidmap * sudo docker
1 parent 3524d02 commit ff7bd35

6 files changed

+34
-29
lines changed

.ci/azure/linux.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
system.debug: true
2323
VSTS_HTTP_RETRY: 5
2424
VSTS_HTTP_TIMEOUT: 200
25-
WORKERS_NUMBER: 16
2625
BUILD_TYPE: Release
2726
REPO_DIR: $(Build.Repository.LocalPath)
2827
OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
@@ -93,7 +92,7 @@ jobs:
9392
python3 -m pip install -r $(REPO_DIR)/model-optimizer/requirements.txt
9493
python3 -m pip install -r $(REPO_DIR)/model-optimizer/requirements_dev.txt
9594
# Speed up build
96-
wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
95+
wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
9796
unzip ninja-linux.zip
9897
sudo cp -v ninja /usr/local/bin/
9998
# Speed up tests
@@ -179,7 +178,7 @@ jobs:
179178
displayName: 'nGraph UT'
180179
continueOnError: false
181180
182-
# . $(SETUPVARS) && python3 $(WORK_DIR)/gtest-parallel/gtest_parallel.py $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=InferenceEngineUnitTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
181+
# . $(SETUPVARS) && python3 $(WORK_DIR)/gtest-parallel/gtest_parallel.py $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --workers=16 --dump_json_test_results=InferenceEngineUnitTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
183182
- script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:TEST-InferenceEngineUnitTests.xml
184183
displayName: 'IE UT old'
185184
continueOnError: false

.ci/azure/linux_conditional_compilation.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@ jobs:
44
timeoutInMinutes: 90
55

66
pool:
7-
name: LIN_VMSS_VENV_F16S_WU2
7+
name: LIN_VMSS_VENV_F16S_U20_WU2
88

99
variables:
1010
system.debug: true
1111
VSTS_HTTP_RETRY: 5
1212
VSTS_HTTP_TIMEOUT: 200
13-
WORKERS_NUMBER: 16
1413
BUILD_TYPE: Release
1514
REPO_DIR: $(Build.Repository.LocalPath)
1615
OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
1716
MODELS_PATH: $(REPO_DIR)/../testdata
1817
WORK_DIR: $(Pipeline.Workspace)/_w
1918
BUILD_DIR: $(WORK_DIR)/build
20-
BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
2119
INSTALL_DIR: $(WORK_DIR)/install_pkg
2220
SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
2321

@@ -30,6 +28,7 @@ jobs:
3028
echo Python info ; which python ; python --version
3129
echo Java info ; which java ; java -version
3230
echo gcc info ; which gcc ; gcc --version
31+
echo cmake info ; which cmake ; cmake --version
3332
lsb_release
3433
env
3534
cat /proc/cpuinfo
@@ -53,10 +52,11 @@ jobs:
5352
path: openvino
5453

5554
- script: |
56-
sudo apt --assume-yes install libusb-1.0-0-dev
55+
set -e
56+
$(REPO_DIR)/install_build_dependencies.sh
5757
python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/requirements.txt
5858
# Speed up build
59-
wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
59+
wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
6060
unzip ninja-linux.zip
6161
sudo cp -v ninja /usr/local/bin/
6262
workingDirectory: $(WORK_DIR)
@@ -76,12 +76,14 @@ jobs:
7676

7777
- script: ninja
7878
workingDirectory: $(BUILD_DIR)
79-
displayName: 'Build'
79+
displayName: 'Build LinCC'
8080

8181
- script: ls -alR $(REPO_DIR)/bin/
82-
displayName: 'List files'
82+
displayName: 'List bin files'
8383

8484
- script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
8585
workingDirectory: $(BUILD_DIR)
8686
displayName: 'Install'
8787

88+
- script: ls -alR $(INSTALL_DIR)
89+
displayName: 'List install files'

.ci/azure/linux_ngraph_onnx.yml

+13-6
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ jobs:
2020
timeoutInMinutes: 90
2121

2222
pool:
23-
name: LIN_VMSS_VENV_ONNX_WU2
23+
name: LIN_VMSS_VENV_ONNX_U20_WU2
2424

2525
variables:
2626
system.debug: true
2727
VSTS_HTTP_RETRY: 5
2828
VSTS_HTTP_TIMEOUT: 200
29-
WORKERS_NUMBER: 8
3029
REPO_DIR: $(Build.Repository.LocalPath)
3130
WORK_DIR: $(Pipeline.Workspace)/_w
3231
MODELS_DIR: /mount/cinfsshare/onnxtestdata
@@ -43,6 +42,7 @@ jobs:
4342
echo Python info ; which python ; python --version
4443
echo Java info ; which java ; java -version
4544
echo gcc info ; which gcc ; gcc --version
45+
echo cmake info ; which cmake ; cmake --version
4646
lsb_release
4747
env
4848
cat /proc/cpuinfo
@@ -68,16 +68,23 @@ jobs:
6868
submodules: recursive
6969
path: openvino
7070

71-
- script: docker build --tag=openvino-onnx-ci-image --file=.ci/openvino-onnx/Dockerfile --build-arg BUILD_TYPE=$(BUILD_TYPE) --build-arg PROTOBUF_LITE=$(PROTOBUF_LITE) .
71+
- script: |
72+
set -e
73+
sudo apt --assume-yes install git-lfs uidmap
74+
curl -fsSL https://get.docker.com -o get-docker.sh
75+
sudo sh get-docker.sh
76+
workingDirectory: $(WORK_DIR)
77+
displayName: 'Install dependencies'
78+
79+
- 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) .
7280
displayName: 'Docker build $(BUILD_TYPE) protobuf-lite: $(PROTOBUF_LITE)'
7381

7482
- script: ngraph/python/tests/test_onnx/model_zoo_preprocess.sh -d $(TMP_DIR) -o -s "$(ONNX_MODEL_ZOO_SHA)"
7583
displayName: 'Get models'
7684
condition: ne(variables['BUILD_TYPE'], 'Debug')
7785

78-
- script: sudo fallocate -l 48G /swapfile ; sudo mkswap /swapfile ; sudo swapon /swapfile ; df ; free -h
86+
- script: sudo fallocate -l 64G /swapfile ; sudo mkswap /swapfile ; sudo swapon /swapfile ; df ; free -h
7987
displayName: 'Create swap'
8088

81-
- script: |
82-
docker run --name openvino-onnx-ci-container --volume $(TMP_DIR)/model_zoo/onnx_model_zoo_$(ONNX_MODEL_ZOO_SHA):/root/.onnx/model_zoo/onnx_model_zoo --volume $(MODELS_DIR)/msft:/root/.onnx/model_zoo/MSFT openvino-onnx-ci-image /bin/bash -c "$(TOX_COMMAND)"
89+
- script: sudo docker run --name openvino-onnx-ci-container --volume $(TMP_DIR)/model_zoo/onnx_model_zoo_$(ONNX_MODEL_ZOO_SHA):/root/.onnx/model_zoo/onnx_model_zoo --volume $(MODELS_DIR)/msft:/root/.onnx/model_zoo/MSFT openvino-onnx-ci-image /bin/bash -c "$(TOX_COMMAND)"
8390
displayName: 'Docker run $(BUILD_TYPE) protobuf-lite: $(PROTOBUF_LITE)'

.ci/azure/linux_onnxruntime.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ jobs:
33
timeoutInMinutes: 90
44

55
pool:
6-
name: LIN_VMSS_VENV_ONNX_WU2
6+
name: LIN_VMSS_VENV_ONNX_U20_WU2
77

88
variables:
99
system.debug: true
1010
VSTS_HTTP_RETRY: 5
1111
VSTS_HTTP_TIMEOUT: 200
12-
WORKERS_NUMBER: 8
1312
BUILD_TYPE: Release
1413
REPO_DIR: $(Build.Repository.LocalPath)
1514
ONNXRUNTIME_REPO_DIR: $(REPO_DIR)/../onnxruntime
@@ -20,6 +19,7 @@ jobs:
2019
BUILD_DIR: $(WORK_DIR)/build
2120
ONNXRUNTIME_UTILS: $(REPO_DIR)/.ci/azure/ci_utils/onnxruntime
2221
ONNXRUNTIME_BUILD_DIR: $(ONNXRUNTIME_REPO_DIR)/build
22+
2323
steps:
2424
- script: |
2525
curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
@@ -61,15 +61,14 @@ jobs:
6161
displayName: 'Clone onnxruntime'
6262
6363
- script: |
64-
sudo apt --assume-yes install libusb-1.0-0-dev
65-
# For opencv-python: setuptools and upgrade
66-
sudo apt-get install python3-setuptools
64+
set -e
65+
$(REPO_DIR)/install_build_dependencies.sh
6766
python3 -m pip install --upgrade pip
6867
python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/requirements.txt
6968
# For running Python API tests
7069
python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/src/requirements-dev.txt
7170
# Speed up build
72-
wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
71+
wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
7372
unzip ninja-linux.zip
7473
sudo cp -v ninja /usr/local/bin/
7574
# Speed up tests
@@ -84,7 +83,7 @@ jobs:
8483
-GNinja
8584
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
8685
-DENABLE_PYTHON=ON
87-
-DPYTHON_EXECUTABLE=/usr/bin/python3.6
86+
-DPYTHON_EXECUTABLE=/usr/bin/python3.8
8887
-DENABLE_VPU=OFF
8988
-DENABLE_GNA=OFF
9089
-DENABLE_OPENCV=OFF
@@ -103,10 +102,10 @@ jobs:
103102

104103
- script: ninja
105104
workingDirectory: $(BUILD_DIR)
106-
displayName: 'Build Lin'
105+
displayName: 'Build Lin ONNX'
107106

108107
- script: ls -alR $(REPO_DIR)/bin/
109-
displayName: 'List files'
108+
displayName: 'List bin files'
110109

111110
- script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
112111
workingDirectory: $(BUILD_DIR)
@@ -116,7 +115,7 @@ jobs:
116115
source $(INSTALL_DIR)/bin/setupvars.sh
117116
CXXFLAGS="-Wno-error=deprecated-declarations" ./build.sh --config RelWithDebInfo --use_openvino CPU_FP32 --build_shared_lib --parallel --skip_tests --build_dir $(ONNXRUNTIME_BUILD_DIR)
118117
workingDirectory: $(ONNXRUNTIME_REPO_DIR)
119-
displayName: 'Build ONNX Runtime'
118+
displayName: 'Build Lin ONNX Runtime'
120119
121120
- script: |
122121
source $(INSTALL_DIR)/bin/setupvars.sh

.ci/azure/mac.yml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
system.debug: true
2323
VSTS_HTTP_RETRY: 5
2424
VSTS_HTTP_TIMEOUT: 200
25-
WORKERS_NUMBER: 3
2625
BUILD_TYPE: Release
2726
REPO_DIR: $(Build.Repository.LocalPath)
2827
OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib

.ci/azure/windows.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
system.debug: true
2323
VSTS_HTTP_RETRY: 5
2424
VSTS_HTTP_TIMEOUT: 200
25-
WORKERS_NUMBER: 8
2625
BUILD_TYPE: Release
2726
REPO_DIR: $(Build.Repository.LocalPath)
2827
OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)\..\openvino_contrib
@@ -94,7 +93,7 @@ jobs:
9493
python -m pip install -r $(REPO_DIR)\model-optimizer\requirements.txt
9594
python -m pip install -r $(REPO_DIR)\model-optimizer\requirements_dev.txt
9695
rem Speed up build
97-
certutil -urlcache -split -f https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip ninja-win.zip
96+
certutil -urlcache -split -f https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip ninja-win.zip
9897
powershell -command "Expand-Archive -Force ninja-win.zip"
9998
git clone https://github.com/google/gtest-parallel.git
10099
workingDirectory: $(WORK_DIR)

0 commit comments

Comments
 (0)