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

Revert "[TF FE] Switch off TF1 While support totally (#20774)" (#20800)

Browse Source 
This reverts commit 38b6092120.
This commit is contained in:
Roman Kazantsev 2023-10-31 22:53:35 +04:00 committed by GitHub
parent 703e911321
commit 26c9c41b8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontends/tensorflow/src/op/enter.cpp
View File

@ -22,9 +22,6 @@ OutputVector translate_enter_op(const NodeContext& node) {
auto data = node.get_input(0); auto data = node.get_input(0);
auto frame_name = node.get_attribute<string>("frame_name"); auto frame_name = node.get_attribute<string>("frame_name");
// TODO 123651: remove this fallback to the legacy FE once GPU fixes dynamism for Loop operation
TENSORFLOW_OP_VALIDATION(node, false, "Fallback to legacy FE: Switch off TF1 While support due to GPU limitation");
auto enter_node = make_shared<Enter>(data, frame_name, node.get_decoder()); auto enter_node = make_shared<Enter>(data, frame_name, node.get_decoder());
set_node_name(node.get_name(), enter_node); set_node_name(node.get_name(), enter_node);

3
src/frontends/tensorflow/src/op/loop_cond.cpp
View File

@ -22,9 +22,6 @@ OutputVector translate_loop_cond_op(const NodeContext& node) {
default_op_checks(node, 1, {"LoopCond"}); default_op_checks(node, 1, {"LoopCond"});
auto input = node.get_input(0); auto input = node.get_input(0);
// TODO 123651: remove this fallback to the legacy FE once GPU fixes dynamism for Loop operation
TENSORFLOW_OP_VALIDATION(node, false, "Fallback to legacy FE: Switch off TF1 While support due to GPU limitation");
auto loop_cond_node = make_shared<LoopCond>(input, node.get_decoder()); auto loop_cond_node = make_shared<LoopCond>(input, node.get_decoder());
set_node_name(node.get_name(), loop_cond_node); set_node_name(node.get_name(), loop_cond_node);

2
src/frontends/tensorflow/tests/convert_unsupported.cpp
View File

@ -154,7 +154,7 @@ TEST(FrontEndConvertModelTest, test_unsupported_tf1_while_and_incorrect_less_tra
} }
} }
TEST(FrontEndConvertModelTest, DISABLED_conversion_with_unknown_exception) { TEST(FrontEndConvertModelTest, conversion_with_unknown_exception) {
shared_ptr<Model> model = nullptr; shared_ptr<Model> model = nullptr;
try { try {
auto conv_ext = auto conv_ext =

4
tests/layer_tests/tensorflow_tests/test_tf_While.py
View File

@ -51,7 +51,7 @@ class TestWhile(CommonTFLayerTest):
test_data_basic = [ test_data_basic = [
dict(y_shape=[2, 3], data_type=np.int32, lower_control_flow=False), dict(y_shape=[2, 3], data_type=np.int32, lower_control_flow=False),
dict(y_shape=[2, 1, 4], data_type=np.int32, lower_control_flow=False), dict(y_shape=[2, 1, 4], data_type=np.int32, lower_control_flow=False),
pytest.param(dict(y_shape=[2, 1, 4], data_type=np.int32, lower_control_flow=True), marks=pytest.mark.xfail(reason="123651")) dict(y_shape=[2, 1, 4], data_type=np.int32, lower_control_flow=True)
] ]
@pytest.mark.parametrize("params", test_data_basic) @pytest.mark.parametrize("params", test_data_basic)
@ -110,7 +110,7 @@ class TestWhileShapeVariant(CommonTFLayerTest):
test_data_basic = [ test_data_basic = [
dict(y_shape=[2, 3], lower_control_flow=False), dict(y_shape=[2, 3], lower_control_flow=False),
dict(y_shape=[2, 1, 4], lower_control_flow=False), dict(y_shape=[2, 1, 4], lower_control_flow=False),
pytest.param(dict(y_shape=[2, 1, 4], lower_control_flow=True), marks=pytest.mark.xfail(reason="123651")) dict(y_shape=[2, 1, 4], lower_control_flow=True)
] ]
@pytest.mark.parametrize("params", test_data_basic) @pytest.mark.parametrize("params", test_data_basic)

1
tools/mo/unit_tests/moc_tf_fe/conversion_basic_models_test.py
View File

@ -239,7 +239,6 @@ class TestMoFreezePlaceholderTFFE(unittest.TestCase):
self.basic("ctc_model_based.pbtxt", None, None, None, None, self.basic("ctc_model_based.pbtxt", None, None, None, None,
None, None, True, True, False, False) None, None, True, True, False, False)
@unittest.skip("123651: enable when GPU fixes dynamism in Loop operation")
def test_conversion_tf1_while_use_new_frontend(self): def test_conversion_tf1_while_use_new_frontend(self):
self.basic("ctc_model_based.pbtxt", None, None, None, None, self.basic("ctc_model_based.pbtxt", None, None, None, None,
None, None, True, True, True, False) None, None, True, True, True, False)