Bug fixes for max-batch-size/ofm-depth
* Conformance regen required for tosa-bi: conv2d conv3d depthwise_conv2d transpose_conv2d
* Include bug fix for testGen.makeShape()
* Include json changes to limit size of tests which now have ofm_depth > 1
Signed-off-by: James Ward <james.ward@arm.com>
Change-Id: Ic8221b9a742f5737df523997bee7260f4dfcdef3
diff --git a/verif/conformance/tosa_base_profile_ops_info.json b/verif/conformance/tosa_base_profile_ops_info.json
index ff88293..0395567 100644
--- a/verif/conformance/tosa_base_profile_ops_info.json
+++ b/verif/conformance/tosa_base_profile_ops_info.json
@@ -203,7 +203,7 @@
"--target-shape",
"1,49,42,28",
"--target-shape",
- "3,11,44,3",
+ "1,11,44,3",
"--allow-pooling-and-conv-oversizes"
],
[
@@ -752,11 +752,13 @@
"--target-dtype",
"int8",
"--target-shape",
- "1,65535,4,1",
+ "1,65535,3,1",
"--target-shape",
- "1,5,65536,1",
+ "1,2,65536,1",
"--max-conv-dilation",
"1",
+ "--tensor-dim-range",
+ "1,8",
"--allow-pooling-and-conv-oversizes"
]
],
@@ -801,11 +803,13 @@
"--target-dtype",
"int8",
"--target-shape",
- "1,1,65535,3,1",
+ "1,1,65535,2,1",
"--target-shape",
- "1,1,3,65536,1",
+ "1,1,2,65536,1",
"--max-conv-dilation",
"1",
+ "--tensor-dim-range",
+ "1,4",
"--allow-pooling-and-conv-oversizes"
]
],
@@ -856,6 +860,8 @@
"1,4,65537,1",
"--max-conv-dilation",
"1",
+ "--tensor-dim-range",
+ "1,16",
"--allow-pooling-and-conv-oversizes"
]
],
@@ -1568,7 +1574,7 @@
"--target-shape",
"1,4,75,3",
"--target-shape",
- "2,11,44,1",
+ "1,11,44,1",
"--allow-pooling-and-conv-oversizes"
],
[
@@ -1579,7 +1585,7 @@
"--target-shape",
"1,3,65537,1",
"--target-shape",
- "33333,3,2,1",
+ "1,3,2,1",
"--allow-pooling-and-conv-oversizes"
]
],
@@ -2514,7 +2520,9 @@
"--target-shape",
"1,49,33,1",
"--target-shape",
- "2,11,33,3",
+ "1,11,33,3",
+ "--tensor-dim-range",
+ "1,18",
"--allow-pooling-and-conv-oversizes"
],
[
@@ -2522,6 +2530,8 @@
"int8",
"--target-shape",
"1,65536,1,1",
+ "--tensor-dim-range",
+ "1,12",
"--max-conv-dilation",
"1"
]