diff options
author | Jeremy Johnson <jeremy.johnson@arm.com> | 2023-01-16 15:17:52 +0000 |
---|---|---|
committer | Jeremy Johnson <jeremy.johnson@arm.com> | 2023-01-16 16:40:57 +0000 |
commit | b08fb3e856b7757403ff9aafc9487f9c0ad61fe7 (patch) | |
tree | 4b4737ff52e92c1c17922a972384930953a26a61 /operators/control_flow/cond_if_binary | |
parent | 007a2c7c0743b002587cd5e7b4c6b6acbcaedff8 (diff) | |
download | conformance_tests-b08fb3e856b7757403ff9aafc9487f9c0ad61fe7.tar.gz |
Regen tests after control flow operator support
Includes removing 3 tests that are not needed anymore.
Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: I2c62d95a7b053e9016000d90125e00862f94200e
Diffstat (limited to 'operators/control_flow/cond_if_binary')
19 files changed, 2754 insertions, 2659 deletions
diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_12x59x50x41_i16_cond1/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_12x59x50x41_i16_cond1/test.json index e0ea8cc1d..d67f33c1d 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_12x59x50x41_i16_cond1/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_12x59x50x41_i16_cond1/test.json @@ -5,93 +5,137 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 1 + ] + }, + { + name: "result-0", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12, - 59, - 50, - 41 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 12, - 59, - 50, - 41 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT16" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 1 - ] - }, - { - name: "result-0", - shape: [ - 12, - 59, - 50, - 41 + tensors: [ + { + name: "input-0", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + }, + { + name: "result-1", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -99,54 +143,54 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12, - 59, - 50, - 41 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 12, - 59, - 50, - 41 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT16" - }, - { - name: "result-1", - shape: [ - 12, - 59, - 50, - 41 + tensors: [ + { + name: "input-0", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + }, + { + name: "result-2", + shape: [ + 12, + 59, + 50, + 41 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -155,45 +199,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12, - 59, - 50, - 41 - ], - type: "INT16" - }, - { - name: "input-1", - shape: [ - 12, - 59, - 50, - 41 - ], - type: "INT16" - }, - { - name: "result-2", - shape: [ - 12, - 59, - 50, - 41 - ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_26x52x35x28_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_26x52x35x28_i32_cond0/test.json index 8e32414e9..c1a5aabc0 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_26x52x35x28_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_26x52x35x28_i32_cond0/test.json @@ -5,93 +5,137 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 26, - 52, - 35, - 28 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 26, - 52, - 35, - 28 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 26, - 52, - 35, - 28 + tensors: [ + { + name: "input-0", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -99,54 +143,54 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 26, - 52, - 35, - 28 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 26, - 52, - 35, - 28 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 26, - 52, - 35, - 28 + tensors: [ + { + name: "input-0", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 26, + 52, + 35, + 28 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -155,45 +199,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 26, - 52, - 35, - 28 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 26, - 52, - 35, - 28 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 26, - 52, - 35, - 28 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_28x28_i8_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_28x28_i8_cond0/test.json index 980f72816..ac7205637 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_28x28_i8_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_28x28_i8_cond0/test.json @@ -5,87 +5,125 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 28, + 28 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 28, + 28 + ], + type: "INT8" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 28, + 28 + ], + type: "INT8" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 28, - 28 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 28, - 28 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT8" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 28, - 28 + tensors: [ + { + name: "input-0", + shape: [ + 28, + 28 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 28, + 28 + ], + type: "INT8" + }, + { + name: "result-1", + shape: [ + 28, + 28 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -93,48 +131,48 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 28, - 28 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 28, - 28 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT8" - }, - { - name: "result-1", - shape: [ - 28, - 28 + tensors: [ + { + name: "input-0", + shape: [ + 28, + 28 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 28, + 28 + ], + type: "INT8" + }, + { + name: "result-2", + shape: [ + 28, + 28 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -143,39 +181,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 28, - 28 - ], - type: "INT8" - }, - { - name: "input-1", - shape: [ - 28, - 28 - ], - type: "INT8" - }, - { - name: "result-2", - shape: [ - 28, - 28 - ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_3x22x17x1x2_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_3x22x17x1x2_i32_cond0/test.json index 05b57716e..57524e45e 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_3x22x17x1x2_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_3x22x17x1x2_i32_cond0/test.json @@ -5,96 +5,143 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 3, - 22, - 17, - 1, - 2 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 3, - 22, - 17, - 1, - 2 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 3, - 22, - 17, - 1, - 2 + tensors: [ + { + name: "input-0", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -102,57 +149,57 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 3, - 22, - 17, - 1, - 2 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 3, - 22, - 17, - 1, - 2 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 3, - 22, - 17, - 1, - 2 + tensors: [ + { + name: "input-0", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 3, + 22, + 17, + 1, + 2 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -161,48 +208,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 3, - 22, - 17, - 1, - 2 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 3, - 22, - 17, - 1, - 2 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 3, - 22, - 17, - 1, - 2 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_42_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_42_i32_cond0/test.json index b85201a2a..f3e6d825c 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_42_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_42_i32_cond0/test.json @@ -5,84 +5,119 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 42 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 42 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 42 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 42 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 42 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 42 + tensors: [ + { + name: "input-0", + shape: [ + 42 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 42 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 42 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -90,45 +125,45 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 42 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 42 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 42 + tensors: [ + { + name: "input-0", + shape: [ + 42 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 42 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 42 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -137,36 +172,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 42 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 42 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 42 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_44x13_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_44x13_i32_cond0/test.json index d871b1600..3f8cfc8b0 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_44x13_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_44x13_i32_cond0/test.json @@ -5,87 +5,125 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 44, + 13 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 44, + 13 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 44, + 13 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 44, - 13 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 44, - 13 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 44, - 13 + tensors: [ + { + name: "input-0", + shape: [ + 44, + 13 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 44, + 13 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 44, + 13 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -93,48 +131,48 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 44, - 13 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 44, - 13 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 44, - 13 + tensors: [ + { + name: "input-0", + shape: [ + 44, + 13 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 44, + 13 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 44, + 13 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -143,39 +181,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 44, - 13 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 44, - 13 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 44, - 13 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json index 45e1f4256..3d10796d5 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json @@ -5,90 +5,131 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 47, - 48, - 46 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 47, - 48, - 46 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT16" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 47, - 48, - 46 + tensors: [ + { + name: "input-0", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + }, + { + name: "result-1", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -96,51 +137,51 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 47, - 48, - 46 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 47, - 48, - 46 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT16" - }, - { - name: "result-1", - shape: [ - 47, - 48, - 46 + tensors: [ + { + name: "input-0", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + }, + { + name: "result-2", + shape: [ + 47, + 48, + 46 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -149,42 +190,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 47, - 48, - 46 - ], - type: "INT16" - }, - { - name: "input-1", - shape: [ - 47, - 48, - 46 - ], - type: "INT16" - }, - { - name: "result-2", - shape: [ - 47, - 48, - 46 - ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_49_i16_cond1/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_49_i16_cond1/test.json index 037267bc5..b8e80bee1 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_49_i16_cond1/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_49_i16_cond1/test.json @@ -5,84 +5,119 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 49 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 49 + ], + type: "INT16" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 1 + ] + }, + { + name: "result-0", + shape: [ + 49 + ], + type: "INT16" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 49 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 49 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT16" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 1 - ] - }, - { - name: "result-0", - shape: [ - 49 + tensors: [ + { + name: "input-0", + shape: [ + 49 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 49 + ], + type: "INT16" + }, + { + name: "result-1", + shape: [ + 49 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -90,45 +125,45 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 49 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 49 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT16" - }, - { - name: "result-1", - shape: [ - 49 + tensors: [ + { + name: "input-0", + shape: [ + 49 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 49 + ], + type: "INT16" + }, + { + name: "result-2", + shape: [ + 49 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -137,36 +172,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 49 - ], - type: "INT16" - }, - { - name: "input-1", - shape: [ - 49 - ], - type: "INT16" - }, - { - name: "result-2", - shape: [ - 49 - ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_50x33x9_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_50x33x9_i32_cond0/test.json index 07b8d5b3b..3c05d99d3 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_50x33x9_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_50x33x9_i32_cond0/test.json @@ -5,90 +5,131 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 50, - 33, - 9 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 50, - 33, - 9 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 50, - 33, - 9 + tensors: [ + { + name: "input-0", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -96,51 +137,51 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 50, - 33, - 9 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 50, - 33, - 9 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 50, - 33, - 9 + tensors: [ + { + name: "input-0", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 50, + 33, + 9 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -149,42 +190,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 50, - 33, - 9 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 50, - 33, - 9 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 50, - 33, - 9 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_53x29x32x24_i8_cond1/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_53x29x32x24_i8_cond1/test.json index bf43cf87e..850e160a8 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_53x29x32x24_i8_cond1/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_53x29x32x24_i8_cond1/test.json @@ -5,93 +5,137 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 1 + ] + }, + { + name: "result-0", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 53, - 29, - 32, - 24 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 53, - 29, - 32, - 24 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT8" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 1 - ] - }, - { - name: "result-0", - shape: [ - 53, - 29, - 32, - 24 + tensors: [ + { + name: "input-0", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + }, + { + name: "result-1", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -99,54 +143,54 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 53, - 29, - 32, - 24 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 53, - 29, - 32, - 24 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT8" - }, - { - name: "result-1", - shape: [ - 53, - 29, - 32, - 24 + tensors: [ + { + name: "input-0", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + }, + { + name: "result-2", + shape: [ + 53, + 29, + 32, + 24 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -155,45 +199,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 53, - 29, - 32, - 24 - ], - type: "INT8" - }, - { - name: "input-1", - shape: [ - 53, - 29, - 32, - 24 - ], - type: "INT8" - }, - { - name: "result-2", - shape: [ - 53, - 29, - 32, - 24 - ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_55x6_i16_cond1/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_55x6_i16_cond1/test.json index cc69ed4ad..89b21009b 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_55x6_i16_cond1/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_55x6_i16_cond1/test.json @@ -5,87 +5,125 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 55, + 6 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 55, + 6 + ], + type: "INT16" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 1 + ] + }, + { + name: "result-0", + shape: [ + 55, + 6 + ], + type: "INT16" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 55, - 6 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 55, - 6 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT16" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 1 - ] - }, - { - name: "result-0", - shape: [ - 55, - 6 + tensors: [ + { + name: "input-0", + shape: [ + 55, + 6 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 55, + 6 + ], + type: "INT16" + }, + { + name: "result-1", + shape: [ + 55, + 6 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -93,48 +131,48 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 55, - 6 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 55, - 6 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT16" - }, - { - name: "result-1", - shape: [ - 55, - 6 + tensors: [ + { + name: "input-0", + shape: [ + 55, + 6 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 55, + 6 + ], + type: "INT16" + }, + { + name: "result-2", + shape: [ + 55, + 6 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -143,39 +181,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 55, - 6 - ], - type: "INT16" - }, - { - name: "input-1", - shape: [ - 55, - 6 - ], - type: "INT16" - }, - { - name: "result-2", - shape: [ - 55, - 6 - ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_6_i8_cond1/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_6_i8_cond1/test.json index 4f87ca9d6..0d85e47f8 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_6_i8_cond1/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_6_i8_cond1/test.json @@ -5,84 +5,119 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 6 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 6 + ], + type: "INT8" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 1 + ] + }, + { + name: "result-0", + shape: [ + 6 + ], + type: "INT8" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 6 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 6 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT8" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 1 - ] - }, - { - name: "result-0", - shape: [ - 6 + tensors: [ + { + name: "input-0", + shape: [ + 6 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 6 + ], + type: "INT8" + }, + { + name: "result-1", + shape: [ + 6 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -90,45 +125,45 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 6 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 6 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT8" - }, - { - name: "result-1", - shape: [ - 6 + tensors: [ + { + name: "input-0", + shape: [ + 6 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 6 + ], + type: "INT8" + }, + { + name: "result-2", + shape: [ + 6 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -137,36 +172,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 6 - ], - type: "INT8" - }, - { - name: "input-1", - shape: [ - 6 - ], - type: "INT8" - }, - { - name: "result-2", - shape: [ - 6 - ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_6x34x62_i8_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_6x34x62_i8_cond0/test.json index 4527a2e4d..a9b83caf2 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_6x34x62_i8_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_6x34x62_i8_cond0/test.json @@ -5,90 +5,131 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 6, - 34, - 62 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 6, - 34, - 62 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT8" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 6, - 34, - 62 + tensors: [ + { + name: "input-0", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + }, + { + name: "result-1", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -96,51 +137,51 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 6, - 34, - 62 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 6, - 34, - 62 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT8" - }, - { - name: "result-1", - shape: [ - 6, - 34, - 62 + tensors: [ + { + name: "input-0", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + }, + { + name: "result-2", + shape: [ + 6, + 34, + 62 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -149,42 +190,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 6, - 34, - 62 - ], - type: "INT8" - }, - { - name: "input-1", - shape: [ - 6, - 34, - 62 - ], - type: "INT8" - }, - { - name: "result-2", - shape: [ - 6, - 34, - 62 - ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondNotMatchingBool_12x9_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondNotMatchingBool_12x9_i32_cond0/test.json index a4670dd2c..45a7b5f67 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondNotMatchingBool_12x9_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondNotMatchingBool_12x9_i32_cond0/test.json @@ -5,90 +5,128 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 12, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 12, + 9 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "FP32", + data: [ + 0, + 0, + 0, + 0 + ] + }, + { + name: "result-0", + shape: [ + 12, + 9 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12, - 9 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 12, - 9 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "FP32", - data: [ - 0, - 0, - 0, - 0 - ] - }, - { - name: "result-0", - shape: [ - 12, - 9 + tensors: [ + { + name: "input-0", + shape: [ + 12, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 12, + 9 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 12, + 9 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -96,48 +134,48 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12, - 9 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 12, - 9 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 12, - 9 + tensors: [ + { + name: "input-0", + shape: [ + 12, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 12, + 9 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 12, + 9 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -146,39 +184,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12, - 9 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 12, - 9 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 12, - 9 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondShapeNotSizeOne_10x2_i16_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondShapeNotSizeOne_10x2_i16_cond0/test.json index f4d4bd27e..787b0f6c6 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondShapeNotSizeOne_10x2_i16_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfCondShapeNotSizeOne_10x2_i16_cond0/test.json @@ -5,87 +5,125 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 10, + 2 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 10, + 2 + ], + type: "INT16" + }, + { + name: "const-2", + shape: [ + 2 + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 10, + 2 + ], + type: "INT16" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10, - 2 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 10, - 2 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT16" - }, - { - name: "const-2", - shape: [ - 2 - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 10, - 2 + tensors: [ + { + name: "input-0", + shape: [ + 10, + 2 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 10, + 2 + ], + type: "INT16" + }, + { + name: "result-1", + shape: [ + 10, + 2 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -93,48 +131,48 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10, - 2 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 10, - 2 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT16" - }, - { - name: "result-1", - shape: [ - 10, - 2 + tensors: [ + { + name: "input-0", + shape: [ + 10, + 2 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 10, + 2 + ], + type: "INT16" + }, + { + name: "result-2", + shape: [ + 10, + 2 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -143,39 +181,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10, - 2 - ], - type: "INT16" - }, - { - name: "input-1", - shape: [ - 10, - 2 - ], - type: "INT16" - }, - { - name: "result-2", - shape: [ - 10, - 2 - ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListElseGraphMismatch_10x3x12_i8_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListElseGraphMismatch_10x3x12_i8_cond0/test.json index aaeadd994..bbb511e6f 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListElseGraphMismatch_10x3x12_i8_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListElseGraphMismatch_10x3x12_i8_cond0/test.json @@ -5,90 +5,131 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10, - 3, - 12 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 10, - 3, - 12 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT8" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 10, - 3, - 12 + tensors: [ + { + name: "input-0", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + }, + { + name: "result-1", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -96,51 +137,51 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10, - 3, - 12 - ], - type: "INT8" }, { - name: "input-1", - shape: [ - 10, - 3, - 12 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT8" - }, - { - name: "result-1", - shape: [ - 10, - 3, - 12 + tensors: [ + { + name: "input-0", + shape: [ + 7, + 6, + 14 + ], + type: "INT8" + }, + { + name: "input-1", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + }, + { + name: "result-2", + shape: [ + 10, + 3, + 12 + ], + type: "INT8" + } ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -149,42 +190,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 7, - 6, - 14 - ], - type: "INT8" - }, - { - name: "input-1", - shape: [ - 10, - 3, - 12 - ], - type: "INT8" - }, - { - name: "result-2", - shape: [ - 10, - 3, - 12 - ], - type: "INT8" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListThenGraphMismatch_10_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListThenGraphMismatch_10_i32_cond0/test.json index 5f420e943..20f44f560 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListThenGraphMismatch_10_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfInputListThenGraphMismatch_10_i32_cond0/test.json @@ -5,84 +5,119 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 10 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 10 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 10 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 10 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 10 + tensors: [ + { + name: "input-0", + shape: [ + 8 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 10 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 10 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -90,45 +125,45 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 8 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 10 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 10 + tensors: [ + { + name: "input-0", + shape: [ + 10 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 10 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 10 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -137,36 +172,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 10 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 10 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListElseGraphMismatch_11x10_i32_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListElseGraphMismatch_11x10_i32_cond0/test.json index b66e174af..3792e7e28 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListElseGraphMismatch_11x10_i32_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListElseGraphMismatch_11x10_i32_cond0/test.json @@ -5,87 +5,125 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 11, + 10 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 11, + 10 + ], + type: "INT32" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 11, + 10 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 11, - 10 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 11, - 10 + name: "THEN_BLOCK", + operators: [ + { + op: "ADD", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT32" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 11, - 10 + tensors: [ + { + name: "input-0", + shape: [ + 11, + 10 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 11, + 10 + ], + type: "INT32" + }, + { + name: "result-1", + shape: [ + 11, + 10 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "ADD", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -93,48 +131,48 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 11, - 10 - ], - type: "INT32" }, { - name: "input-1", - shape: [ - 11, - 10 + name: "ELSE_BLOCK", + operators: [ + { + op: "SUB", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT32" - }, - { - name: "result-1", - shape: [ - 11, - 10 + tensors: [ + { + name: "input-0", + shape: [ + 11, + 10 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 11, + 10 + ], + type: "INT32" + }, + { + name: "result-2", + shape: [ + 9, + 13 + ], + type: "INT32" + } ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "SUB", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -143,39 +181,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 11, - 10 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 11, - 10 - ], - type: "INT32" - }, - { - name: "result-2", - shape: [ - 9, - 13 - ], - type: "INT32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListThenGraphMismatch_12_i16_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListThenGraphMismatch_12_i16_cond0/test.json index 01732fbe9..8767ed972 100644 --- a/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListThenGraphMismatch_12_i16_cond0/test.json +++ b/operators/control_flow/cond_if_binary/cond_if_binary_ERRORIF_CondIfOutputListThenGraphMismatch_12_i16_cond0/test.json @@ -5,84 +5,119 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "CONST", - attribute_type: "NONE", - inputs: [ + name: "main", + operators: [ + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "COND_IF", + attribute_type: "CondIfAttribute", + attribute: { + then_branch: "THEN_BLOCK", + else_branch: "ELSE_BLOCK" + }, + inputs: [ + "const-2", + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 12 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 12 + ], + type: "INT16" + }, + { + name: "const-2", + shape: [ + + ], + type: "BOOL", + data: [ + 0 + ] + }, + { + name: "result-0", + shape: [ + 12 + ], + type: "INT16" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "COND_IF", - attribute_type: "CondIfAttribute", - attribute: { - then_branch: "THEN_BLOCK", - else_branch: "ELSE_BLOCK" - }, inputs: [ - "const-2", "input-0", "input-1" ], outputs: [ "result-0" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 12 + name: "THEN_BLOCK", + operators: [ + { + op: "LOGICAL_RIGHT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-1" + ] + } ], - type: "INT16" - }, - { - name: "const-2", - shape: [ - - ], - type: "BOOL", - data: [ - 0 - ] - }, - { - name: "result-0", - shape: [ - 12 + tensors: [ + { + name: "input-0", + shape: [ + 12 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 12 + ], + type: "INT16" + }, + { + name: "result-1", + shape: [ + 15 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" - ] - }, - { - name: "THEN_BLOCK", - operators: [ - { - op: "LOGICAL_RIGHT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -90,45 +125,45 @@ outputs: [ "result-1" ] - } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12 - ], - type: "INT16" }, { - name: "input-1", - shape: [ - 12 + name: "ELSE_BLOCK", + operators: [ + { + op: "LOGICAL_LEFT_SHIFT", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-2" + ] + } ], - type: "INT16" - }, - { - name: "result-1", - shape: [ - 15 + tensors: [ + { + name: "input-0", + shape: [ + 12 + ], + type: "INT16" + }, + { + name: "input-1", + shape: [ + 12 + ], + type: "INT16" + }, + { + name: "result-2", + shape: [ + 12 + ], + type: "INT16" + } ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-1" - ] - }, - { - name: "ELSE_BLOCK", - operators: [ - { - op: "LOGICAL_LEFT_SHIFT", - attribute_type: "NONE", inputs: [ "input-0", "input-1" @@ -137,36 +172,6 @@ "result-2" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12 - ], - type: "INT16" - }, - { - name: "input-1", - shape: [ - 12 - ], - type: "INT16" - }, - { - name: "result-2", - shape: [ - 12 - ], - type: "INT16" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-2" ] } ] |