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

[TF FE] Refactor identity operations and layer test (#15904)

Browse Source 
Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
This commit is contained in:
Roman Kazantsev 2023-02-24 00:22:31 +04:00 committed by GitHub
parent bd61d317f8
commit 8a56234445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontends/tensorflow_common/src/op/identity.cpp
View File

@ -14,13 +14,12 @@ namespace tensorflow {
namespace op {
OutputVector translate_identity_op(const NodeContext& node) {
vector<string> supported_ops = {"Identity", "PreventGradient", "Snapshot", "StopGradient"};
default_op_checks(node, 1, supported_ops);
auto input = node.get_input(0);
// since the input node can have several outputs, and identity have only one input,
// we cannot use set_node_name(..) helper, we have to set names for output connected
// to this identity only.
// Node_1 -> Node_2
// -(identity name) -> Identity
// set only tensor names
// no need to change node name since Identity node is skipped
set_out_name(node.get_name(), input);
set_out_name(node.get_name() + ":" + "0", input);
return {input};

83
tests/layer_tests/tensorflow_tests/test_tf_Identity.py
View File

@ -2,86 +2,37 @@
# SPDX-License-Identifier: Apache-2.0
import pytest
from common.layer_test_class import check_ir_version
import tensorflow as tf
from common.tf_layer_test_class import CommonTFLayerTest
from common.utils.tf_utils import permute_nchw_to_nhwc
from unit_tests.utils.graph import build_graph
class TestIdentity(CommonTFLayerTest):
def create_identity_net(self, shape, ir_version, use_new_frontend):
"""
Tensorflow net IR net
Input->Identity->ReLU => Input->ReLU
"""
import tensorflow as tf
def create_identity_net(self, input_shape, identity_op):
tf.compat.v1.reset_default_graph()
# Create the graph and model
with tf.compat.v1.Session() as sess:
tf_x_shape = shape.copy()
tf_x_shape = permute_nchw_to_nhwc(tf_x_shape, use_new_frontend)
x = tf.compat.v1.placeholder(tf.float32, tf_x_shape, 'Input')
id = tf.identity(x, name="Operation")
tf.nn.relu(id, name='Operation')
input = tf.compat.v1.placeholder(tf.float32, input_shape, 'input')
relu = tf.raw_ops.Relu(features=input)
identity_op(input=relu, name="identity")
tf.compat.v1.global_variables_initializer()
tf_net = sess.graph_def
#
# Create reference IR net
# Please, specify 'type': 'Input' for input node
# Moreover, do not forget to validate ALL layer attributes!!!
#
return tf_net, None
ref_net = None
test_data_basic = [
dict(input_shape=[2], identity_op=tf.raw_ops.Identity),
dict(input_shape=[2, 3], identity_op=tf.raw_ops.PreventGradient),
dict(input_shape=[], identity_op=tf.raw_ops.Snapshot),
dict(input_shape=[1, 2, 3], identity_op=tf.raw_ops.StopGradient)
]
if check_ir_version(10, None, ir_version) and not use_new_frontend:
nodes_attributes = {
'inputX': {'kind': 'op', 'type': 'Parameter'},
'inputX_data': {'shape': shape, 'kind': 'data'},
'ReLU': {'kind': 'op', 'type': 'ReLU'},
'ReLU_data': {'shape': shape, 'kind': 'data'},
'result': {'kind': 'op', 'type': 'Result'}
}
ref_net = build_graph(nodes_attributes,
[('inputX', 'inputX_data'),
('inputX_data', 'ReLU'),
('ReLU', 'ReLU_data'),
('ReLU_data', 'result')
])
return tf_net, ref_net
test_data_precommit = [dict(shape=[1, 3, 50, 100, 224])]
@pytest.mark.parametrize("params", test_data_precommit)
@pytest.mark.precommit
def test_identity_precommit(self, params, ie_device, precision, ir_version, temp_dir,
use_new_frontend, use_old_api):
self._test(*self.create_identity_net(**params, ir_version=ir_version,
use_new_frontend=use_new_frontend),
ie_device, precision, ir_version, temp_dir=temp_dir,
use_new_frontend=use_new_frontend, use_old_api=use_old_api)
test_data = [dict(shape=[1]),
pytest.param(dict(shape=[1, 224]), marks=pytest.mark.precommit_tf_fe),
dict(shape=[1, 3, 224]),
dict(shape=[1, 3, 100, 224]),
dict(shape=[1, 3, 50, 100, 224])]
@pytest.mark.parametrize("params", test_data)
@pytest.mark.parametrize("params", test_data_basic)
@pytest.mark.precommit_tf_fe
@pytest.mark.nightly
def test_identity(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend,
use_old_api):
self._test(*self.create_identity_net(**params, ir_version=ir_version,
use_new_frontend=use_new_frontend),
def test_identity_basic(self, params, ie_device, precision, ir_version, temp_dir,
use_new_frontend, use_old_api):
self._test(*self.create_identity_net(**params),
ie_device, precision, ir_version, temp_dir=temp_dir,
use_new_frontend=use_new_frontend, use_old_api=use_old_api)