00c7da0f5f
* Revert submodule changes * Fix build on Win * Fix precommit: set correct shapes for broadcasting; disable check with ref for use_new_frontend mode * fix precommit * Fix precommits * Temporary skip new tests on GPU with FP16 * Resolve review comments, trigger CI * Resolve review comments * Resolve review comments
265 lines
12 KiB
Python
265 lines
12 KiB
Python
# Copyright (C) 2018-2021 Intel Corporation
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
import numpy as np
|
|
import pytest
|
|
|
|
from common.tf_layer_test_class import CommonTFLayerTest
|
|
from common.utils.tf_utils import permute_nchw_to_nhwc
|
|
|
|
|
|
class TestAdd(CommonTFLayerTest):
|
|
def create_add_placeholder_const_net(self, x_shape, y_shape, ir_version, use_new_frontend):
|
|
"""
|
|
Tensorflow net IR net
|
|
|
|
Placeholder->Add => Placeholder->Eltwise or Power or ScaleShift
|
|
/ /
|
|
Const-------/ Const-------/
|
|
|
|
"""
|
|
|
|
#
|
|
# Create Tensorflow model
|
|
#
|
|
|
|
import tensorflow as tf
|
|
|
|
tf.compat.v1.reset_default_graph()
|
|
|
|
# Create the graph and model
|
|
with tf.compat.v1.Session() as sess:
|
|
tf_x_shape = x_shape.copy()
|
|
tf_y_shape = y_shape.copy()
|
|
|
|
tf_x_shape = permute_nchw_to_nhwc(tf_x_shape, use_new_frontend)
|
|
tf_y_shape = permute_nchw_to_nhwc(tf_y_shape, use_new_frontend)
|
|
|
|
x = tf.compat.v1.placeholder(tf.float32, tf_x_shape, 'Input')
|
|
constant_value = np.random.randint(-256, 256, tf_y_shape).astype(np.float32)
|
|
if (constant_value == 0).all():
|
|
# Avoid elimination of the layer from IR
|
|
constant_value = constant_value + 1
|
|
y = tf.constant(constant_value)
|
|
|
|
add = tf.add(x, y, name="Operation")
|
|
add_shape = add.shape.as_list()
|
|
|
|
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!!!
|
|
#
|
|
|
|
ref_net = None
|
|
|
|
return tf_net, ref_net
|
|
|
|
# TODO: implement tests for 2 Consts + Add
|
|
|
|
test_data_1D = [
|
|
# Power
|
|
dict(x_shape=[1], y_shape=[1]),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[3], y_shape=[3]), marks=pytest.mark.xfail(reason="*-19180"))
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_1D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_1D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_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)
|
|
|
|
test_data_2D = [
|
|
# Power
|
|
dict(x_shape=[1, 1], y_shape=[1, 1]),
|
|
# ScaleShift
|
|
dict(x_shape=[1, 3], y_shape=[1, 3]),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[3, 1], y_shape=[3, 1]), marks=pytest.mark.xfail(reason="*-19180")),
|
|
# Eltwise
|
|
dict(x_shape=[2, 3], y_shape=[2, 3])
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_2D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_2D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_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)
|
|
|
|
test_data_3D = [
|
|
# Power
|
|
dict(x_shape=[1, 1, 1], y_shape=[1, 1, 1]),
|
|
# ScaleShift
|
|
pytest.param(dict(x_shape=[1, 3, 1], y_shape=[1, 3, 1]), marks=pytest.mark.xfail(reason="*-19053")),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[1, 1, 3], y_shape=[1, 1, 3]),
|
|
marks=[pytest.mark.xfail(reason="*-19053"), pytest.mark.xfail(reason="*-18830")]),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[1, 3, 224], y_shape=[1, 3, 224]), marks=pytest.mark.xfail(reason="*-19053"))
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_3D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_3D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_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)
|
|
|
|
test_data_4D = [
|
|
# Power
|
|
dict(x_shape=[1, 1, 1, 1], y_shape=[1, 1, 1, 1]),
|
|
# ScaleShift
|
|
dict(x_shape=[1, 3, 1, 1], y_shape=[1, 3, 1, 1]),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[1, 1, 1, 3], y_shape=[1, 1, 1, 3]), marks=pytest.mark.xfail(reason="*-19180")),
|
|
# Eltwise
|
|
dict(x_shape=[1, 3, 222, 224], y_shape=[1, 3, 222, 224])
|
|
]
|
|
|
|
# TODO mark as precommit (after successfully passing in nightly)
|
|
@pytest.mark.parametrize("params", test_data_4D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_4D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_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)
|
|
|
|
test_data_5D = [
|
|
# Power
|
|
dict(x_shape=[1, 1, 1, 1, 1], y_shape=[1, 1, 1, 1, 1]),
|
|
# ScaleShift
|
|
dict(x_shape=[1, 3, 1, 1, 1], y_shape=[1, 3, 1, 1, 1]),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[1, 1, 1, 1, 3], y_shape=[1, 1, 1, 1, 3]),
|
|
marks=pytest.mark.xfail(reason="*-19180")),
|
|
# Eltwise
|
|
dict(x_shape=[1, 3, 50, 100, 224], y_shape=[1, 3, 50, 100, 224])
|
|
]
|
|
|
|
# TODO mark as precommit (after successfully passing in nightly)
|
|
@pytest.mark.parametrize("params", test_data_5D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_5D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_net(**params, ir_version=ir_version, use_new_frontend=use_new_frontend),
|
|
ie_device, precision, ir_version=ir_version, temp_dir=temp_dir, use_new_frontend=use_new_frontend)
|
|
|
|
###############################################################################################
|
|
# #
|
|
# Broadcast cases #
|
|
# #
|
|
###############################################################################################
|
|
|
|
test_data_broadcast_1D = [
|
|
# Power
|
|
dict(x_shape=[3], y_shape=[1])
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_broadcast_1D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_broadcast_1D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_net(**params, ir_version=ir_version, use_new_frontend=use_new_frontend),
|
|
ie_device, precision, ir_version=ir_version, temp_dir=temp_dir, use_new_frontend=use_new_frontend)
|
|
|
|
test_data_broadcast_2D = [
|
|
# Power
|
|
dict(x_shape=[1, 1], y_shape=[1]),
|
|
# Power
|
|
dict(x_shape=[1, 3], y_shape=[1]),
|
|
# ScaleShift
|
|
dict(x_shape=[1, 3], y_shape=[3]),
|
|
# Eltwise
|
|
dict(x_shape=[3, 1], y_shape=[3]),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[3, 1], y_shape=[1, 3, 1, 1]), marks=pytest.mark.xfail(reason="*-19051"))
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_broadcast_2D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_broadcast_2D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_net(**params, ir_version=ir_version, use_new_frontend=use_new_frontend),
|
|
ie_device, precision, ir_version=ir_version, temp_dir=temp_dir, use_new_frontend=use_new_frontend)
|
|
|
|
test_data_broadcast_3D = [
|
|
# Power
|
|
dict(x_shape=[1, 1, 1], y_shape=[1]),
|
|
# Power
|
|
pytest.param(dict(x_shape=[1, 3, 1], y_shape=[1]), marks=pytest.mark.xfail(reason="*-19053")),
|
|
# ScaleShift
|
|
pytest.param(dict(x_shape=[1, 3, 1], y_shape=[3]), marks=pytest.mark.xfail(reason="*-19053")),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[1, 3, 1], y_shape=[3, 1]), marks=pytest.mark.xfail(reason="*-19053")),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[1, 1, 1], y_shape=[3, 1]), marks=pytest.mark.xfail(reason="*-19053")),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[3, 1, 224], y_shape=[1, 3, 224]), marks=pytest.mark.xfail(reason="*-19053")),
|
|
# Eltwise
|
|
pytest.param(dict(x_shape=[2, 3, 1], y_shape=[1, 3, 2]), marks=pytest.mark.xfail(reason="*-19053")),
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_broadcast_3D)
|
|
@pytest.mark.nightly
|
|
def test_add_placeholder_const_broadcast_3D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_net(**params, ir_version=ir_version, use_new_frontend=use_new_frontend),
|
|
ie_device, precision, ir_version=ir_version, temp_dir=temp_dir, use_new_frontend=use_new_frontend)
|
|
|
|
test_data_broadcast_4D = [
|
|
# Power
|
|
dict(x_shape=[1, 1, 1, 1], y_shape=[1]),
|
|
# Power
|
|
dict(x_shape=[1, 3, 1, 1], y_shape=[1]),
|
|
# ScaleShift
|
|
dict(x_shape=[1, 3, 1, 1], y_shape=[3]),
|
|
# ScaleShift
|
|
dict(x_shape=[1, 3, 100, 224], y_shape=[3]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 1, 1, 3], y_shape=[3]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 3, 1, 1], y_shape=[3, 1]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 2, 1, 3], y_shape=[3, 1, 2]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 2, 1, 3], y_shape=[1, 3, 2]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 3, 100, 224], y_shape=[1, 1, 1, 224]),
|
|
# Eltwise
|
|
dict(x_shape=[2, 3, 1, 2], y_shape=[1, 3, 2, 1])
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_broadcast_4D)
|
|
@pytest.mark.nightly
|
|
@pytest.mark.precommit
|
|
def test_add_placeholder_const_broadcast_4D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
self._test(*self.create_add_placeholder_const_net(**params, ir_version=ir_version, use_new_frontend=use_new_frontend),
|
|
ie_device, precision, ir_version=ir_version, temp_dir=temp_dir, use_new_frontend=use_new_frontend)
|
|
|
|
test_data_broadcast_5D = [
|
|
# Power
|
|
dict(x_shape=[1, 1, 1, 1, 1], y_shape=[1]),
|
|
# Power
|
|
dict(x_shape=[1, 3, 1, 1, 1], y_shape=[1, 1]),
|
|
# ScaleShift
|
|
dict(x_shape=[1, 3, 1, 1, 1], y_shape=[3]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 1, 1, 1, 3], y_shape=[3]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 3, 1, 1, 1], y_shape=[3, 1]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 2, 1, 1, 3], y_shape=[1, 3, 2]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 3, 5, 1, 2], y_shape=[5, 3, 2, 1]),
|
|
# Eltwise
|
|
dict(x_shape=[1, 3, 50, 100, 224], y_shape=[1, 1, 1, 1, 224]),
|
|
# Eltwise
|
|
dict(x_shape=[2, 3, 1, 2, 1], y_shape=[1, 3, 2, 1, 1])
|
|
]
|
|
|
|
@pytest.mark.parametrize("params", test_data_broadcast_5D)
|
|
@pytest.mark.nightly
|
|
@pytest.mark.precommit
|
|
def test_add_placeholder_const_broadcast_5D(self, params, ie_device, precision, ir_version, temp_dir, use_new_frontend):
|
|
# we do not perform transpose in the test in case of new frontend
|
|
self._test(*self.create_add_placeholder_const_net(**params, ir_version=ir_version, use_new_frontend=use_new_frontend), ie_device, precision,
|
|
ir_version=ir_version, temp_dir=temp_dir, use_new_frontend=use_new_frontend)
|