Skip to content

Commit 5c2eb05

Browse files
author
Evgenya Stepyreva
authored
[ MO ONNX ] Resize-11 clear error message (#620)
* Small refactoring of extractors * [ MO ] Throwing an exception while extracting Resize-11 which is not supported
1 parent d3ea03b commit 5c2eb05

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

model-optimizer/extensions/front/onnx/resize_ext.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,20 @@
1616

1717
from extensions.ops.upsample import UpsampleOp
1818
from mo.front.extractor import FrontExtractorOp
19-
from mo.front.onnx.extractors.utils import onnx_attr
19+
from mo.front.onnx.extractors.utils import onnx_attr, get_onnx_opset_version
2020
from mo.graph.graph import Node
21+
from mo.utils.error import Error
2122

2223

2324
class ResizeExtractor(FrontExtractorOp):
2425
op = 'Resize'
2526
enabled = True
2627

27-
@staticmethod
28-
def extract(node: Node):
28+
@classmethod
29+
def extract(cls, node: Node):
30+
onnx_opset_version = get_onnx_opset_version(node)
31+
if onnx_opset_version is not None and onnx_opset_version >= 11:
32+
raise Error("ONNX Resize operation from opset {} is not supported.".format(onnx_opset_version))
2933
mode = onnx_attr(node, 'mode', 's', default=b'nearest').decode()
3034
UpsampleOp.update_node_stat(node, {'mode': mode})
31-
return __class__.enabled
35+
return cls.enabled

model-optimizer/extensions/front/onnx/reverse_sequence_ext.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class ReverseSequenceExtractor(FrontExtractorOp):
2323
op = 'ReverseSequence'
2424
enabled = True
2525

26-
@staticmethod
27-
def extract(node):
26+
@classmethod
27+
def extract(cls, node):
2828
batch_axis = onnx_attr(node, 'batch_axis', 'i', default=1)
2929
time_axis = onnx_attr(node, 'time_axis', 'i', default=0)
3030

@@ -33,4 +33,4 @@ def extract(node):
3333
'seq_axis': time_axis,
3434
}
3535
ReverseSequence.update_node_stat(node, attrs)
36-
return __class__.enabled
36+
return cls.enabled

model-optimizer/extensions/front/tf/bucketize_ext.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ class BucketizeFrontExtractor(FrontExtractorOp):
2424
op = 'Bucketize'
2525
enabled = True
2626

27-
@staticmethod
28-
def extract(node):
27+
@classmethod
28+
def extract(cls, node):
2929
boundaries = np.array(node.pb.attr['boundaries'].list.f, dtype=np.float)
3030
Bucketize.update_node_stat(node, {'boundaries': boundaries, 'with_right_bound': False})
31-
32-
return __class__.enabled
31+
return cls.enabled

model-optimizer/extensions/front/tf/sparse_to_dense_ext.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ class SparseToDenseFrontExtractor(FrontExtractorOp):
2222
op = 'SparseToDense'
2323
enabled = True
2424

25-
@staticmethod
26-
def extract(node):
25+
@classmethod
26+
def extract(cls, node):
2727
SparseToDense.update_node_stat(node)
28-
29-
return __class__.enabled
28+
return cls.enabled

model-optimizer/mo/front/kaldi/extractors/linear_component_ext.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class LinearComponentFrontExtractor(FrontExtractorOp):
2525
op = 'linearcomponent'
2626
enabled = True
2727

28-
@staticmethod
29-
def extract(node):
28+
@classmethod
29+
def extract(cls, node):
3030
pb = node.parameters
3131
collect_until_token(pb, b'<Params>')
3232
weights, weights_shape = read_binary_matrix(pb)
@@ -39,4 +39,4 @@ def extract(node):
3939
embed_input(mapping_rule, 1, 'weights', weights)
4040

4141
FullyConnected.update_node_stat(node, mapping_rule)
42-
return __class__.enabled
42+
return cls.enabled

0 commit comments

Comments
 (0)