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/comparison/greater_equal | |
| 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/comparison/greater_equal')
13 files changed, 587 insertions, 522 deletions
diff --git a/operators/comparison/greater_equal/greater_equal_1x2x65533x1_i32/test.json b/operators/comparison/greater_equal/greater_equal_1x2x65533x1_i32/test.json index a2dd230c4..a5c12cef1 100644 --- a/operators/comparison/greater_equal/greater_equal_1x2x65533x1_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_1x2x65533x1_i32/test.json @@ -5,13 +5,57 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 2, + 65533, + 1 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 1, + 2, + 65533, + 1 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 1, + 2, + 65533, + 1 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,45 +64,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 2, - 65533, - 1 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 1, - 2, - 65533, - 1 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 1, - 2, - 65533, - 1 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_1x65539x1x3x1_i32/test.json b/operators/comparison/greater_equal/greater_equal_1x65539x1x3x1_i32/test.json index 9e68462ba..10c406d48 100644 --- a/operators/comparison/greater_equal/greater_equal_1x65539x1x3x1_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_1x65539x1x3x1_i32/test.json @@ -5,13 +5,60 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 65539, + 1, + 3, + 1 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 1, + 65539, + 1, + 3, + 1 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 1, + 65539, + 1, + 3, + 1 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,48 +67,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 65539, - 1, - 3, - 1 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 1, - 65539, - 1, - 3, - 1 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 1, - 65539, - 1, - 3, - 1 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_23_i32/test.json b/operators/comparison/greater_equal/greater_equal_23_i32/test.json index 57e77d4b4..05698b64a 100644 --- a/operators/comparison/greater_equal/greater_equal_23_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_23_i32/test.json @@ -5,13 +5,48 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 23 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 1 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 23 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,36 +55,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 23 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 1 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 23 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_23x1x28_i32/test.json b/operators/comparison/greater_equal/greater_equal_23x1x28_i32/test.json index 38e0e1cfd..39f902121 100644 --- a/operators/comparison/greater_equal/greater_equal_23x1x28_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_23x1x28_i32/test.json @@ -5,13 +5,54 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 23, + 1, + 28 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 23, + 50, + 28 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 23, + 50, + 28 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,42 +61,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 23, - 1, - 28 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 23, - 50, - 28 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 23, - 50, - 28 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_2x14x4x2x11_i32/test.json b/operators/comparison/greater_equal/greater_equal_2x14x4x2x11_i32/test.json index 913fbf8d5..9b0d0319a 100644 --- a/operators/comparison/greater_equal/greater_equal_2x14x4x2x11_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_2x14x4x2x11_i32/test.json @@ -5,13 +5,60 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 2, + 14, + 4, + 2, + 11 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 2, + 14, + 4, + 1, + 11 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 2, + 14, + 4, + 2, + 11 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,48 +67,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 2, - 14, - 4, - 2, - 11 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 2, - 14, - 4, - 1, - 11 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 2, - 14, - 4, - 2, - 11 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_2x15x13x1_i32/test.json b/operators/comparison/greater_equal/greater_equal_2x15x13x1_i32/test.json index b92d3ff06..bf3b563b1 100644 --- a/operators/comparison/greater_equal/greater_equal_2x15x13x1_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_2x15x13x1_i32/test.json @@ -5,13 +5,57 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 2, + 15, + 13, + 1 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 2, + 15, + 13, + 9 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 2, + 15, + 13, + 9 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,45 +64,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 2, - 15, - 13, - 1 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 2, - 15, - 13, - 9 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 2, - 15, - 13, - 9 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_48x1_i32/test.json b/operators/comparison/greater_equal/greater_equal_48x1_i32/test.json index 8a4dec438..bb29b649c 100644 --- a/operators/comparison/greater_equal/greater_equal_48x1_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_48x1_i32/test.json @@ -5,13 +5,51 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 48, + 1 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 48, + 39 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 48, + 39 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,39 +58,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 48, - 1 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 48, - 39 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 48, - 39 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_ERRORIF_DimensionMismatch_12_i32/test.json b/operators/comparison/greater_equal/greater_equal_ERRORIF_DimensionMismatch_12_i32/test.json index be33e9813..869c232c0 100644 --- a/operators/comparison/greater_equal/greater_equal_ERRORIF_DimensionMismatch_12_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_ERRORIF_DimensionMismatch_12_i32/test.json @@ -5,13 +5,48 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 12 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 13 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 12 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,36 +55,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 13 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 12 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_ERRORIF_RankMismatch_13x2_i32/test.json b/operators/comparison/greater_equal/greater_equal_ERRORIF_RankMismatch_13x2_i32/test.json index e15a5f792..8f3afd249 100644 --- a/operators/comparison/greater_equal/greater_equal_ERRORIF_RankMismatch_13x2_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_ERRORIF_RankMismatch_13x2_i32/test.json @@ -5,13 +5,50 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 13, + 2 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 13 + ], + type: "INT32" + }, + { + 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: "INT32" - }, - { - name: "input-1", - shape: [ - 13 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 13, - 2 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputList_11x5x12x9_i32/test.json b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputList_11x5x12x9_i32/test.json index 9ea05f728..e6006a594 100644 --- a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputList_11x5x12x9_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputList_11x5x12x9_i32/test.json @@ -5,59 +5,64 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 11, + 5, + 12, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 11, + 1, + 12, + 9 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 11, + 5, + 12, + 9 + ], + type: "BOOL" + } + ], inputs: [ - "input-0" + "input-0", + "input-1" ], outputs: [ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 11, - 5, - 12, - 9 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 11, - 1, - 12, - 9 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 11, - 5, - 12, - 9 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputType_14x11x12_i4/test.json b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputType_14x11x12_i4/test.json index a48ddc3c0..3a1eee274 100644 --- a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputType_14x11x12_i4/test.json +++ b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongInputType_14x11x12_i4/test.json @@ -5,13 +5,54 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 14, + 11, + 12 + ], + type: "INT4" + }, + { + name: "input-1", + shape: [ + 14, + 11, + 1 + ], + type: "INT4" + }, + { + name: "result-0", + shape: [ + 14, + 11, + 12 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" @@ -20,42 +61,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 14, - 11, - 12 - ], - type: "INT4" - }, - { - name: "input-1", - shape: [ - 14, - 11, - 1 - ], - type: "INT4" - }, - { - name: "result-0", - shape: [ - 14, - 11, - 12 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputList_10x8x13x9_i32/test.json b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputList_10x8x13x9_i32/test.json index f4bb49ff7..de3a2fd3d 100644 --- a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputList_10x8x13x9_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputList_10x8x13x9_i32/test.json @@ -5,61 +5,66 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0", + "eiDummyOutput" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 10, + 8, + 13, + 9 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 1, + 8, + 13, + 9 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 10, + 8, + 13, + 9 + ], + type: "BOOL" + } + ], inputs: [ "input-0", "input-1" ], outputs: [ - "result-0", - "eiDummyOutput" + "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 10, - 8, - 13, - 9 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 1, - 8, - 13, - 9 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 10, - 8, - 13, - 9 - ], - type: "BOOL" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputType_12_i32/test.json b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputType_12_i32/test.json index 51f3eb34a..2439315bc 100644 --- a/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputType_12_i32/test.json +++ b/operators/comparison/greater_equal/greater_equal_ERRORIF_WrongOutputType_12_i32/test.json @@ -5,13 +5,48 @@ _patch: 0, _draft: true }, - blocks: [ + regions: [ { name: "main", - operators: [ + blocks: [ { - op: "GREATER_EQUAL", - attribute_type: "NONE", + name: "main", + operators: [ + { + op: "GREATER_EQUAL", + attribute_type: "NONE", + inputs: [ + "input-0", + "input-1" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 12 + ], + type: "INT32" + }, + { + name: "input-1", + shape: [ + 1 + ], + type: "INT32" + }, + { + name: "result-0", + shape: [ + 12 + ], + type: "INT48" + } + ], inputs: [ "input-0", "input-1" @@ -20,36 +55,6 @@ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 12 - ], - type: "INT32" - }, - { - name: "input-1", - shape: [ - 1 - ], - type: "INT32" - }, - { - name: "result-0", - shape: [ - 12 - ], - type: "INT48" - } - ], - inputs: [ - "input-0", - "input-1" - ], - outputs: [ - "result-0" ] } ] |