From 4c3bad5ffa61ddc45ddb206165ab7ff1154078ae Mon Sep 17 00:00:00 2001 From: "Kazantsev, Roman" Date: Thu, 29 Aug 2024 20:07:11 +0400 Subject: [PATCH] Adopt TF2 Keras layer tests to TF 2.17 Signed-off-by: Kazantsev, Roman --- tests/layer_tests/common/tf2_layer_test_class.py | 3 ++- tests/layer_tests/tensorflow_tests/test_tf_Bucketize.py | 1 - tests/layer_tests/tensorflow_tests/test_tf_Round.py | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/layer_tests/common/tf2_layer_test_class.py b/tests/layer_tests/common/tf2_layer_test_class.py index de195480f3a303..bfe5099b14d100 100644 --- a/tests/layer_tests/common/tf2_layer_test_class.py +++ b/tests/layer_tests/common/tf2_layer_test_class.py @@ -10,7 +10,8 @@ def save_to_tf2_savedmodel(tf2_model, path_to_saved_tf2_model): import tensorflow as tf assert int(tf.__version__.split('.')[0]) >= 2, "TensorFlow 2 must be used for this suite validation" - tf.keras.models.save_model(tf2_model, path_to_saved_tf2_model, save_format='tf') + # Since TF 2.16 this is only way to serialize Keras objects into SavedModel format + tf2_model.export(path_to_saved_tf2_model) assert os.path.isdir(path_to_saved_tf2_model), "the model haven't been saved " \ "here: {}".format(path_to_saved_tf2_model) return path_to_saved_tf2_model diff --git a/tests/layer_tests/tensorflow_tests/test_tf_Bucketize.py b/tests/layer_tests/tensorflow_tests/test_tf_Bucketize.py index 1e64843c963ecb..102663503d8191 100644 --- a/tests/layer_tests/tensorflow_tests/test_tf_Bucketize.py +++ b/tests/layer_tests/tensorflow_tests/test_tf_Bucketize.py @@ -3,7 +3,6 @@ import numpy as np import platform -import platform import pytest import tensorflow as tf from common.tf_layer_test_class import CommonTFLayerTest diff --git a/tests/layer_tests/tensorflow_tests/test_tf_Round.py b/tests/layer_tests/tensorflow_tests/test_tf_Round.py index 2136a88d3ac7a4..351114daab4aa3 100644 --- a/tests/layer_tests/tensorflow_tests/test_tf_Round.py +++ b/tests/layer_tests/tensorflow_tests/test_tf_Round.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 import numpy as np +import platform import pytest import tensorflow as tf from common.tf_layer_test_class import CommonTFLayerTest @@ -40,6 +41,9 @@ def test_round_basic(self, input_shape, input_type, ie_device, precision, ir_version, temp_dir, use_legacy_frontend): if input_type in [np.int8, np.int16, np.int32, np.int64]: pytest.skip('TensorFlow issue: https://github.com/tensorflow/tensorflow/issues/74789') + if platform.machine() in ["aarch64", "arm64", "ARM64"] and \ + input_type == np.float32 and input_shape == [10, 5, 1, 5]: + pytest.skip("150999: Accuracy issue on CPU") self._test(*self.create_tf_round_net(input_shape, input_type), ie_device, precision, ir_version, temp_dir=temp_dir, use_legacy_frontend=use_legacy_frontend)