* Refactored infer function and function supported_attrs for the layer Interpolate. * Small change. * Deleted unneeded checks in transformations ResizeToInterpolate2D and ResizeToInterpolate3D. * Small fix in the extractor of ONNX Resize. * Now the extractor of TF ResizeBilinear generates Interpolate-1 again, because 'axis' in final version of Interpolate-4 specification is an input but is not attribute. * Now the extractor of TF ResizeNearest generates Interpolate-1 again, because 'axis' in final version of Interpolate-4 specification is an input but is not attribute. * Added static method get_axis into class Interpolate. * Refactored class CanBeFused in the transformation InterpolateSequenceToInterpolate. * Fixed transformation InterpolateSequenceToInterpolate according to the last version of the specification of Interpolate-4. * Started to write support of Interpolate-4 in the transformation InterpolateWithConcat. * Added support for Interpolate-4 into the transformation InterpolateWithConcat. * Added support for Interpolate-4 into the transformation InterpolateConcat. * Added support for Interpolate-4 into the transformation InterpolateReshapeWA. * Added support for Interpolate-4 into the transformation InterpolateTranspose. * Started to add test for opset4 case of the transformation InterpolateSequenceToInterpolate. * Added test for InterpolateSequenceToInterpolate (test_2d_interpolate_sequence_1_opset4_case). * Added test for InterpolateSequenceToInterpolate (test_2d_interpolate_sequence_4_opset4_case). * Added another test for InterpolateSequenceToInterpolate (test_2d_interpolate_sequence_5_opset4_case). * Added another test for InterpolateSequenceToInterpolate (test_3d_interpolate_sequence_1_opset4_case). * Finished addition of tests for opset4 case of InterpolateSequenceToInterpolate. * Small change. * Now opset is only opset1 or opset4 in the transformation InterpolateTranspose. * Small fixes in transformations ResizeToInterpolate2D and ResizeToInterpolate3D. * Deleted reading of unused ONNX attributes. * Fixed docstring of the transformation InterpolateV1ToInterpolateV4. * Added node name in assert about axes input. * Fixes in the definition of the operation ONNXResize11. * Now Interpolate-4 cannot have 'extension' as opset. * Now the transformation InterpolateV1ToInterpolateV4 uses find_and_replace_pattern but not replace_sub_graph. * Fixed tests for transformations InterpolateReshapeWA and InterpolateConcat. * Fixed some tests. * Rewritten operation Interpolate-4 class according to new variant of documentation. * Some fixes in ONNXResize11 operation class. * Now the transformation ONNXResize11ToInterpolate generates Interpolate-4 with 4 inputs. * Now the transformation UpsampleToResample generates Interpolate-4 with 4 inputs. * Now the transformation NearestNeighborUpsampling generates Interpolate-4 with 4 inputs. * Now transformations ResizeToInterpolate2D and ResizeToInterpolate3D generate Interpolate-4 with 4 inputs. * Now the transformation SplitConcatPairToInterpolate generates Interpolate-4 with 4 inputs. * Now the transformation UnsqueezeTileReshapeBlockToInterpolate generates Interpolate-4 with 4 inputs. * Now the transformation InterpolateV1ToInterpolateV4 generates Interpolate-4 with 4 inputs. * Some fixes. * Fixed the transformation InterpolateSequenceToInterpolate according to new variant of Interpolate-4 specification. * Fixed typos. * Added shape_calculation_mode to supported_attrs. * Small fixes. * Added operation ONNXResize10 and the transformation ONNXResize10ToInterpolate4. * Fixed function correct_scales_using_dst_shape. * Some fixes in InterpolateSequenceToInterpolate. * Fixed bug in the method __call__ of the class CanBeFused: now self.accumulated_axes is correctly cleared in all cases. * Small change. * Fixed tests for the transformation SplitConcatPairToInterpolate. * Now transformations InterpolateWithConcat, InterpolateReshapeWA, InterpolateConcat support Interpolate-4. * Fixed the transformation InterpolateTranspose for the case of Interpolate-4. * Written the back transformation InterpolateV4AxesCorrection to convert 'axes' input of Interpolate-4 from NHWC to NCHW layout. * Added PermuteInput in Interpolate-4 infer. * Fixed typos. * Deleted the transformation InterpolateAxesCorrection. * Now Interpolate-4 permutes axis, not shape in input port 3. * Small fix. * Some fix. * Fixed bug in the transformation UpsampleToResample. * Added some debug prints. * Added more debug prints. * Now ONNX Upsample-9 operation is read as ONNXResize10. * Small fix. * Small fixes. * Fixed tests for the transformation SplitConcatPairToInterpolate. * Deleted debug prints. * Deleted some debug prints. * Fixes in the transformation UnsqueezeTileReshapeBlockToInterpolate and its tests. * Small fix in the transformation InterpolateSequenceToInterpolate. * Started to write nGraph transformation to convert Interpolate-1 to Interpolate-4. * Deleted redundant files. * Small fixes. * Small fix. * Written draft of the transformation Interpolate-1 -> Interpolate-4. * Small fix. * Now ONNX Importer reads Resize-10 as Interpolate-4. * Fixes in the test onnx_model_resize10_import_only. * Small fix in the test for the conversion Interpolate-1 -> Interpolate-4. * Small fixes. * Fixed NGraphReaderTests for Interpolate. * Some fixes. * Deleted class for Resample operation. * Fix in the transformation NearestNeighborUpsampling: fixed precision of the input 'scales' of generated Interpolate-4. * Fixed typo. * Now the TF operations ResizeBilinear is readed as internal MO operation TFResizeBilinear. This internal operation is converted into Interpolate-4. * Small fix in BOM-file. * Added checks of existence of attributes of TF ResizeBilinear operation. * Small fixes in the conversion of the internal MO operation TFResizeBilinear to Interpolate-4. * Small fixes. * Small fixes. * Now the transformation ONNXResize10ToInterpolateV4 calculates sizes input as input_shape * (scales + epsilon). * Added the internal MO operation TFResizeNearestNeighbor. * Fixes in the transformation SplitConcatPairToInterpolate and its tests. * Fixes in the transformation UnsqueezeTileReshapeBlockToInterpolate and its tests. * Written the transformation that converts the internal operation TFResizeNearestNeighbor into Interpolate-4. * Now MO reads the TF operation ResizeNearestNeighbor as the internal MO operation TFResizeNearestNeighbor. * Small fix. * Now the specification of Interpolate-4 clarifies that the mode linear_onnx supports only 2D or 4D input tensors. * Small fix. * Some fixes. * Moved the transformation ONNXResize10ToInterpolateV4 to the front stage. * Deleted infer function and function supported_attrs for ONNXResize10 operation. * Deleted supported_attrs() for TFResizeBilinear and TFResizeNearestNeighbor. * Some fixes. * Fixes in the shape infer function of the nGraph operation Interpolate-4. Now 'axes' input can be non-constant. In the such case, all elements of the output shape are Dimension::dynamic(). * Deleted corner cases processing in transformations TFResizeBilinearToInterpolateV4 and TFResizeNearestNeighborToInterpolateV4. * Rewritten the function replace_resize_bilinear. * Written inner MO operation TFResize that covers TF operations ResizeBilinear and ResizeNearestNeighbor. * Now TF operations ResizeBilinear and ResizeNearestNeighbor are read as an internal operation TFResize in MO. Transformations TFResizeNearestNeighborToInterpolateV4 and TFResizeBilinearToInterpolateV4 are fused into one transformation TFResizeToInterpolateV4. * Some changes in the shape infer function of nGraph op Interpolate-4. * Small fix. * Some changes. * The transformation TFResizeToInterpolateV4 is moved to the front stage. * Deleted redundant assert. * Deleted transformations ResizeToInterpolate2D and ResizeToInterpolate3D. * Some renaming. * Small change. * Deleted .copy() in the shape infer function of the internal operation TFResize. * Small fix. * Small fixes. * Added comment about the case when the input 'axes' of Interpolate-4 is non-constant. * Written test for Interpolate-4 shape infer, for the case when the input 'axes' is non-constant and shape_calculation_mode = scales. * Some fixes. * Small fixes. * Small fix. * Added yet another test for the case of non-constant 'axes' input of Interpolate-4 (when shape_calculation_mode = sizes). * Added some comment. * Small fix. * Reverted changes for InterpolateWithConcat. * Added type checks for all inputs of nGraph operation Interpolate-4. * Added u32 and u64 to supported element types of sizes and axes inputs of nGraph operation Interpolate-4. * Fixed some functional tests. * Some changes. * Added helper function float32_array. * Now the MO transformation InterpolateV1ToInterpolate preserves names of layers. * Small fix. * Small fix. * Reverted some change. * Small fixes. * Small fix. * Small fix. * Small fix. * Small fix. * Reverted changes in the nGraph reader tests for Interpolate-1. * Some revert. * Fixed some copyright year.
155 lines
6.6 KiB
Python
155 lines
6.6 KiB
Python
"""
|
|
Copyright (C) 2018-2020 Intel Corporation
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
"""
|
|
|
|
import numpy as np
|
|
|
|
from extensions.ops.elementwise import Mul
|
|
from extensions.ops.gather import Gather
|
|
from extensions.ops.interpolate import Interpolate
|
|
from mo.back.replacement import BackReplacementPattern
|
|
from mo.front.caffe.extractors.utils import get_canonical_axis_index
|
|
from mo.front.common.partial_infer.utils import int64_array
|
|
from mo.front.tf.graph_utils import create_op_with_const_inputs, create_op_node_with_second_input
|
|
from mo.graph.graph import Graph
|
|
from mo.ops.shape import Shape
|
|
|
|
|
|
class InterpolateConcat(BackReplacementPattern):
|
|
"""
|
|
Replaces hard-coded 1-port input of Interpolate with reshape-able sub-graph using the following Concat inputs
|
|
|
|
BEFORE:
|
|
input Const
|
|
shape=[1, 3, 30, 40] value=[60, 160]
|
|
\ /
|
|
Interpolate(axes=(2, 3)) input_1
|
|
shape=[1, 3, 60, 160] shape=[1, 4, 60, 160]
|
|
\ /
|
|
Concat(axis=1)
|
|
shape=[1, 7, 60, 160]
|
|
AFTER:
|
|
input
|
|
shape=[1, 3, 30, 40] input_1
|
|
| shape=[1, 4, 60, 160]
|
|
| / |
|
|
| ShapeOf |
|
|
| | |
|
|
| Gather |
|
|
| indices=(2, 3); axis=0 |
|
|
\ | |
|
|
Interpolate(axes=(2, 3)) |
|
|
shape=[1, 3, 60, 160] |
|
|
\ /
|
|
Concat(axis=1)
|
|
shape=[1, 7, 60, 160]
|
|
"""
|
|
enabled = True
|
|
graph_condition = [lambda graph: not graph.graph['cmd_params'].static_shape]
|
|
force_shape_inference = True
|
|
id = 'reshape_interpolate_through_concat'
|
|
|
|
@staticmethod
|
|
def make_interpolate_reshapeable(interpolate, concat):
|
|
assert interpolate.soft_get('type') == 'Interpolate'
|
|
assert concat.soft_get('type') == 'Concat'
|
|
|
|
output_shape = interpolate.out_port(0).data.get_shape()
|
|
|
|
interp_axes = [get_canonical_axis_index(output_shape, axis) for axis in Interpolate.get_axes(interpolate)]
|
|
concat_axis = get_canonical_axis_index(output_shape, concat.axis)
|
|
if concat_axis in interp_axes:
|
|
return
|
|
|
|
concat_srcs = [port.get_source() for port in concat.in_ports().values() if not port.disconnected()]
|
|
non_interp_concat_srcs = [src for src in concat_srcs if src.node.soft_get('type') != 'Interpolate']
|
|
if len(non_interp_concat_srcs) == 0:
|
|
return
|
|
|
|
graph = interpolate.graph
|
|
src = non_interp_concat_srcs[0]
|
|
|
|
shape = Shape(graph, {'name': src.node.soft_get('name', src.node.id) + '/Shape'}).create_node()
|
|
shape.in_port(0).connect(src)
|
|
gather = create_op_with_const_inputs(graph, Gather,
|
|
{1: np.array(interp_axes, dtype=np.int32), 2: int64_array(0)},
|
|
{'name': shape.name + '/Gathered'}, shape)
|
|
interpolate.in_port(1).get_connection().set_source(gather.out_port(0))
|
|
|
|
def find_and_replace_pattern(self, graph: Graph):
|
|
for interpolate in graph.get_op_nodes(type='Interpolate'):
|
|
if interpolate.in_port(1).get_source().node.soft_get('type') != 'Const':
|
|
continue
|
|
dsts = interpolate.out_port(0).get_destinations()
|
|
if len(dsts) == 1 and dsts[0].node.soft_get('type') == 'Concat':
|
|
self.make_interpolate_reshapeable(interpolate, dsts[0].node)
|
|
|
|
|
|
class InterpolateReshapeWA(BackReplacementPattern):
|
|
"""
|
|
Replaces hard-coded 1-port input of Interpolate with reshape-able sub-graph.
|
|
WARNING: Could cause troubles if model has hard-coded Interpolate intentionally -- rare situation
|
|
BEFORE:
|
|
input Const
|
|
shape=[1, 3, 30, 40] value=[60, 160]
|
|
\ /
|
|
Interpolate(axes=(2, 3))
|
|
shape=[1, 3, 60, 160]
|
|
AFTER:
|
|
input
|
|
shape=[1, 3, 30, 40]
|
|
| \
|
|
| ShapeOf
|
|
| |
|
|
| Gather Const
|
|
| indices=(2, 3); axis=0 value=[2, 4]
|
|
| \ /
|
|
| Multiply
|
|
| /
|
|
Interpolate(axes=(2, 3))
|
|
shape=[1, 3, 60, 160]
|
|
"""
|
|
enabled = False
|
|
graph_condition = [lambda graph: not graph.graph['cmd_params'].static_shape]
|
|
force_shape_inference = True
|
|
id = 'reshape_interpolate_wa'
|
|
|
|
def run_after(self):
|
|
return [InterpolateConcat]
|
|
|
|
@staticmethod
|
|
def make_interpolate_reshapeable(interpolate):
|
|
assert interpolate.soft_get('type') == 'Interpolate'
|
|
axes = Interpolate.get_axes(interpolate)
|
|
input_shape = interpolate.in_port(0).data.get_shape()
|
|
output_shape = interpolate.out_port(0).data.get_shape()
|
|
if not np.all(np.remainder(output_shape, input_shape) == 0) and \
|
|
not np.all(np.remainder(input_shape, output_shape) == 0):
|
|
return
|
|
graph = interpolate.graph
|
|
name = interpolate.soft_get('name', interpolate.id)
|
|
shape = Shape(graph, {'name': name + '/ShapeOf'}).create_node()
|
|
shape.in_port(0).connect(interpolate.in_port(0).get_source())
|
|
gather = create_op_with_const_inputs(graph, Gather, {1: np.array(axes, dtype=np.int32), 2: int64_array(0)},
|
|
{'name': shape.name + '/Gathered'}, shape)
|
|
multipliers = output_shape[axes] / input_shape[axes]
|
|
mul = create_op_node_with_second_input(graph, Mul, multipliers, {'name': gather.name + '/Multiplied'}, gather)
|
|
interpolate.in_port(1).get_connection().set_source(mul.out_port(0))
|
|
|
|
def find_and_replace_pattern(self, graph: Graph):
|
|
for interpolate in graph.get_op_nodes(type='Interpolate'):
|
|
if interpolate.in_port(1).get_source().node.soft_get('type') == 'Const':
|
|
self.make_interpolate_reshapeable(interpolate)
|