CMSIS-NN: Fix arm_max_pool_s8 for MVEI
* Replace vctp16q with vctp8q intrinsic.
* Update unit test as well to have const input data.
diff --git a/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c b/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c
index c7192c1..e6df26c 100644
--- a/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c
+++ b/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c
@@ -37,7 +37,7 @@
int32_t loop_count = (length + 15) / 16;
for (int i = 0; i < loop_count; i++)
{
- mve_pred16_t p = vctp16q((uint32_t)length);
+ mve_pred16_t p = vctp8q((uint32_t)length);
const int8x16_t op_1 = vldrbq_z_s8(base, p);
const int8x16_t op_2 = vldrbq_z_s8(target, p);
const int8x16_t max = vmaxq_m_s8(vuninitializedq_s8(), op_1, op_2, p);
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling/input_data.h
index e265753..55043fa 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling/input_data.h
@@ -20,7 +20,7 @@
#pragma once
#include <stdint.h>
-int8_t avgpooling_input[2112] = {
+const int8_t avgpooling_input[2112] = {
-112, -80, -32, -16, -16, 48, -32, -48, -96, -96, -16, 80, -80, -16, -64, -48, 32, 48, 32,
64, -32, -32, -32, -16, -112, 80, -80, 32, 0, 80, -112, 16, 16, -16, -64, 0, -32, -64,
16, 48, -112, -96, 80, 96, 32, -112, -64, 80, 64, -32, -64, 32, 64, 0, -96, -112, -80,
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_1/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_1/input_data.h
index e381dd1..0e04bcd 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_1/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_1/input_data.h
@@ -20,7 +20,7 @@
#pragma once
#include <stdint.h>
-int8_t avgpooling_1_input[135] = {
+const int8_t avgpooling_1_input[135] = {
-32, 48, -64, -80, -48, -32, -32, 0, -96, 96, -48, 80, -16, -96, 80, -16, 48, -112, 96, -112,
-96, -64, -16, 96, 0, -32, -16, 0, 64, 48, -64, 0, 0, -16, -48, -16, -112, 16, -80, 64,
48, 0, 64, 32, 64, -48, -64, -32, -112, 32, 32, 64, 32, -112, -48, -16, 16, 96, 64, -16,
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_2/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_2/input_data.h
index 67d5ac9..b9c4c12 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_2/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_2/input_data.h
@@ -20,7 +20,7 @@
#pragma once
#include <stdint.h>
-int8_t avgpooling_2_input[60] = {80, 16, -80, -96, 96, -64, -112, -112, 48, 16, -80, -80, 80, 64, -80,
- 16, 48, -112, 0, 48, 96, -80, -112, -64, -32, -16, -112, -64, -64, 80,
- -96, -112, -16, -80, -80, -112, -64, -48, 16, 64, 32, 48, 16, 64, 16,
- -48, -64, -32, -80, 64, -48, -32, -32, -112, 32, 32, -112, -96, -96, 48};
+const int8_t avgpooling_2_input[60] = {80, 16, -80, -96, 96, -64, -112, -112, 48, 16, -80, -80, 80, 64, -80,
+ 16, 48, -112, 0, 48, 96, -80, -112, -64, -32, -16, -112, -64, -64, 80,
+ -96, -112, -16, -80, -80, -112, -64, -48, 16, 64, 32, 48, 16, 64, 16,
+ -48, -64, -32, -80, 64, -48, -32, -32, -112, 32, 32, -112, -96, -96, 48};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_3/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_3/input_data.h
index 9b5f18e..5ed1f2d 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_3/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_3/input_data.h
@@ -20,4 +20,4 @@
#pragma once
#include <stdint.h>
-int8_t avgpooling_3_input[18] = {0, -48, 32, -64, 64, 0, 80, 32, -16, -96, 32, -16, 96, -96, 96, 80, 0, 96};
+const int8_t avgpooling_3_input[18] = {0, -48, 32, -64, 64, 0, 80, 32, -16, -96, 32, -16, 96, -96, 96, 80, 0, 96};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_4/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_4/input_data.h
index 8b6eab9..8167129 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_4/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/avgpooling_4/input_data.h
@@ -20,6 +20,6 @@
#pragma once
#include <stdint.h>
-int8_t avgpooling_4_input[40] = {-32, 96, -96, -96, 64, -112, -48, 96, 0, -48, -64, -32, 48, -80,
- 32, 96, -96, -112, 0, -48, -48, 16, 96, -48, 96, -32, -16, -80,
- -112, 48, -16, 48, 16, 16, 32, -64, 64, -112, -48, -80};
+const int8_t avgpooling_4_input[40] = {-32, 96, -96, -96, 64, -112, -48, 96, 0, -48, -64, -32, 48, -80,
+ 32, 96, -96, -112, 0, -48, -48, 16, 96, -48, 96, -32, -16, -80,
+ -112, 48, -16, 48, 16, 16, 32, -64, 64, -112, -48, -80};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/biases_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/biases_data.h
index 5d127d1..df0f981 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/biases_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/biases_data.h
@@ -16,20 +16,8 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const int32_t fully_connected_mve_0_biases[9] =
-{
- 2,
- 3,
- 3,
- 2,
- 2,
- 0,
- 1,
- 0,
- 1
-};
+const int32_t fully_connected_mve_0_biases[9] = {2, 3, 3, 2, 2, 0, 1, 0, 1};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/config_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/config_data.h
index aa1ea53..60af47d 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/config_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/config_data.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#define FULLY_CONNECTED_MVE_0_OUT_CH 9
#define FULLY_CONNECTED_MVE_0_IN_CH 16
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/input_data.h
index efe8320..054b574 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/input_data.h
@@ -16,27 +16,8 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const q7_t fully_connected_mve_0_input[16] =
-{
- 0,
- -4,
- 0,
- -3,
- -7,
- -3,
- -2,
- -3,
- 0,
- -5,
- -3,
- -3,
- -7,
- -2,
- -1,
- 0
-};
+const q7_t fully_connected_mve_0_input[16] = {0, -4, 0, -3, -7, -3, -2, -3, 0, -5, -3, -3, -7, -2, -1, 0};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/output_ref_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/output_ref_data.h
index 607b9c5..75ae62f 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/output_ref_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/output_ref_data.h
@@ -16,20 +16,8 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const q7_t fully_connected_mve_0_output_ref[9] =
-{
- 18,
- 9,
- 0,
- 14,
- -16,
- -13,
- -10,
- 5,
- 28
-};
+const q7_t fully_connected_mve_0_output_ref[9] = {18, 9, 0, 14, -16, -13, -10, 5, 28};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/test_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/test_data.h
index 92c0ea1..0dc78f5 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/test_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/test_data.h
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
-#include "config_data.h"
-#include "output_ref_data.h"
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#include "biases_data.h"
-#include "weights_data.h"
+#include "config_data.h"
#include "input_data.h"
+#include "output_ref_data.h"
+#include "weights_data.h"
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/weights_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/weights_data.h
index 76489c5..1809179 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/weights_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/weights_data.h
@@ -16,155 +16,13 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const q7_t fully_connected_mve_0_weights[144] =
-{
- -2,
- 2,
- 3,
- 1,
- -2,
- 1,
- -3,
- -4,
- 2,
- 0,
- 0,
- 2,
- -1,
- -2,
- 2,
- 0,
- -1,
- -3,
- -4,
- -4,
- -4,
- -2,
- 2,
- -4,
- -2,
- 2,
- -1,
- -4,
- -3,
- -4,
- 2,
- 0,
- -3,
- 0,
- -1,
- 1,
- -4,
- 2,
- -2,
- 1,
- 1,
- 0,
- 3,
- -1,
- 0,
- -4,
- -1,
- 0,
- 2,
- -1,
- -2,
- -4,
- -4,
- 2,
- -4,
- 3,
- 0,
- -1,
- -3,
- -4,
- 0,
- -4,
- 0,
- 1,
- -3,
- -4,
- -1,
- -4,
- 2,
- -3,
- 2,
- -2,
- 3,
- -1,
- 2,
- -3,
- 3,
- -4,
- -3,
- 3,
- -2,
- -2,
- -4,
- 3,
- 0,
- -3,
- -4,
- -1,
- 1,
- -4,
- -3,
- -2,
- -2,
- -4,
- 0,
- -2,
- 3,
- 1,
- 1,
- -4,
- 0,
- 1,
- 0,
- -1,
- -4,
- -3,
- -1,
- 2,
- 3,
- -2,
- -3,
- 2,
- -2,
- 1,
- -1,
- 0,
- 2,
- -4,
- 2,
- -3,
- 2,
- -4,
- -1,
- -4,
- 1,
- -2,
- 3,
- 3,
- 2,
- -1,
- 3,
- 0,
- -1,
- 2,
- 3,
- -4,
- 2,
- 1,
- -2,
- -4,
- 1,
- 3,
- 3,
- -1
-};
+const q7_t fully_connected_mve_0_weights[144] = {
+ -2, 2, 3, 1, -2, 1, -3, -4, 2, 0, 0, 2, -1, -2, 2, 0, -1, -3, -4, -4, -4, -2, 2, -4, -2, 2, -1, -4, -3,
+ -4, 2, 0, -3, 0, -1, 1, -4, 2, -2, 1, 1, 0, 3, -1, 0, -4, -1, 0, 2, -1, -2, -4, -4, 2, -4, 3, 0, -1,
+ -3, -4, 0, -4, 0, 1, -3, -4, -1, -4, 2, -3, 2, -2, 3, -1, 2, -3, 3, -4, -3, 3, -2, -2, -4, 3, 0, -3, -4,
+ -1, 1, -4, -3, -2, -2, -4, 0, -2, 3, 1, 1, -4, 0, 1, 0, -1, -4, -3, -1, 2, 3, -2, -3, 2, -2, 1, -1, 0,
+ 2, -4, 2, -3, 2, -4, -1, -4, 1, -2, 3, 3, 2, -1, 3, 0, -1, 2, 3, -4, 2, 1, -2, -4, 1, 3, 3, -1};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/biases_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/biases_data.h
index 7cbb656..17582ff 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/biases_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/biases_data.h
@@ -16,15 +16,8 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const int32_t fully_connected_mve_1_biases[4] =
-{
- -3,
- 1,
- -1,
- -2
-};
+const int32_t fully_connected_mve_1_biases[4] = {-3, 1, -1, -2};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/config_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/config_data.h
index 4e412e9..35b9db7 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/config_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/config_data.h
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#define FULLY_CONNECTED_MVE_1_OUT_CH 4
#define FULLY_CONNECTED_MVE_1_IN_CH 20
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/input_data.h
index 1eed34f..6eb04c0 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/input_data.h
@@ -16,31 +16,8 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const q7_t fully_connected_mve_1_input[20] =
-{
- -5,
- -5,
- 2,
- -5,
- 2,
- 1,
- -3,
- 2,
- -4,
- -5,
- 0,
- 2,
- -2,
- 1,
- -5,
- -1,
- -3,
- -2,
- 0,
- -2
-};
+const q7_t fully_connected_mve_1_input[20] = {-5, -5, 2, -5, 2, 1, -3, 2, -4, -5, 0, 2, -2, 1, -5, -1, -3, -2, 0, -2};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/output_ref_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/output_ref_data.h
index 2743f9e..e4e69c8 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/output_ref_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/output_ref_data.h
@@ -16,15 +16,8 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const q7_t fully_connected_mve_1_output_ref[4] =
-{
- -18,
- 5,
- 33,
- -36
-};
+const q7_t fully_connected_mve_1_output_ref[4] = {-18, 5, 33, -36};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/test_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/test_data.h
index 92c0ea1..0dc78f5 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/test_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/test_data.h
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
-#include "config_data.h"
-#include "output_ref_data.h"
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#include "biases_data.h"
-#include "weights_data.h"
+#include "config_data.h"
#include "input_data.h"
+#include "output_ref_data.h"
+#include "weights_data.h"
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/weights_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/weights_data.h
index fae7f1c..bfafc00 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/weights_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/weights_data.h
@@ -16,91 +16,11 @@
* limitations under the License.
*/
-
-// Generated by generate_test_data.py using TFL version 2.1.0 as reference.
+// Generated by generate_test_data.py using TFL version 2.3.1 as reference.
#pragma once
#include <stdint.h>
-const q7_t fully_connected_mve_1_weights[80] =
-{
- 0,
- 5,
- 1,
- 6,
- 0,
- 0,
- 3,
- -1,
- -1,
- 0,
- 2,
- 1,
- 6,
- 5,
- 2,
- 3,
- 4,
- 2,
- 1,
- -1,
- -1,
- 5,
- 1,
- 4,
- 6,
- 6,
- 4,
- -1,
- 2,
- -1,
- 6,
- 3,
- 4,
- -1,
- 6,
- 3,
- 1,
- 3,
- -1,
- 2,
- 0,
- 0,
- -1,
- 2,
- 0,
- 5,
- 2,
- 5,
- 4,
- 4,
- 1,
- 6,
- 0,
- 6,
- 1,
- 5,
- 5,
- 3,
- -1,
- 0,
- 5,
- 1,
- -1,
- 6,
- 3,
- 6,
- 2,
- -1,
- 1,
- 4,
- 6,
- -1,
- 5,
- 1,
- 0,
- 6,
- 5,
- 4,
- 2,
- 5
-};
+const q7_t fully_connected_mve_1_weights[80] = {0, 5, 1, 6, 0, 0, 3, -1, -1, 0, 2, 1, 6, 5, 2, 3, 4, 2, 1, -1,
+ -1, 5, 1, 4, 6, 6, 4, -1, 2, -1, 6, 3, 4, -1, 6, 3, 1, 3, -1, 2,
+ 0, 0, -1, 2, 0, 5, 2, 5, 4, 4, 1, 6, 0, 6, 1, 5, 5, 3, -1, 0,
+ 5, 1, -1, 6, 3, 6, 2, -1, 1, 4, 6, -1, 5, 1, 0, 6, 5, 4, 2, 5};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling/input_data.h
index 438b943..f6d0095 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling/input_data.h
@@ -20,7 +20,7 @@
// Generated by generate_test_data.py
#include <stdint.h>
-int8_t maxpooling_input[2112] = {
+const int8_t maxpooling_input[2112] = {
-80, 64, -96, 64, 0, -32, -80, -32, 16, -64, -112, -112, 0, -64, 32, 16, -48, -48, 16,
16, 96, 16, -96, -80, -112, -80, -32, -96, -16, 16, -80, -64, 0, 16, 96, 80, -32, 32,
32, -112, -32, 32, -64, 96, 96, -112, -48, 0, -32, -80, 80, 32, -96, 32, 0, 0, -32,
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_5/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_5/input_data.h
index 1a3157d..65333f9 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_5/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_5/input_data.h
@@ -20,4 +20,5 @@
#pragma once
#include <stdint.h>
-int8_t maxpooling_5_input[20] = {64, 0, 0, -16, 64, 0, -96, -80, 48, -64, 32, 32, 64, 32, -80, 80, 96, 32, -48, 80};
+const int8_t maxpooling_5_input[20] = {64, 0, 0, -16, 64, 0, -96, -80, 48, -64,
+ 32, 32, 64, 32, -80, 80, 96, 32, -48, 80};
diff --git a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_6/input_data.h b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_6/input_data.h
index d316bec..7f99c2f 100644
--- a/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_6/input_data.h
+++ b/CMSIS/NN/Tests/UnitTest/TestCases/TestData/maxpooling_6/input_data.h
@@ -20,7 +20,7 @@
#pragma once
#include <stdint.h>
-int8_t maxpooling_6_input[85] = {
+const int8_t maxpooling_6_input[85] = {
96, 64, -112, -48, 16, 48, 32, 64, -48, 48, 32, 96, 0, -96, 16, 48, -48, 48, 96, 0, 16, 0,
-64, -112, 96, -48, -64, -16, -64, -64, -80, -112, -16, 64, -80, 96, 16, -32, -80, -64, -96, 96, -16, -32,
64, 96, -32, -32, 80, -112, 96, -96, 32, -16, 32, -48, -112, 80, 96, -48, -80, 80, -80, -112, 80, 96,
diff --git a/CMSIS/NN/Tests/UnitTest/generate_test_data.py b/CMSIS/NN/Tests/UnitTest/generate_test_data.py
index 3b554c0..b79ecfe 100755
--- a/CMSIS/NN/Tests/UnitTest/generate_test_data.py
+++ b/CMSIS/NN/Tests/UnitTest/generate_test_data.py
@@ -337,7 +337,7 @@
f.write("#define {}_INPUT_BATCHES {}\n".format(prefix, self.batches))
self.format_output_file(filepath)
- def generate_c_array(self, name, array, datatype="q7_t", const="const "):
+ def generate_c_array(self, name, array, datatype="q7_t"):
if not os.path.exists(self.headers_dir):
os.makedirs(self.headers_dir)
@@ -360,7 +360,7 @@
f.write(self.tensor_flow_reference_version)
f.write("#pragma once\n")
f.write("#include <stdint.h>\n\n")
- f.write(const + datatype + " " + self.testdataset + '_' + name + "[%d] =\n{\n" % size)
+ f.write("const " + datatype + " " + self.testdataset + '_' + name + "[%d] =\n{\n" % size)
for i in range(size - 1):
f.write(" %d,\n" % w[i])
f.write(" %d\n" % w[size - 1])
@@ -622,7 +622,7 @@
def generate_data(self, input_data=None):
input_data = self.get_randomized_input_data(input_data)
input_data = self.convert_tensor(input_data, self.quantize_input)
- self.generate_c_array("input", input_data, datatype="int8_t", const="")
+ self.generate_c_array("input", input_data, datatype="int8_t")
input_data = tf.cast(input_data, tf.float32)