Commit 101e3e08 by Jon Soifer Committed by Zhi

[Relay][Frontend][TF] Fix Size operator (#4175)

* [Relay][Frontend][TF] Fix Size operator

* Uncomment tests
parent ecb0a7ea
......@@ -259,7 +259,7 @@ def get_relay_op(op_name):
op = None
else:
# try search op in various modules
for candidate in (_op, _op.nn, _op.image, _op.vision):
for candidate in (_op, _op.nn, _op.image, _op.vision, _op.contrib):
op = getattr(candidate, op_name, None)
if op is not None:
break
......
......@@ -1305,6 +1305,13 @@ def _squared_difference():
return _op.multiply(difference, difference)
return _impl
def _size():
def _impl(inputs, attr, params):
new_attr = attr
new_attr['out_type'] = attr['out_type'].name
return AttrCvt('ndarray_size', transforms={'out_type' : 'dtype'})(inputs, new_attr)
return _impl
# compatible operators that do NOT require any conversion.
_identity_list = []
......@@ -1410,7 +1417,7 @@ _convert_map = {
'Shape' : _shape(),
'Sigmoid' : AttrCvt('sigmoid'),
'Sign' : AttrCvt('sign'),
'Size' : AttrCvt('ndarray_size'),
'Size' : _size(),
'Slice' : _slice(),
'Softmax' : _softmax(),
'Softplus' : _softplus(),
......
......@@ -2184,15 +2184,18 @@ def test_forward_mean():
def test_forward_size():
def check_size(ishape):
np_input = np.random.uniform(size=ishape).astype(np.float32)
# if all dimensions are constant, TF will optimize away size operator into constant
tf_input_shape = list(np_input.shape)
tf_input_shape[0] = None
with tf.Graph().as_default():
input = tf.placeholder(shape=np_input.shape, dtype=np_input.dtype, name='input')
input = tf.placeholder(shape=tf_input_shape, dtype=np_input.dtype, name='input')
tf.size(input, name='size')
compare_tf_with_tvm([np_input], ['input:0'], 'size:0')
if tf.__version__ < LooseVersion('1.1'):
check_size((10, 8, 16, 32))
check_size((10,))
check_size(())
check_size((10, 8, 16, 32))
check_size((10,))
#######################################################################
# All, Max, Min
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment