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/ew_binary/logical_or | |
| 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/ew_binary/logical_or')
13 files changed, 592 insertions, 527 deletions
diff --git a/operators/ew_binary/logical_or/logical_or_1x2x1x65537_b/test.json b/operators/ew_binary/logical_or/logical_or_1x2x1x65537_b/test.json index ae9745cb8..26bad320f 100644 --- a/operators/ew_binary/logical_or/logical_or_1x2x1x65537_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_1x2x1x65537_b/test.json @@ -5,13 +5,57 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 2, + 1, + 65537 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 1, + 1, + 1, + 65537 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 1, + 2, + 1, + 65537 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,45 +64,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 2, - 1, - 65537 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 1, - 1, - 1, - 65537 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 1, - 2, - 1, - 65537 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_1x65536x1_b/test.json b/operators/ew_binary/logical_or/logical_or_1x65536x1_b/test.json index 6123de7b5..814b795a1 100644 --- a/operators/ew_binary/logical_or/logical_or_1x65536x1_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_1x65536x1_b/test.json @@ -5,13 +5,54 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 65536, + 1 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 1, + 65536, + 1 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 1, + 65536, + 1 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,42 +61,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 65536, - 1 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 1, - 65536, - 1 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 1, - 65536, - 1 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_2x10x3x2x7_b/test.json b/operators/ew_binary/logical_or/logical_or_2x10x3x2x7_b/test.json index 42fa5d7d3..ad8bd98ca 100644 --- a/operators/ew_binary/logical_or/logical_or_2x10x3x2x7_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_2x10x3x2x7_b/test.json @@ -5,13 +5,60 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 2, + 10, + 3, + 2, + 7 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 2, + 10, + 3, + 1, + 7 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 2, + 10, + 3, + 2, + 7 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,48 +67,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 2, - 10, - 3, - 2, - 7 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 2, - 10, - 3, - 1, - 7 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 2, - 10, - 3, - 2, - 7 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_2x11x9x1_b/test.json b/operators/ew_binary/logical_or/logical_or_2x11x9x1_b/test.json index 280852053..7332a9a52 100644 --- a/operators/ew_binary/logical_or/logical_or_2x11x9x1_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_2x11x9x1_b/test.json @@ -5,13 +5,57 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 2, + 11, + 9, + 1 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 2, + 11, + 9, + 6 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 2, + 11, + 9, + 6 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,45 +64,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 2, - 11, - 9, - 1 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 2, - 11, - 9, - 6 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 2, - 11, - 9, - 6 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_42x1_b/test.json b/operators/ew_binary/logical_or/logical_or_42x1_b/test.json index 21efa37c9..4438b5571 100644 --- a/operators/ew_binary/logical_or/logical_or_42x1_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_42x1_b/test.json @@ -5,13 +5,51 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 42, + 1 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 42, + 29 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 42, + 29 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,39 +58,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 42, - 1 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 42, - 29 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 42, - 29 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_8_b/test.json b/operators/ew_binary/logical_or/logical_or_8_b/test.json index edf9221ef..928623c3d 100644 --- a/operators/ew_binary/logical_or/logical_or_8_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_8_b/test.json @@ -5,13 +5,48 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 8 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 1 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 8 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,36 +55,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 8 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 1 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 8 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_8x1x15_b/test.json b/operators/ew_binary/logical_or/logical_or_8x1x15_b/test.json index c30584059..7ff96d7eb 100644 --- a/operators/ew_binary/logical_or/logical_or_8x1x15_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_8x1x15_b/test.json @@ -5,13 +5,54 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 8, + 1, + 15 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 8, + 45, + 15 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 8, + 45, + 15 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,42 +61,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 8, - 1, - 15 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 8, - 45, - 15 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 8, - 45, - 15 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_ERRORIF_DimensionMismatch_11x7x11x3_b/test.json b/operators/ew_binary/logical_or/logical_or_ERRORIF_DimensionMismatch_11x7x11x3_b/test.json index d64a6460b..e95c0f90d 100644 --- a/operators/ew_binary/logical_or/logical_or_ERRORIF_DimensionMismatch_11x7x11x3_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_ERRORIF_DimensionMismatch_11x7x11x3_b/test.json @@ -5,13 +5,57 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 11, + 7, + 11, + 3 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 11, + 7, + 11, + 4 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 11, + 7, + 11, + 3 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,45 +64,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 11, - 7, - 11, - 3 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 11, - 7, - 11, - 4 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 11, - 7, - 11, - 3 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_ERRORIF_RankMismatch_13x2_b/test.json b/operators/ew_binary/logical_or/logical_or_ERRORIF_RankMismatch_13x2_b/test.json index 2ca2caea4..482e11a71 100644 --- a/operators/ew_binary/logical_or/logical_or_ERRORIF_RankMismatch_13x2_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_ERRORIF_RankMismatch_13x2_b/test.json @@ -5,13 +5,50 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 13, + 2 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 13 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 13, + 2 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,38 +57,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 13, - 2 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 13 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 13, - 2 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputList_13x1x13x5_b/test.json b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputList_13x1x13x5_b/test.json index ea1719415..f20b8beb2 100644 --- a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputList_13x1x13x5_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputList_13x1x13x5_b/test.json @@ -5,59 +5,64 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 13, + 1, + 13, + 5 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 13, + 1, + 13, + 1 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 13, + 1, + 13, + 5 + ], + type: "BOOL" + } + ], inputs: [ - "input-0" + "input-0", + "input-1" ], outputs: [ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 13, - 1, - 13, - 5 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 13, - 1, - 13, - 1 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 13, - 1, - 13, - 5 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputType_5x12x13x7_i4/test.json b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputType_5x12x13x7_i4/test.json index b072500d2..e46d7b739 100644 --- a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputType_5x12x13x7_i4/test.json +++ b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongInputType_5x12x13x7_i4/test.json @@ -5,13 +5,57 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 5, + 12, + 13, + 7 + ], + type: "INT4" + }, + { + name: "input-1", + shape: [ + 5, + 12, + 13, + 1 + ], + type: "INT4" + }, + { + name: "result-0", + shape: [ + 5, + 12, + 13, + 7 + ], + type: "INT4" + } + ], inputs: [ "input-0", "input-1" @@ -20,45 +64,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 5, - 12, - 13, - 7 - ], - type: "INT4" - }, - { - name: "input-1", - shape: [ - 5, - 12, - 13, - 1 - ], - type: "INT4" - }, - { - name: "result-0", - shape: [ - 5, - 12, - 13, - 7 - ], - type: "INT4" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputList_10x7x7x7_b/test.json b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputList_10x7x7x7_b/test.json index e53dc6efe..abf52468c 100644 --- a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputList_10x7x7x7_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputList_10x7x7x7_b/test.json @@ -5,60 +5,65 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 10, + 7, + 7, + 7 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 10, + 7, + 7, + 1 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 10, + 7, + 7, + 7 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" ], outputs: [ - + "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10, - 7, - 7, - 7 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 10, - 7, - 7, - 1 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 10, - 7, - 7, - 7 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputType_12_b/test.json b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputType_12_b/test.json index fbd739960..780fb8962 100644 --- a/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputType_12_b/test.json +++ b/operators/ew_binary/logical_or/logical_or_ERRORIF_WrongOutputType_12_b/test.json @@ -5,13 +5,48 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "LOGICAL_OR", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "LOGICAL_OR", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 12 + ], + type: "BOOL" + }, + { + name: "input-1", + shape: [ + 1 + ], + type: "BOOL" + }, + { + name: "result-0", + shape: [ + 12 + ], + type: "FP32" + } + ], inputs: [ "input-0", "input-1" @@ -20,36 +55,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12 - ], - type: "BOOL" - }, - { - name: "input-1", - shape: [ - 1 - ], - type: "BOOL" - }, - { - name: "result-0", - shape: [ - 12 - ], - type: "FP32" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] |