IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MO][TF FE] Recover MOC TF FE unit-tests in the pre-commit (#17233)

Browse Source 
* [MO][TF FE] Recover MOC TF FE unit-tests

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Fix python environment to get test_util

* Correct Python environment for MO UT tests

* Correct Python env for linux-debian

---------

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
This commit is contained in:
Roman Kazantsev 2023-05-04 02:39:46 +03:00 committed by GitHub
parent 0afe835811
commit 7464b4d396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.ci/azure/linux.yml
View File

@ -324,11 +324,6 @@ jobs:
--ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_backend.py --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_backend.py
displayName: 'Python API 2.0 Tests' displayName: 'Python API 2.0 Tests'
- script: |
export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.05.00.1906/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'
- script: | - script: |
sudo apt-get install libtbb-dev libpugixml-dev -y sudo apt-get install libtbb-dev libpugixml-dev -y
cmake --build $(BUILD_DIR) --target package --parallel cmake --build $(BUILD_DIR) --target package --parallel
@ -362,6 +357,12 @@ jobs:
condition: ne(variables['CMAKE_CPACK_GENERATOR'], 'DEB') condition: ne(variables['CMAKE_CPACK_GENERATOR'], 'DEB')
displayName: 'List install files' displayName: 'List install files'
- script: |
export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.05.00.1906/linux/x64:$(LD_LIBRARY_PATH)
export PYTHONPATH=$(INSTALL_DIR)/python/python3.11:$PYTHONPATH
python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml
displayName: 'Model Optimizer UT'
- script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR) -b $(BUILD_DIR)/cpp_samples - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR) -b $(BUILD_DIR)/cpp_samples
displayName: 'Build cpp samples - gcc' displayName: 'Build cpp samples - gcc'

1
.ci/azure/linux_debian.yml
View File

@ -248,6 +248,7 @@ jobs:
displayName: 'Python API 2.0 Tests' displayName: 'Python API 2.0 Tests'
- script: | - script: |
export PYTHONPATH=$(INSTALL_DIR)/lib/python3/dist-packages:$PYTHONPATH
python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml
displayName: 'Model Optimizer UT' displayName: 'Model Optimizer UT'

3
tools/mo/unit_tests/moc_tf_fe/conversion_with_layout.py → tools/mo/unit_tests/moc_tf_fe/conversion_with_layout_test.py
View File

@ -10,7 +10,6 @@ from generator import generator, generate
import openvino.runtime.opset11 as opset11 import openvino.runtime.opset11 as opset11
from openvino.runtime import Model from openvino.runtime import Model
from openvino.runtime import PartialShape, Dimension from openvino.runtime import PartialShape, Dimension
from openvino.test_utils import compare_functions
from openvino.tools.mo.convert import convert_model from openvino.tools.mo.convert import convert_model
from openvino.tools.mo.utils.error import Error from openvino.tools.mo.utils.error import Error
@ -31,7 +30,9 @@ class TestConversionWithBatchAndLayout(unittest.TestCase):
" expected shape - {}, actual shape - {}".format(input_name, ref_shape, " expected shape - {}, actual shape - {}".format(input_name, ref_shape,
input_shape) input_shape)
@unittest.skip("Fix importing of openvino.test_utils in Jenkins")
def test_basic_model_no_layout(self): def test_basic_model_no_layout(self):
from openvino.test_utils import compare_functions
path = os.path.dirname(__file__) path = os.path.dirname(__file__)
input_model = os.path.join(path, "test_models", "model_fp32.pbtxt") input_model = os.path.join(path, "test_models", "model_fp32.pbtxt")
ov_model = convert_model(input_model) ov_model = convert_model(input_model)