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/tensor/depthwise_conv2d_1x3 | |
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/tensor/depthwise_conv2d_1x3')
4 files changed, 508 insertions, 488 deletions
diff --git a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x11x33x4_i8xi4_acci32_st11_pad0000_dilat11/test.json b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x11x33x4_i8xi4_acci32_st11_pad0000_dilat11/test.json index 6b4e5082a..7b8b0f787 100644 --- a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x11x33x4_i8xi4_acci32_st11_pad0000_dilat11/test.json +++ b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x11x33x4_i8xi4_acci32_st11_pad0000_dilat11/test.json @@ -5,154 +5,159 @@ _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-1" - ] - }, - { - op: "CONST", - attribute_type: "NONE", - inputs: [ + ], + outputs: [ + "const-1" + ] + }, + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "DEPTHWISE_CONV2D", + attribute_type: "ConvAttribute", + attribute: { + pad: [ + 0, + 0, + 0, + 0 + ], + stride: [ + 1, + 1 + ], + dilation: [ + 1, + 1 + ], + input_zp: 66, + weight_zp: 0, + accum_dtype: "INT32" + }, + inputs: [ + "input-0", + "const-1", + "const-2" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 11, + 33, + 4 + ], + type: "INT8" + }, + { + name: "const-1", + shape: [ + 1, + 3, + 4, + 2 + ], + type: "INT4", + data: [ + 228, + 30, + 209, + 15, + 171, + 160, + 243, + 98, + 164, + 242, + 253, + 241 + ] + }, + { + name: "const-2", + shape: [ + 8 + ], + type: "INT32", + data: [ + 99, + 251, + 172, + 212, + 108, + 128, + 77, + 132, + 115, + 171, + 225, + 189, + 115, + 24, + 44, + 74, + 102, + 22, + 168, + 41, + 37, + 20, + 226, + 200, + 201, + 157, + 91, + 11, + 237, + 130, + 34, + 90 + ] + }, + { + name: "result-0", + shape: [ + 1, + 11, + 31, + 8 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "DEPTHWISE_CONV2D", - attribute_type: "ConvAttribute", - attribute: { - pad: [ - 0, - 0, - 0, - 0 - ], - stride: [ - 1, - 1 - ], - dilation: [ - 1, - 1 - ], - input_zp: 66, - weight_zp: 0, - accum_dtype: "INT32" - }, inputs: [ - "input-0", - "const-1", - "const-2" + "input-0" ], outputs: [ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 11, - 33, - 4 - ], - type: "INT8" - }, - { - name: "const-1", - shape: [ - 1, - 3, - 4, - 2 - ], - type: "INT4", - data: [ - 228, - 30, - 209, - 15, - 171, - 160, - 243, - 98, - 164, - 242, - 253, - 241 - ] - }, - { - name: "const-2", - shape: [ - 8 - ], - type: "INT32", - data: [ - 99, - 251, - 172, - 212, - 108, - 128, - 77, - 132, - 115, - 171, - 225, - 189, - 115, - 24, - 44, - 74, - 102, - 22, - 168, - 41, - 37, - 20, - 226, - 200, - 201, - 157, - 91, - 11, - 237, - 130, - 34, - 90 - ] - }, - { - name: "result-0", - shape: [ - 1, - 11, - 31, - 8 - ], - type: "INT32" - } - ], - inputs: [ - "input-0" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x4x65537x1_i8xi4_acci32_st11_pad1100_dilat11/test.json b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x4x65537x1_i8xi4_acci32_st11_pad1100_dilat11/test.json index f30627bf2..1a9707dea 100644 --- a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x4x65537x1_i8xi4_acci32_st11_pad1100_dilat11/test.json +++ b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x4x65537x1_i8xi4_acci32_st11_pad1100_dilat11/test.json @@ -5,121 +5,126 @@ _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-1" - ] - }, - { - op: "CONST", - attribute_type: "NONE", - inputs: [ + ], + outputs: [ + "const-1" + ] + }, + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "DEPTHWISE_CONV2D", + attribute_type: "ConvAttribute", + attribute: { + pad: [ + 1, + 1, + 0, + 0 + ], + stride: [ + 1, + 1 + ], + dilation: [ + 1, + 1 + ], + input_zp: -69, + weight_zp: 0, + accum_dtype: "INT32" + }, + inputs: [ + "input-0", + "const-1", + "const-2" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 4, + 65537, + 1 + ], + type: "INT8" + }, + { + name: "const-1", + shape: [ + 1, + 3, + 1, + 2 + ], + type: "INT4", + data: [ + 15, + 69, + 124 + ] + }, + { + name: "const-2", + shape: [ + 2 + ], + type: "INT32", + data: [ + 161, + 166, + 193, + 69, + 158, + 77, + 193, + 169 + ] + }, + { + name: "result-0", + shape: [ + 1, + 6, + 65535, + 2 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "DEPTHWISE_CONV2D", - attribute_type: "ConvAttribute", - attribute: { - pad: [ - 1, - 1, - 0, - 0 - ], - stride: [ - 1, - 1 - ], - dilation: [ - 1, - 1 - ], - input_zp: -69, - weight_zp: 0, - accum_dtype: "INT32" - }, inputs: [ - "input-0", - "const-1", - "const-2" + "input-0" ], outputs: [ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 4, - 65537, - 1 - ], - type: "INT8" - }, - { - name: "const-1", - shape: [ - 1, - 3, - 1, - 2 - ], - type: "INT4", - data: [ - 15, - 69, - 124 - ] - }, - { - name: "const-2", - shape: [ - 2 - ], - type: "INT32", - data: [ - 161, - 166, - 193, - 69, - 158, - 77, - 193, - 169 - ] - }, - { - name: "result-0", - shape: [ - 1, - 6, - 65535, - 2 - ], - type: "INT32" - } - ], - inputs: [ - "input-0" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x65532x2x1_i8xi4_acci32_st11_pad0111_dilat11/test.json b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x65532x2x1_i8xi4_acci32_st11_pad0111_dilat11/test.json index 601c07e7c..7384439f4 100644 --- a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x65532x2x1_i8xi4_acci32_st11_pad0111_dilat11/test.json +++ b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x65532x2x1_i8xi4_acci32_st11_pad0111_dilat11/test.json @@ -5,121 +5,126 @@ _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-1" - ] - }, - { - op: "CONST", - attribute_type: "NONE", - inputs: [ + ], + outputs: [ + "const-1" + ] + }, + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "DEPTHWISE_CONV2D", + attribute_type: "ConvAttribute", + attribute: { + pad: [ + 0, + 1, + 1, + 1 + ], + stride: [ + 1, + 1 + ], + dilation: [ + 1, + 1 + ], + input_zp: 15, + weight_zp: 0, + accum_dtype: "INT32" + }, + inputs: [ + "input-0", + "const-1", + "const-2" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 65532, + 2, + 1 + ], + type: "INT8" + }, + { + name: "const-1", + shape: [ + 1, + 3, + 1, + 2 + ], + type: "INT4", + data: [ + 29, + 227, + 118 + ] + }, + { + name: "const-2", + shape: [ + 2 + ], + type: "INT32", + data: [ + 140, + 15, + 13, + 61, + 104, + 229, + 37, + 98 + ] + }, + { + name: "result-0", + shape: [ + 1, + 65533, + 2, + 2 + ], + type: "INT32" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "DEPTHWISE_CONV2D", - attribute_type: "ConvAttribute", - attribute: { - pad: [ - 0, - 1, - 1, - 1 - ], - stride: [ - 1, - 1 - ], - dilation: [ - 1, - 1 - ], - input_zp: 15, - weight_zp: 0, - accum_dtype: "INT32" - }, inputs: [ - "input-0", - "const-1", - "const-2" + "input-0" ], outputs: [ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 65532, - 2, - 1 - ], - type: "INT8" - }, - { - name: "const-1", - shape: [ - 1, - 3, - 1, - 2 - ], - type: "INT4", - data: [ - 29, - 227, - 118 - ] - }, - { - name: "const-2", - shape: [ - 2 - ], - type: "INT32", - data: [ - 140, - 15, - 13, - 61, - 104, - 229, - 37, - 98 - ] - }, - { - name: "result-0", - shape: [ - 1, - 65533, - 2, - 2 - ], - type: "INT32" - } - ], - inputs: [ - "input-0" - ], - outputs: [ - "result-0" ] } ] diff --git a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x9x44x3_i16xi8_acci48_st88_pad0001_dilat22/test.json b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x9x44x3_i16xi8_acci48_st88_pad0001_dilat22/test.json index 61318f88d..c78344b5c 100644 --- a/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x9x44x3_i16xi8_acci48_st88_pad0001_dilat22/test.json +++ b/operators/tensor/depthwise_conv2d_1x3/depthwise_conv2d_1x3_1x9x44x3_i16xi8_acci48_st88_pad0001_dilat22/test.json @@ -5,164 +5,169 @@ _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-1" - ] - }, - { - op: "CONST", - attribute_type: "NONE", - inputs: [ + ], + outputs: [ + "const-1" + ] + }, + { + op: "CONST", + attribute_type: "NONE", + inputs: [ + ], + outputs: [ + "const-2" + ] + }, + { + op: "DEPTHWISE_CONV2D", + attribute_type: "ConvAttribute", + attribute: { + pad: [ + 0, + 0, + 0, + 1 + ], + stride: [ + 8, + 8 + ], + dilation: [ + 2, + 2 + ], + input_zp: 0, + weight_zp: 40, + accum_dtype: "INT48" + }, + inputs: [ + "input-0", + "const-1", + "const-2" + ], + outputs: [ + "result-0" + ] + } + ], + tensors: [ + { + name: "input-0", + shape: [ + 1, + 9, + 44, + 3 + ], + type: "INT16" + }, + { + name: "const-1", + shape: [ + 1, + 3, + 3, + 2 + ], + type: "INT8", + data: [ + 119, + 30, + 220, + 95, + 230, + 95, + 30, + 231, + 145, + 142, + 98, + 195, + 240, + 190, + 50, + 19, + 55, + 99 + ] + }, + { + name: "const-2", + shape: [ + 6 + ], + type: "INT48", + data: [ + 229, + 93, + 122, + 178, + 204, + 215, + 74, + 229, + 236, + 54, + 216, + 71, + 167, + 103, + 214, + 135, + 6, + 182, + 64, + 46, + 141, + 112, + 137, + 125, + 187, + 248, + 62, + 164, + 251, + 141, + 160, + 96, + 167, + 194, + 7, + 150 + ] + }, + { + name: "result-0", + shape: [ + 1, + 2, + 6, + 6 + ], + type: "INT48" + } ], - outputs: [ - "const-2" - ] - }, - { - op: "DEPTHWISE_CONV2D", - attribute_type: "ConvAttribute", - attribute: { - pad: [ - 0, - 0, - 0, - 1 - ], - stride: [ - 8, - 8 - ], - dilation: [ - 2, - 2 - ], - input_zp: 0, - weight_zp: 40, - accum_dtype: "INT48" - }, inputs: [ - "input-0", - "const-1", - "const-2" + "input-0" ], outputs: [ "result-0" ] } - ], - tensors: [ - { - name: "input-0", - shape: [ - 1, - 9, - 44, - 3 - ], - type: "INT16" - }, - { - name: "const-1", - shape: [ - 1, - 3, - 3, - 2 - ], - type: "INT8", - data: [ - 119, - 30, - 220, - 95, - 230, - 95, - 30, - 231, - 145, - 142, - 98, - 195, - 240, - 190, - 50, - 19, - 55, - 99 - ] - }, - { - name: "const-2", - shape: [ - 6 - ], - type: "INT48", - data: [ - 229, - 93, - 122, - 178, - 204, - 215, - 74, - 229, - 236, - 54, - 216, - 71, - 167, - 103, - 214, - 135, - 6, - 182, - 64, - 46, - 141, - 112, - 137, - 125, - 187, - 248, - 62, - 164, - 251, - 141, - 160, - 96, - 167, - 194, - 7, - 150 - ] - }, - { - name: "result-0", - shape: [ - 1, - 2, - 6, - 6 - ], - type: "INT48" - } - ], - inputs: [ - "input-0" - ], - outputs: [ - "result-0" ] } ] |