From 328617307341cde1d52ab2a53301412ac27cdf63 Mon Sep 17 00:00:00 2001 From: "Kazantsev, Roman" Date: Wed, 20 Mar 2024 12:12:24 +0400 Subject: [PATCH 1/2] [TF FE] Support TensorFlow 2.16 Support TensorFlow 2.16 Signed-off-by: Kazantsev, Roman --- src/bindings/python/constraints.txt | 2 +- tests/constraints.txt | 2 +- tools/mo/requirements_tf.txt | 2 +- tools/mo/requirements_tf2.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bindings/python/constraints.txt b/src/bindings/python/constraints.txt index 94054315f9c0c6..45b32a4819faee 100644 --- a/src/bindings/python/constraints.txt +++ b/src/bindings/python/constraints.txt @@ -18,7 +18,7 @@ patchelf<=0.17.2.1 # Frontends docopt~=0.6.2 paddlepaddle==2.5.2 -tensorflow>=1.15.5,<2.16.0 +tensorflow>=1.15.5,<2.17.0 six~=1.16.0 protobuf>=3.18.1,<4.0.0 onnx==1.15.0 diff --git a/tests/constraints.txt b/tests/constraints.txt index 1492e0863cac1a..f27a78153f911f 100644 --- a/tests/constraints.txt +++ b/tests/constraints.txt @@ -12,7 +12,7 @@ sympy>=1.10 wheel>=0.38.1 defusedxml>=0.7.1 fastjsonschema~=2.17.1 -tensorflow>=2.5,<2.16.0 +tensorflow>=2.5,<2.17.0 test-generator==0.1.2 requests>=2.25.1 opencv-python>=4.5 diff --git a/tools/mo/requirements_tf.txt b/tools/mo/requirements_tf.txt index e9ff04cc7e6772..e32f7e076bc1d1 100644 --- a/tools/mo/requirements_tf.txt +++ b/tools/mo/requirements_tf.txt @@ -1,5 +1,5 @@ -c ../constraints.txt -tensorflow>=1.15.5,<2.16.0 +tensorflow>=1.15.5,<2.17.0 numpy>=1.16.6,<1.26 networkx defusedxml diff --git a/tools/mo/requirements_tf2.txt b/tools/mo/requirements_tf2.txt index d5825581a5549c..3aa9a1f82e510b 100644 --- a/tools/mo/requirements_tf2.txt +++ b/tools/mo/requirements_tf2.txt @@ -1,5 +1,5 @@ -c ../constraints.txt -tensorflow>=2.5,<2.16.0 +tensorflow>=2.5,<2.17.0 numpy>=1.16.6,<1.26 networkx defusedxml From 914695315fed429473b424f93f4bdff3b4e8ba17 Mon Sep 17 00:00:00 2001 From: "Kazantsev, Roman" Date: Thu, 21 Mar 2024 18:42:51 +0400 Subject: [PATCH 2/2] Switch notebook tests to legacy Keras Signed-off-by: Kazantsev, Roman --- .github/workflows/job_tensorflow_models_tests.yml | 7 ++++++- .../tensorflow/test_tf_hub_api_notebooks.py | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/job_tensorflow_models_tests.yml b/.github/workflows/job_tensorflow_models_tests.yml index c89370851ad24c..51f9852fba0858 100644 --- a/.github/workflows/job_tensorflow_models_tests.yml +++ b/.github/workflows/job_tensorflow_models_tests.yml @@ -114,7 +114,12 @@ jobs: - name: TensorFlow Models Tests - TF FE run: | export PYTHONPATH=${MODEL_HUB_TESTS_INSTALL_DIR}:$PYTHONPATH - python3 -m pytest ${MODEL_HUB_TESTS_INSTALL_DIR}/tensorflow/ -m ${{ inputs.model_scope }} --html=${INSTALL_TEST_DIR}/TEST-tf_fe_models_${{ inputs.model_scope }}.html --self-contained-html -v + python3 -m pytest ${MODEL_HUB_TESTS_INSTALL_DIR}/tensorflow/test_tf_convert_model.py -m ${{ inputs.model_scope }} \ + --html=${INSTALL_TEST_DIR}/TEST-tf_fe_models_${{ inputs.model_scope }}.html --self-contained-html -v + # decouple notebook tests due to GitHub issue in tensorflow_hub https://github.com/tensorflow/hub/issues/903 + # and use WA to switch to (legacy) Keras 2 + TF_USE_LEGACY_KERAS=1 python3 -m pytest ${MODEL_HUB_TESTS_INSTALL_DIR}/tensorflow/test_tf_hub_api_notebooks.py -m ${{ inputs.model_scope }} \ + --html=${INSTALL_TEST_DIR}/TEST-tf_fe_models_notebooks_${{ inputs.model_scope }}.html --self-contained-html -v env: TEST_DEVICE: CPU diff --git a/tests/model_hub_tests/tensorflow/test_tf_hub_api_notebooks.py b/tests/model_hub_tests/tensorflow/test_tf_hub_api_notebooks.py index b04f6c15d5c5d4..5c34d8125b9c6d 100644 --- a/tests/model_hub_tests/tensorflow/test_tf_hub_api_notebooks.py +++ b/tests/model_hub_tests/tensorflow/test_tf_hub_api_notebooks.py @@ -5,6 +5,7 @@ import tensorflow as tf import tensorflow_hub as hub from models_hub_common.test_convert_model import TestConvertModel + from utils import get_input_info