From cb26fed73db66e7b6bf855a1950126f046c1ca87 Mon Sep 17 00:00:00 2001 From: Alexander Zhogov Date: Tue, 3 Aug 2021 08:08:01 +0300 Subject: [PATCH] CI onnx try (#23) (#6889) Co-authored-by: Ilya Lavrenov --- .ci/azure/linux.yml | 2 ++ .ci/azure/mac.yml | 3 ++- .ci/azure/windows.yml | 3 ++- cmake/features.cmake | 1 + cmake/test_model_zoo.cmake | 3 +-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index 45d14fc252f53d..20add37f9b2e13 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -90,6 +90,7 @@ jobs: python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/src/requirements-dev.txt # For running nGraph unit tests dependent on Python frameworks python3 -m pip install -r $(REPO_DIR)/ngraph/test/requirements_test.txt + python3 -m pip install -r $(REPO_DIR)/ngraph/test/requirements_test_onnx.txt # For MO unit tests python3 -m pip install -r $(REPO_DIR)/model-optimizer/requirements.txt python3 -m pip install -r $(REPO_DIR)/model-optimizer/requirements_dev.txt @@ -117,6 +118,7 @@ jobs: -DNGRAPH_ONNX_FRONTEND_ENABLE=ON -DENABLE_FASTER_BUILD=ON -DENABLE_STRICT_DEPENDENCIES=OFF + -DENABLE_REQUIREMENTS_INSTALL=OFF -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules $(REPO_DIR) workingDirectory: $(BUILD_DIR) diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml index 639fd0f68c5cfb..8d0a8db35667ca 100644 --- a/.ci/azure/mac.yml +++ b/.ci/azure/mac.yml @@ -76,6 +76,7 @@ jobs: - script: | brew install cython brew install automake + python3 -m pip install -r $(REPO_DIR)/ngraph/test/requirements_test_onnx.txt # Speed up build brew install ninja # Speed up tests @@ -87,7 +88,7 @@ jobs: export PATH="/usr/local/opt/cython/bin:$PATH" export CC=gcc export CXX=g++ - cmake -GNinja -DVERBOSE_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules $(REPO_DIR) + cmake -GNinja -DVERBOSE_BUILD=ON -DENABLE_REQUIREMENTS_INSTALL=OFF -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules $(REPO_DIR) workingDirectory: $(BUILD_DIR) displayName: 'CMake' diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 6957c1b9455023..b9e92ae228d437 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -89,6 +89,7 @@ jobs: python -m pip install -r $(REPO_DIR)\inference-engine\ie_bridges\python\src\requirements-dev.txt rem For running nGraph unit tests dependent on Python frameworks python -m pip install -r $(REPO_DIR)\ngraph\test\requirements_test.txt + python -m pip install -r $(REPO_DIR)\ngraph\test\requirements_test_onnx.txt rem For MO unit tests python -m pip install -r $(REPO_DIR)\model-optimizer\requirements.txt python -m pip install -r $(REPO_DIR)\model-optimizer\requirements_dev.txt @@ -101,7 +102,7 @@ jobs: - script: | set PATH=$(WORK_DIR)\ninja-win;%PATH% - call "$(MSVS_VARS_PATH)" && cmake -GNinja -DENABLE_FASTER_BUILD=ON -DENABLE_TEMPLATE_PLUGIN=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR) + call "$(MSVS_VARS_PATH)" && cmake -GNinja -DENABLE_REQUIREMENTS_INSTALL=OFF -DENABLE_FASTER_BUILD=ON -DENABLE_TEMPLATE_PLUGIN=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR) workingDirectory: $(BUILD_DIR) displayName: 'CMake' diff --git a/cmake/features.cmake b/cmake/features.cmake index 1054ee11f933a9..26bf48f3824f8b 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -133,6 +133,7 @@ ie_dependent_option(NGRAPH_UNIT_TEST_ENABLE "Enables ngraph unit tests" ON "ENAB ie_dependent_option(NGRAPH_UNIT_TEST_BACKENDS_ENABLE "Control the building of unit tests using backends" ON "NGRAPH_UNIT_TEST_ENABLE" OFF) option(NGRAPH_DEBUG_ENABLE "Enable output for NGRAPH_DEBUG statements" OFF) +option(ENABLE_REQUIREMENTS_INSTALL "Dynamic dependencies install" ON) # WA for ngraph python build on Windows debug list(REMOVE_ITEM IE_OPTIONS NGRAPH_UNIT_TEST_ENABLE NGRAPH_UNIT_TEST_BACKENDS_ENABLE) diff --git a/cmake/test_model_zoo.cmake b/cmake/test_model_zoo.cmake index 4cba99a246a3c9..06f14f2d1f5e82 100644 --- a/cmake/test_model_zoo.cmake +++ b/cmake/test_model_zoo.cmake @@ -78,8 +78,7 @@ ov_model_convert("${OpenVINO_SOURCE_DIR}/${rel_path}" ie_onnx_import_out_files) if(ENABLE_TESTS) - # Note: paddlepaddle==2.1.0 is not found for 32bits architecture - if(NGRAPH_ONNX_IMPORT_ENABLE) + if(NGRAPH_ONNX_IMPORT_ENABLE AND ENABLE_REQUIREMENTS_INSTALL) find_package(PythonInterp 3 REQUIRED) get_filename_component(PYTHON_EXEC_DIR ${PYTHON_EXECUTABLE} DIRECTORY)