From 8839c66ea6a4cc2d52c01298cd23e2db3cd05d41 Mon Sep 17 00:00:00 2001 From: jmiaskox Date: Wed, 15 Feb 2023 13:00:34 +0100 Subject: [PATCH] [AzurePipeline] Revert changes for openvino-lin-debian related to setupPython3.10 due to nGraph problem (#15728) * Add env to nGraph step * Update windows_conditional_compilation.yml * Add PYTHONPATH to nGraph step * Revert all changes related with setupPython 3.10 for Linux_debian Temporary disable on time investigate --- .ci/azure/linux_debian.yml | 23 ++----------------- .ci/azure/windows_conditional_compilation.yml | 1 + 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.ci/azure/linux_debian.yml b/.ci/azure/linux_debian.yml index bc9a883c26b..f05f5c4596e 100644 --- a/.ci/azure/linux_debian.yml +++ b/.ci/azure/linux_debian.yml @@ -36,9 +36,6 @@ resources: name: openvinotoolkit/testdata ref: master -variables: - - group: github - jobs: - job: Lin_Debian # About 150% of total time @@ -68,23 +65,8 @@ jobs: TMP_DIR: /mnt/tmp SHARE_DIR: /mount/cinfsshare/onnxtestdata CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux - LD_LIBRARY_PATH: $(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/lib - OV_PYTHON_VERSION: 3.10.10 # Full version of Python its required for LD_LIBRARY_PATH. More details https://github.com/microsoft/azure-pipelines-tool-lib/blob/master/docs/overview.md#tool-cache steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '$(OV_PYTHON_VERSION)' # Setting only major & minor version will download latest release from GH repo example 3.10 will be 3.10.10. - addToPath: true - disableDownloadFromRegistry: false - architecture: 'x64' - githubToken: $(auth_token) - displayName: Setup Python 3.10 - name: setupPython - - bash: | - #!/bin/bash - python -V - - script: | curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01" whoami @@ -243,11 +225,12 @@ jobs: # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time - script: | - export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1910/linux/x64:$(LD_LIBRARY_PATH) python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph \ --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \ --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_zoo_models.py \ --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_backend.py + env: + LD_LIBRARY_PATH: $(INSTALL_TEST_DIR) displayName: 'nGraph and IE Python Bindings Tests' # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time @@ -257,7 +240,6 @@ jobs: # - OpenVINO wheel installation dir for others frontend required by mock_py (is not part of wheel pkg) export LD_LIBRARY_PATH=$(PYTHON_WHEEL_INSTALL_DIR)/openvino/libs:$(INSTALL_TEST_DIR):$LD_LIBRARY_PATH # For python imports to import pybind_mock_frontend - export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1910/linux/x64:$(LD_LIBRARY_PATH) export PYTHONPATH=$(INSTALL_TEST_DIR):$PYTHONPATH python3 -m pytest -s $(INSTALL_TEST_DIR)/pyopenvino \ --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \ @@ -267,7 +249,6 @@ jobs: displayName: 'Python API 2.0 Tests' - script: | - export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1910/linux/x64:$(LD_LIBRARY_PATH) python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml displayName: 'Model Optimizer UT' diff --git a/.ci/azure/windows_conditional_compilation.yml b/.ci/azure/windows_conditional_compilation.yml index 7cdace00d0e..384f8a00171 100644 --- a/.ci/azure/windows_conditional_compilation.yml +++ b/.ci/azure/windows_conditional_compilation.yml @@ -155,6 +155,7 @@ jobs: -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^ -DENABLE_PROFILING_ITT=OFF ^ -DSELECTIVE_BUILD=ON ^ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^ -DSELECTIVE_BUILD_STAT=$(BUILD_DIR)\*.csv ^ -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^ -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^