Skip to content

Commit

Permalink
Fix Error messages in tflite.py
Browse files Browse the repository at this point in the history
  • Loading branch information
apivovarov committed Jun 7, 2019
1 parent ca017a3 commit dabc8ad
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion nnvm/python/nnvm/frontend/keras.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ def _convert_convolution(insym, keras_layer, symtab):
else:
kernel_h, kernel_w, in_channels, n_filters = weightList[0].shape
weight = weightList[0].transpose([3, 2, 0, 1])
dilation = [1, 1]
if isinstance(keras_layer.dilation_rate, (list, tuple)):
dilation = [keras_layer.dilation_rate[0], keras_layer.dilation_rate[1]]
else:
Expand Down
1 change: 0 additions & 1 deletion python/tvm/relay/frontend/keras.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ def _convert_convolution(inexpr, keras_layer, etab):
else:
kernel_h, kernel_w, in_channels, n_filters = weightList[0].shape
weight = weightList[0].transpose([3, 2, 0, 1])
dilation = [1, 1]
if isinstance(keras_layer.dilation_rate, (list, tuple)):
dilation = [keras_layer.dilation_rate[0], keras_layer.dilation_rate[1]]
else:
Expand Down
9 changes: 5 additions & 4 deletions python/tvm/relay/frontend/tflite.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def get_tensor_value(self, tensor_wrapper):
if tensor_wrapper.tensor.Type() == TensorType.INT32:
return np.frombuffer(tensor_wrapper.buffer.DataAsNumpy(), dtype=np.int32).reshape(
tensor_wrapper.tensor.ShapeAsNumpy())
raise NotImplementedError("Not support tensor type {}"
raise NotImplementedError("Tensor type {} is currently not supported"
.format(str(tensor_wrapper.tensor.Type())))

def get_tensor_type_str(self, tensor_type):
Expand All @@ -171,7 +171,8 @@ def get_tensor_type_str(self, tensor_type):
return "float32"
if tensor_type == TensorType.INT32:
return "int32"
raise NotImplementedError("Not support tensor type {}".format(str(tensor_type)))
raise NotImplementedError("Tensor type {} is currently not supported"
.format(str(tensor_type)))

def convert_conv2d(self, op):
"""Convert TFLite conv2d"""
Expand Down Expand Up @@ -442,8 +443,8 @@ def convert_conv(self, op, conv_type):
conv_options = DepthwiseConv2DOptions()
conv_options.Init(op_options.Bytes, op_options.Pos)
depth_multiplier = conv_options.DepthMultiplier()
assert depth_multiplier == 1, "TF frontend have transformed it be 1 " \
"no matter original value be set by 0.25, 0.5 or any else"
assert depth_multiplier == 1, "TF frontend transforms it to be 1 regardless of what " \
"original value is set to 0.25, 0.5 or anything else"
else:
raise tvm.error.OpNotImplemented(
'Operator {} is not supported for frontend TFLite.'.format(conv_type))
Expand Down
2 changes: 1 addition & 1 deletion tests/python/frontend/keras/test_forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from tvm.relay.testing.config import ctx_list
import keras

# prevent keras from using up all gpu memory
# prevent Keras from using up all gpu memory
import tensorflow as tf
from keras.backend.tensorflow_backend import set_session
config = tf.ConfigProto()
Expand Down

0 comments on commit dabc8ad

Please sign in to comment.