diff --git a/src/tflite-metadata.json b/src/tflite-metadata.json index e8602668b6..530a41dba6 100644 --- a/src/tflite-metadata.json +++ b/src/tflite-metadata.json @@ -12,9 +12,9 @@ { "name": "output", "type": "T" } ], "attributes": [ - { "name": "padding", "type": "Padding" }, - { "name": "stride_w", "type": "int" }, - { "name": "stride_h", "type": "int" }, + { "name": "padding", "type": "Padding", "default": "SAME" }, + { "name": "stride_w", "type": "int", "default": 1 }, + { "name": "stride_h", "type": "int", "default": 1 }, { "name": "fused_activation_function", "type": "ActivationFunctionType", "default": "NONE" }, { "name": "dilation_w_factor", "type": "int", "default": 1 }, { "name": "dilation_h_factor", "type": "int", "default": 1 } @@ -105,11 +105,13 @@ { "name": "output", "type": "T" } ], "attributes": [ - { "name": "padding", "type": "Padding" }, - { "name": "stride_w", "type": "int" }, - { "name": "stride_h", "type": "int" }, - { "name": "depth_multiplier", "type": "int" }, - { "name": "fused_activation_function", "type": "ActivationFunctionType", "default": "NONE" } + { "name": "padding", "type": "Padding", "default": "SAME" }, + { "name": "stride_w", "type": "int", "default": 1 }, + { "name": "stride_h", "type": "int", "default": 1 }, + { "name": "depth_multiplier", "type": "int", "default": 1 }, + { "name": "fused_activation_function", "type": "ActivationFunctionType", "default": "NONE" }, + { "name": "dilation_w_factor", "type": "int", "default": 1 }, + { "name": "dilation_h_factor", "type": "int", "default": 1 } ] } }, diff --git a/src/view.js b/src/view.js index bc0e8f30fb..1e0a4b3413 100644 --- a/src/view.js +++ b/src/view.js @@ -566,8 +566,9 @@ class View { } tuple.from = { node: nodeId, - name: output.name - }; + name: output.name, + type: connection.type + }; }); }); @@ -655,6 +656,7 @@ class View { } tuple.from = { node: nodeId, + type: connection.type }; }); var types = input.connections.map(connection => connection.type || '').join('\n'); @@ -689,7 +691,10 @@ class View { if (tuple.from != null) { tuple.to.forEach((to) => { var text = ''; - if (tuple.from.name && to.name) { + if (tuple.from.type && tuple.from.type.shape && tuple.from.type.shape.length > 0) { + text = tuple.from.type.shape.join('\u00D7'); + } + else if (tuple.from.name && to.name) { text = tuple.from.name + ' \u21E8 ' + to.name; } else if (tuple.from.name) {