From 6dd88d76d38bad82df1baccecca9283554bd9e1c Mon Sep 17 00:00:00 2001 From: Anastasia Kuporosova Date: Wed, 2 Aug 2023 09:14:03 +0200 Subject: [PATCH] [PyOV] try to run add_extension_test (#18900) * [PyOV] try to run add_extension_test * rename flag * try to run extension test on linux * run on linux --- .ci/azure/linux.yml | 7 ++++--- .github/workflows/linux.yml | 5 +++-- src/bindings/python/setup.cfg | 2 +- src/bindings/python/tests/conftest.py | 2 +- src/bindings/python/tests/test_graph/test_node_factory.py | 2 +- src/bindings/python/tests/test_runtime/test_core.py | 4 +--- src/bindings/python/tests_compatibility/conftest.py | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index babd3aae88a..dbb8a30a421 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -63,7 +63,7 @@ jobs: # RUN_PREFIX: LD_LIBRARY_PATH=$(INSTALL_TEST_DIR):$(INSTALL_DIR)/opencv/lib:$LD_LIBRARY_PATH Static: CMAKE_BUILD_SHARED_LIBS: 'OFF' - PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin" + PYTHON_STATIC_ARGS: -m "not dynamic_library" CMAKE_CPACK_GENERATOR: SAMPLES_INSTALL_DIR: $(INSTALL_DIR)/samples PYTHON_SAMPLES_INSTALL_DIR: $(SAMPLES_INSTALL_DIR)/python @@ -439,14 +439,15 @@ jobs: # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time - script: | - python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph $(PYTHON_STATIC_ARGS) \ + $(RUN_PREFIX) python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph $(PYTHON_STATIC_ARGS) \ --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 displayName: 'nGraph and IE Python Bindings Tests' - script: | - python3 -m pytest -sv $(INSTALL_TEST_DIR)/pyopenvino $(PYTHON_STATIC_ARGS) \ + export LD_LIBRARY_PATH=$INSTALL_TEST_DIR:$LD_LIBRARY_PATH + $(RUN_PREFIX) python3 -m pytest -sv $(INSTALL_TEST_DIR)/pyopenvino $(PYTHON_STATIC_ARGS) \ --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \ --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_utils/test_utils.py displayName: 'Python API 2.0 Tests' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 199074c91e5..c56da45d333 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -45,7 +45,7 @@ jobs: DATA_PATH: ${{ github.workspace }}/testdata MODELS_PATH: ${{ github.workspace }}/testdata OV_TEMP: ${{ github.workspace }}/openvino_temp - PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin" + PYTHON_STATIC_ARGS: -m "not dynamic_library" steps: - name: Clone OpenVINO uses: actions/checkout@v3 @@ -486,7 +486,7 @@ jobs: DATA_PATH: ${{ github.workspace }}/testdata MODELS_PATH: ${{ github.workspace }}/testdata OV_TEMP: ${{ github.workspace }}/openvino_temp - PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin" + PYTHON_STATIC_ARGS: -m "not dynamic_library" steps: - name: Create Directories @@ -579,6 +579,7 @@ jobs: # For python imports to import pybind_mock_frontend export PYTHONPATH=${{ env.INSTALL_TEST_DIR }}:$PYTHONPATH source ${{ env.INSTALL_DIR }}/setupvars.sh + export LD_LIBRARY_PATH=${{ env.INSTALL_TEST_DIR }}:$LD_LIBRARY_PATH python3 -m pytest -sv ${{ env.INSTALL_TEST_DIR }}/pyopenvino ${{ env.PYTHON_STATIC_ARGS }} \ --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-Pyngraph.xml \ diff --git a/src/bindings/python/setup.cfg b/src/bindings/python/setup.cfg index e726424a877..2289fb5f335 100644 --- a/src/bindings/python/setup.cfg +++ b/src/bindings/python/setup.cfg @@ -16,7 +16,7 @@ passenv = http_proxy https_proxy commands= - pytest tests -m "not template_plugin" -v -k 'not _cuda' --ignore=tests/test_utils + pytest tests -m "not template_extension" -v -k 'not _cuda' --ignore=tests/test_utils pytest --backend={env:OV_BACKEND} tests_compatibility/test_ngraph -v -k 'not _cuda' --ignore=tests_compatibility/test_onnx/test_zoo_models.py pytest --backend={env:OV_BACKEND} /openvino/src/frontends/onnx/tests -v --ignore=/openvino/src/frontends/onnx/tests/tests_python/test_zoo_models.py diff --git a/src/bindings/python/tests/conftest.py b/src/bindings/python/tests/conftest.py index f5490729889..9583f8980ab 100644 --- a/src/bindings/python/tests/conftest.py +++ b/src/bindings/python/tests/conftest.py @@ -91,7 +91,7 @@ def pytest_configure(config): config.addinivalue_line("markers", "skip_on_hetero: Skip test on HETERO") config.addinivalue_line("markers", "skip_on_template: Skip test on TEMPLATE") config.addinivalue_line("markers", "onnx_coverage: Collect ONNX operator coverage") - config.addinivalue_line("markers", "template_plugin") + config.addinivalue_line("markers", "template_extension") config.addinivalue_line("markers", "dynamic_library: Runs tests only in dynamic libraries case") diff --git a/src/bindings/python/tests/test_graph/test_node_factory.py b/src/bindings/python/tests/test_graph/test_node_factory.py index 92cf9a5041b..7be5c977bcd 100644 --- a/src/bindings/python/tests/test_graph/test_node_factory.py +++ b/src/bindings/python/tests/test_graph/test_node_factory.py @@ -97,7 +97,7 @@ def test_node_factory_validate_missing_arguments(): raise AssertionError("Validation of missing arguments has unexpectedly passed.") -@pytest.mark.template_plugin() +@pytest.mark.template_extension() def test_extension_added_from_library(): if platform == "win32": library_path = "openvino_template_extension.dll" diff --git a/src/bindings/python/tests/test_runtime/test_core.py b/src/bindings/python/tests/test_runtime/test_core.py index 097d0579444..86b8455f126 100644 --- a/src/bindings/python/tests/test_runtime/test_core.py +++ b/src/bindings/python/tests/test_runtime/test_core.py @@ -302,9 +302,7 @@ def test_unload_plugin(device): core.unload_plugin(device) -@pytest.mark.template_plugin() -@pytest.mark.skip(reason="Sporadically failed on mac with error: Cannot add extension." - "Cannot find entry point to the extension library") +@pytest.mark.template_extension() def test_add_extension_template_extension(device): core, model = get_model_with_template_extension() assert isinstance(model, Model) diff --git a/src/bindings/python/tests_compatibility/conftest.py b/src/bindings/python/tests_compatibility/conftest.py index 4fce818bb9f..c45bb0ec32d 100644 --- a/src/bindings/python/tests_compatibility/conftest.py +++ b/src/bindings/python/tests_compatibility/conftest.py @@ -73,7 +73,7 @@ def pytest_configure(config): config.addinivalue_line("markers", "skip_on_hetero: Skip test on HETERO") config.addinivalue_line("markers", "skip_on_template: Skip test on TEMPLATE") config.addinivalue_line("markers", "onnx_coverage: Collect ONNX operator coverage") - config.addinivalue_line("markers", "template_plugin") + config.addinivalue_line("markers", "template_extension") config.addinivalue_line("markers", "dynamic_library: Runs tests only in dynamic libraries case")