diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 78c697f22c7..11d03c5ffcb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,6 +6,7 @@ jobs: #vmImage: 'ubuntu-18.04' name: LIN_VMSS_VENV_F8S_WU2 variables: + WORKERS_NUMBER: 8 BUILD_TYPE: Release BIN_DIR: ../bin/intel64/$(BUILD_TYPE) steps: @@ -13,6 +14,7 @@ jobs: whoami uname -a which python3 + python3 --version gcc --version lsb_release env @@ -32,7 +34,7 @@ jobs: unzip ninja-linux.zip sudo cp -v ninja /usr/local/bin/ displayName: 'Install Ninja' - - script: git submodule update --init --recursive --jobs 8 + - script: git submodule update --init --recursive --jobs $(WORKERS_NUMBER) displayName: 'Clone submodules' - script: | mkdir dldt-build @@ -53,7 +55,7 @@ jobs: workingDirectory: dldt-build displayName: 'nGraph UT' continueOnError: false - - script: $(BIN_DIR)/InferenceEngineUnitTests + - script: $(BIN_DIR)/InferenceEngineUnitTests --gtest_print_time=1 workingDirectory: dldt-build displayName: 'IE UT old' continueOnError: false @@ -77,7 +79,7 @@ jobs: workingDirectory: dldt-build displayName: 'IE FuncTests' continueOnError: false - - script: $(BIN_DIR)/cpuFuncTests + - script: $(BIN_DIR)/cpuFuncTests --gtest_print_time=1 workingDirectory: dldt-build displayName: 'CPU FuncTests' continueOnError: false @@ -85,12 +87,14 @@ jobs: workingDirectory: dldt-build displayName: 'MklDnnBehaviorTests' continueOnError: false - - script: git clone https://github.com/openvinotoolkit/testdata.git - displayName: 'Clone testdata' + - script: | + git clone https://github.com/openvinotoolkit/testdata.git + git clone https://github.com/google/gtest-parallel.git + displayName: 'Clone testdata & gtest-parallel' - script: | export DATA_PATH=`pwd`/../testdata export MODELS_PATH=`pwd`/../testdata - $(BIN_DIR)/MklDnnFunctionalTests --gtest_filter=*smoke*:-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* + python3 ../gtest-parallel/gtest-parallel $(BIN_DIR)/MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --print_test_times --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* -- --gtest_print_time=1 workingDirectory: dldt-build displayName: 'MklDnnFunctionalTests' continueOnError: false @@ -120,6 +124,7 @@ jobs: pool: vmImage: 'macOS-10.15' variables: + WORKERS_NUMBER: 3 BUILD_TYPE: Release BIN_DIR: ../bin/intel64/$(BUILD_TYPE) steps: @@ -130,6 +135,7 @@ jobs: whoami uname -a which python3 + python3 --version gcc --version xcrun --sdk macosx --show-sdk-version env @@ -141,7 +147,7 @@ jobs: displayName: 'Install dependencies' - script: brew install ninja displayName: 'Install Ninja' - - script: git submodule update --init --recursive --jobs 8 + - script: git submodule update --init --recursive --jobs $(WORKERS_NUMBER) displayName: 'Clone submodules' - script: | mkdir dldt-build @@ -167,7 +173,7 @@ jobs: workingDirectory: dldt-build displayName: 'nGraph UT' continueOnError: false - - script: $(BIN_DIR)/InferenceEngineUnitTests + - script: $(BIN_DIR)/InferenceEngineUnitTests --gtest_print_time=1 workingDirectory: dldt-build displayName: 'IE UT old' continueOnError: false @@ -187,7 +193,7 @@ jobs: workingDirectory: dldt-build displayName: 'IE FuncTests' continueOnError: false - - script: $(BIN_DIR)/cpuFuncTests + - script: $(BIN_DIR)/cpuFuncTests --gtest_print_time=1 workingDirectory: dldt-build displayName: 'CPU FuncTests' continueOnError: false @@ -195,12 +201,14 @@ jobs: workingDirectory: dldt-build displayName: 'MklDnnBehaviorTests' continueOnError: false - - script: git clone https://github.com/openvinotoolkit/testdata.git - displayName: 'Clone testdata' + - script: | + git clone https://github.com/openvinotoolkit/testdata.git + git clone https://github.com/google/gtest-parallel.git + displayName: 'Clone testdata & gtest-parallel' - script: | export DATA_PATH=`pwd`/../testdata export MODELS_PATH=`pwd`/../testdata - $(BIN_DIR)/MklDnnFunctionalTests --gtest_filter=*smoke*:-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* + python3 ../gtest-parallel/gtest-parallel $(BIN_DIR)/MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --print_test_times --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* -- --gtest_print_time=1 workingDirectory: dldt-build displayName: 'MklDnnFunctionalTests' continueOnError: false @@ -219,6 +227,7 @@ jobs: #vmImage: 'vs2017-win2016' name: WIN_VMSS_VENV_F8S_WU2 variables: + WORKERS_NUMBER: 8 BUILD_TYPE: Release BUILD_DIR: D:\dldt-build BIN_DIR: ..\bin\intel64 @@ -227,6 +236,8 @@ jobs: steps: - script: | where python3 + where python + python --version wmic computersystem get TotalPhysicalMemory wmic cpu list wmic logicaldisk get description,name @@ -237,7 +248,7 @@ jobs: certutil -urlcache -split -f https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip ninja-win.zip powershell -command "Expand-Archive -Force ninja-win.zip" displayName: Install Ninja - - script: git submodule update --init --recursive --jobs 8 + - script: git submodule update --init --recursive --jobs $(WORKERS_NUMBER) displayName: 'Clone submodules' - script: | rd /Q /S $(BUILD_DIR) @@ -266,7 +277,7 @@ jobs: continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% - $(BIN_DIR)\InferenceEngineUnitTests + $(BIN_DIR)\InferenceEngineUnitTests --gtest_print_time=1 workingDirectory: dldt-build displayName: 'IE UT old' continueOnError: false @@ -302,7 +313,7 @@ jobs: continueOnError: false - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;%PATH% - $(BIN_DIR)\cpuFuncTests + $(BIN_DIR)\cpuFuncTests --gtest_print_time=1 workingDirectory: dldt-build displayName: 'CPU FuncTests' continueOnError: false @@ -312,14 +323,18 @@ jobs: workingDirectory: dldt-build displayName: 'MklDnnBehaviorTests' continueOnError: false - - script: git clone https://github.com/openvinotoolkit/testdata.git + - script: | + git clone https://github.com/openvinotoolkit/testdata.git + git clone https://github.com/google/gtest-parallel.git workingDirectory: $(BUILD_DIR) - displayName: 'Clone testdata' + displayName: 'Clone testdata & gtest-parallel' + # Add for gtest-parallel, it hangs now (CVS-33386) + #python $(BUILD_DIR)\gtest-parallel\gtest-parallel $(BIN_DIR)\MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --print_test_times --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* -- --gtest_print_time=1 - script: | set PATH=$(Build.Repository.LocalPath)\inference-engine\temp\tbb\bin;$(Build.Repository.LocalPath)\inference-engine\temp\opencv_4.3.0\opencv\bin;%PATH% set DATA_PATH=$(BUILD_DIR)\testdata set MODELS_PATH=$(BUILD_DIR)\testdata - $(BIN_DIR)\MklDnnFunctionalTests --gtest_filter=*smoke*:-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* + $(BIN_DIR)\MklDnnFunctionalTests --gtest_print_time=1 --gtest_filter=-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* workingDirectory: dldt-build displayName: 'MklDnnFunctionalTests' continueOnError: false