Explorar o código

CMSIS-NN: Update FC test cases to use zero weight offset

Expected weight offset for FC is zero as per TFLM's  int8 spec.
The  test vectors are re-generated to reflect that as a first step
before the implementation is changed.

Change-Id: Ic6717365721b681087326f0fb06e780ecf15ea64
Felix Thomasmathibalan %!s(int64=4) %!d(string=hai) anos
pai
achega
8f4eaf1efb
Modificáronse 47 ficheiros con 194 adicións e 204 borrados
  1. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/basic/bias.txt
  2. 12 12
      CMSIS/NN/Tests/UnitTest/PregeneratedData/basic/input.txt
  3. 4 4
      CMSIS/NN/Tests/UnitTest/PregeneratedData/basic/kernel.txt
  4. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected/bias.txt
  5. 6 6
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected/input.txt
  6. 20 20
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected/kernel.txt
  7. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_0/bias.txt
  8. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_0/input.txt
  9. 16 16
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_0/kernel.txt
  10. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_1/bias.txt
  11. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_1/input.txt
  12. 20 20
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_1/kernel.txt
  13. 2 2
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_null_bias_0/input.txt
  14. 33 33
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_null_bias_0/kernel.txt
  15. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_out_activation/bias.txt
  16. 1 1
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_out_activation/input.txt
  17. 10 10
      CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_out_activation/kernel.txt
  18. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/biases_data.h
  19. 3 3
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/input_data.h
  20. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/output_ref_data.h
  21. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/weights_data.h
  22. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/biases_data.h
  23. 0 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/config_data.h
  24. 4 4
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/input_data.h
  25. 1 2
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/output_ref_data.h
  26. 5 6
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/weights_data.h
  27. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/biases_data.h
  28. 0 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/config_data.h
  29. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/input_data.h
  30. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/output_ref_data.h
  31. 5 5
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/weights_data.h
  32. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/biases_data.h
  33. 0 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/config_data.h
  34. 2 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/input_data.h
  35. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/output_ref_data.h
  36. 4 4
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/weights_data.h
  37. 0 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/config_data.h
  38. 4 4
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/input_data.h
  39. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/output_ref_data.h
  40. 6 5
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/weights_data.h
  41. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/biases_data.h
  42. 0 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/config_data.h
  43. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/input_data.h
  44. 1 1
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/output_ref_data.h
  45. 3 3
      CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/weights_data.h
  46. 5 5
      CMSIS/NN/Tests/UnitTest/TestCases/test_arm_fully_connected_s8/test_arm_fully_connected_s8.c
  47. 8 13
      CMSIS/NN/Tests/UnitTest/generate_test_data.py

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/basic/bias.txt

@@ -1,2 +1,2 @@
 # 1
-2.000000000000000000e+00
+1.000000000000000000e+00

+ 12 - 12
CMSIS/NN/Tests/UnitTest/PregeneratedData/basic/input.txt

@@ -1,41 +1,41 @@
 # 1,8,5,1
-2.000000000000000000e+00
 1.000000000000000000e+00
-2.000000000000000000e+00
-2.000000000000000000e+00
+1.000000000000000000e+00
 3.000000000000000000e+00
 3.000000000000000000e+00
+1.000000000000000000e+00
 2.000000000000000000e+00
-3.000000000000000000e+00
-3.000000000000000000e+00
-3.000000000000000000e+00
-3.000000000000000000e+00
 2.000000000000000000e+00
 2.000000000000000000e+00
+3.000000000000000000e+00
+1.000000000000000000e+00
+1.000000000000000000e+00
+2.000000000000000000e+00
 1.000000000000000000e+00
 1.000000000000000000e+00
 3.000000000000000000e+00
+1.000000000000000000e+00
+1.000000000000000000e+00
 3.000000000000000000e+00
 3.000000000000000000e+00
 1.000000000000000000e+00
+3.000000000000000000e+00
 1.000000000000000000e+00
 2.000000000000000000e+00
+1.000000000000000000e+00
 2.000000000000000000e+00
+1.000000000000000000e+00
 2.000000000000000000e+00
 3.000000000000000000e+00
 2.000000000000000000e+00
 2.000000000000000000e+00
-3.000000000000000000e+00
-3.000000000000000000e+00
-1.000000000000000000e+00
-1.000000000000000000e+00
+2.000000000000000000e+00
 3.000000000000000000e+00
 3.000000000000000000e+00
 1.000000000000000000e+00
 3.000000000000000000e+00
 1.000000000000000000e+00
 3.000000000000000000e+00
-3.000000000000000000e+00
 1.000000000000000000e+00
 2.000000000000000000e+00
 3.000000000000000000e+00

+ 4 - 4
CMSIS/NN/Tests/UnitTest/PregeneratedData/basic/kernel.txt

@@ -1,9 +1,9 @@
 # 4,2,1,1
-2.000000000000000000e+00
-2.000000000000000000e+00
-1.000000000000000000e+00
-1.000000000000000000e+00
+3.000000000000000000e+00
 3.000000000000000000e+00
 3.000000000000000000e+00
 2.000000000000000000e+00
 1.000000000000000000e+00
+1.000000000000000000e+00
+1.000000000000000000e+00
+1.000000000000000000e+00

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected/bias.txt

@@ -1,2 +1,2 @@
 # 6
--2.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00
+-4.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00

+ 6 - 6
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected/input.txt

@@ -1,7 +1,7 @@
 # 3,1,2,10
-3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00
--1.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00
--1.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00
--1.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00
--2.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00
-3.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00
+2.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00
+2.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00
+-4.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00
+3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00
+-3.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00
+3.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00

+ 20 - 20
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected/kernel.txt

@@ -1,21 +1,21 @@
 # 1,2,10,6
--3.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00
-2.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00
-0.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00
--1.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00
-3.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00
--2.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00
--3.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
-3.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00
-1.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00
--4.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00
--2.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00
-2.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00
-3.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00
--2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00
--4.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00
-0.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00
-1.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00
-2.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00
--3.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00
-2.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00
+-1.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00
+2.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00
+1.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00
+-3.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00
+-4.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00
+-2.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00
+1.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00
+-3.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00
+-1.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00
+-4.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00
+-3.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00
+0.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00
+-2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00
+3.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00
+0.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00
+0.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00
+-1.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00
+1.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00
+0.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00
+0.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_0/bias.txt

@@ -1,2 +1,2 @@
 # 9
-2.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00
+-1.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_0/input.txt

@@ -1,2 +1,2 @@
 # 1,1,1,16
-3.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00
+-2.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00

+ 16 - 16
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_0/kernel.txt

@@ -1,17 +1,17 @@
 # 1,1,16,9
--2.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00
-0.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00
--4.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00
--4.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00
--4.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00
--4.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00
--4.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00
-1.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00
-3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00
--2.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00
--3.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00
--4.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00
-3.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00
--4.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00
-3.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00
--4.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00
+1.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00
+3.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00
+3.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00
+-3.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00
+1.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00
+3.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00
+0.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00
+-1.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00
+-3.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00
+2.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00
+-1.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00
+3.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00
+3.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00
+3.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00
+-2.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00
+2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_1/bias.txt

@@ -1,2 +1,2 @@
 # 4
--3.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
+0.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_1/input.txt

@@ -1,2 +1,2 @@
 # 1,1,1,20
--4.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00
+0.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00

+ 20 - 20
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_mve_1/kernel.txt

@@ -1,21 +1,21 @@
 # 1,1,20,4
--3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00
--3.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00
--4.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
-3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00
-1.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00
--4.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00
-3.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00
--1.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00
-1.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00
--2.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00
--3.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00
--3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00
-1.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00
--3.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00
-2.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00
-2.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00
-0.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00
--2.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00
-2.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00
-2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00
+2.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00
+-3.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00
+-4.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00
+-2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00
+-2.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00
+2.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00
+-1.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00
+0.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00
+-3.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00
+0.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00
+-4.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00
+3.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00
+-1.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00
+0.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00
+1.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00
+1.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
+-2.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00
+-2.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00
+0.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00
+-3.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00

+ 2 - 2
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_null_bias_0/input.txt

@@ -1,3 +1,3 @@
 # 2,1,1,33
--2.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
-2.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00
+-3.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00
+-2.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00

+ 33 - 33
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_null_bias_0/kernel.txt

@@ -1,34 +1,34 @@
 # 1,1,33,5
-2.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00
--1.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00
-1.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00
-2.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
-1.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00
--1.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00
-1.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00
--1.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00
-0.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00
--3.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00
--4.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00
-0.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00
--2.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00
-1.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00
--2.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,-4.000000000000000000e+00
-0.000000000000000000e+00,2.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00
-3.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00
-2.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00
-2.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00
-0.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00
-1.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00
--4.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00
--4.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00
--4.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00
-2.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,1.000000000000000000e+00
-1.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00
--3.000000000000000000e+00,0.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00
-3.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00
--1.000000000000000000e+00,-1.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,2.000000000000000000e+00
--2.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00
-2.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00
--3.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00
--4.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00
+0.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00
+-3.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,0.000000000000000000e+00
+1.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00,0.000000000000000000e+00,-3.000000000000000000e+00
+-2.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00
+-2.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00
+-4.000000000000000000e+00,-3.000000000000000000e+00,-1.000000000000000000e+00,-3.000000000000000000e+00,3.000000000000000000e+00
+0.000000000000000000e+00,1.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00
+2.000000000000000000e+00,-4.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00
+-4.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00
+-4.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,-1.000000000000000000e+00
+-3.000000000000000000e+00,-2.000000000000000000e+00,-2.000000000000000000e+00,-3.000000000000000000e+00,-4.000000000000000000e+00
+2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00,2.000000000000000000e+00
+-2.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,3.000000000000000000e+00,1.000000000000000000e+00
+-3.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,1.000000000000000000e+00,-4.000000000000000000e+00
+0.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00
+2.000000000000000000e+00,-4.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
+-1.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00,-2.000000000000000000e+00,0.000000000000000000e+00
+3.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00
+2.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00
+-2.000000000000000000e+00,-3.000000000000000000e+00,0.000000000000000000e+00,2.000000000000000000e+00,-4.000000000000000000e+00
+2.000000000000000000e+00,-1.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,2.000000000000000000e+00
+-3.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00
+0.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00,1.000000000000000000e+00,-3.000000000000000000e+00
+3.000000000000000000e+00,3.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00
+0.000000000000000000e+00,-4.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+00
+-3.000000000000000000e+00,-4.000000000000000000e+00,0.000000000000000000e+00,1.000000000000000000e+00,3.000000000000000000e+00
+3.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00,-2.000000000000000000e+00
+3.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00,3.000000000000000000e+00
+3.000000000000000000e+00,-4.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-4.000000000000000000e+00
+-3.000000000000000000e+00,1.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00,3.000000000000000000e+00
+0.000000000000000000e+00,-3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00
+1.000000000000000000e+00,2.000000000000000000e+00,0.000000000000000000e+00,3.000000000000000000e+00,-3.000000000000000000e+00
+1.000000000000000000e+00,2.000000000000000000e+00,-2.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_out_activation/bias.txt

@@ -1,2 +1,2 @@
 # 4
-1.300000000000000000e+01,-1.100000000000000000e+01,5.000000000000000000e+00,1.000000000000000000e+00
+-5.000000000000000000e+00,-1.300000000000000000e+01,-1.200000000000000000e+01,7.000000000000000000e+00

+ 1 - 1
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_out_activation/input.txt

@@ -1,2 +1,2 @@
 # 1,1,1,10
--4.000000000000000000e+00,-4.000000000000000000e+00,1.100000000000000000e+01,-3.000000000000000000e+00,1.400000000000000000e+01,-4.000000000000000000e+00,1.300000000000000000e+01,5.000000000000000000e+00,0.000000000000000000e+00,1.200000000000000000e+01
+0.000000000000000000e+00,-5.000000000000000000e+00,-1.400000000000000000e+01,3.000000000000000000e+00,6.000000000000000000e+00,8.000000000000000000e+00,-9.000000000000000000e+00,1.100000000000000000e+01,-1.400000000000000000e+01,-1.400000000000000000e+01

+ 10 - 10
CMSIS/NN/Tests/UnitTest/PregeneratedData/fully_connected_out_activation/kernel.txt

@@ -1,11 +1,11 @@
 # 1,1,10,4
--1.300000000000000000e+01,-1.000000000000000000e+01,5.000000000000000000e+00,-1.000000000000000000e+00
-7.000000000000000000e+00,3.000000000000000000e+00,8.000000000000000000e+00,-4.000000000000000000e+00
--1.200000000000000000e+01,-4.000000000000000000e+00,-1.000000000000000000e+00,3.000000000000000000e+00
-3.000000000000000000e+00,2.000000000000000000e+00,-1.000000000000000000e+00,1.000000000000000000e+01
--5.000000000000000000e+00,-1.100000000000000000e+01,-9.000000000000000000e+00,5.000000000000000000e+00
--1.000000000000000000e+01,1.000000000000000000e+01,1.000000000000000000e+00,-1.000000000000000000e+00
--1.200000000000000000e+01,5.000000000000000000e+00,1.000000000000000000e+01,1.000000000000000000e+00
-1.000000000000000000e+00,1.000000000000000000e+00,-1.400000000000000000e+01,-1.500000000000000000e+01
-8.000000000000000000e+00,5.000000000000000000e+00,1.000000000000000000e+00,-1.400000000000000000e+01
--9.000000000000000000e+00,-8.000000000000000000e+00,7.000000000000000000e+00,7.000000000000000000e+00
+-5.000000000000000000e+00,-3.000000000000000000e+00,-6.000000000000000000e+00,1.300000000000000000e+01
+2.000000000000000000e+00,9.000000000000000000e+00,-5.000000000000000000e+00,-1.000000000000000000e+01
+-1.000000000000000000e+01,-6.000000000000000000e+00,-3.000000000000000000e+00,-1.300000000000000000e+01
+1.000000000000000000e+01,0.000000000000000000e+00,-8.000000000000000000e+00,-1.300000000000000000e+01
+1.000000000000000000e+01,-6.000000000000000000e+00,9.000000000000000000e+00,-4.000000000000000000e+00
+-2.000000000000000000e+00,-1.400000000000000000e+01,-1.100000000000000000e+01,-2.000000000000000000e+00
+-1.300000000000000000e+01,9.000000000000000000e+00,6.000000000000000000e+00,1.000000000000000000e+00
+1.000000000000000000e+01,-1.100000000000000000e+01,-9.000000000000000000e+00,-1.000000000000000000e+00
+-4.000000000000000000e+00,0.000000000000000000e+00,4.000000000000000000e+00,-1.500000000000000000e+01
+-1.000000000000000000e+00,-1.000000000000000000e+00,-2.000000000000000000e+00,-1.300000000000000000e+01

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/biases_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const int32_t basic_biases[1] = {4318};
+const int32_t basic_biases[1] = {2159};

+ 3 - 3
CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/input_data.h

@@ -20,6 +20,6 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t basic_input[40] = {-26, -77, -26, -26, 25,  25,  -26, 25,  25,  25,  25,  -26, -26, -77,
-                              -77, 25,  25,  25,  -77, -77, -26, -26, -26, 25,  -26, -26, 25,  25,
-                              -77, -77, 25,  25,  -77, 25,  -77, 25,  25,  -77, -26, 25};
+const q7_t basic_input[40] = {-77, -77, 25,  25, -77, -26, -26, -26, 25,  -77, -77, -26, -77, -77,
+                              25,  -77, -77, 25, 25,  -77, 25,  -77, -26, -77, -26, -77, -26, 25,
+                              -26, -26, -26, 25, 25,  -77, 25,  -77, 25,  -77, -26, 25};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/output_ref_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t basic_output_ref[20] = {37, 34, 32, 27, 41, 40, 36, 30, 37, 37, 34, 26, 42, 43, 32, 24, 42, 35, 32, 33};
+const q7_t basic_output_ref[20] = {22, 30, 39, 32, 26, 28, 30, 29, 22, 27, 30, 31, 26, 31, 36, 28, 29, 32, 30, 29};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/basic/weights_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t basic_weights[8] = {85, 85, 42, 42, 127, 127, 85, 42};
+const q7_t basic_weights[8] = {127, 127, 127, 85, 42, 42, 42, 42};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/biases_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const int32_t fully_connected_biases[6] = {-2, 3, 0, 3, 0, 1};
+const int32_t fully_connected_biases[6] = {-4, 0, -1, 2, -3, 1};

+ 0 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/config_data.h

@@ -29,7 +29,6 @@
 #define FULLY_CONNECTED_INPUT_BATCHES 3
 #define FULLY_CONNECTED_INPUT_OFFSET 50
 #define FULLY_CONNECTED_OUTPUT_OFFSET -2
-#define FULLY_CONNECTED_WEIGHTS_OFFSET 22
 #define FULLY_CONNECTED_OUTPUT_MULTIPLIER 1073741824
 #define FULLY_CONNECTED_OUTPUT_SHIFT 1
 #define FULLY_CONNECTED_ACCUMULATION_DEPTH 20

+ 4 - 4
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/input_data.h

@@ -20,7 +20,7 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t fully_connected_input[60] = {-47, -51, -48, -49, -53, -52, -50, -48, -53, -47, -51, -52, -50, -48, -50,
-                                        -47, -47, -52, -52, -50, -51, -54, -49, -47, -54, -54, -48, -48, -51, -54,
-                                        -51, -47, -51, -52, -48, -50, -50, -48, -48, -50, -52, -49, -48, -48, -51,
-                                        -51, -49, -53, -47, -52, -47, -50, -49, -52, -53, -54, -50, -50, -49, -54};
+const q7_t fully_connected_input[60] = {-48, -54, -49, -49, -51, -47, -49, -49, -52, -54, -48, -48, -54, -53, -53,
+                                        -53, -53, -49, -52, -52, -54, -53, -50, -52, -51, -52, -51, -50, -53, -53,
+                                        -47, -48, -52, -52, -48, -53, -54, -54, -49, -50, -53, -47, -48, -51, -51,
+                                        -47, -53, -53, -51, -51, -47, -54, -50, -50, -49, -47, -48, -50, -50, -51};

+ 1 - 2
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/output_ref_data.h

@@ -20,5 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t fully_connected_output_ref[18] =
-    {2, -15, -11, -26, 26, 4, -24, -20, 11, 18, -5, 7, -22, -8, 11, 37, -11, -17};
+const q7_t fully_connected_output_ref[18] = {-33, -27, 5, 12, 46, -16, 7, 7, 5, 36, -2, -17, -5, 10, -7, 46, -10, 7};

+ 5 - 6
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected/weights_data.h

@@ -21,9 +21,8 @@
 #include <stdint.h>
 
 const q7_t fully_connected_weights[120] = {
-    -25, -21, -22, -25, -23, -21, -20, -19, -24, -19, -21, -23, -22, -22, -24, -22, -24, -22, -23, -20,
-    -21, -19, -23, -23, -19, -24, -19, -21, -19, -20, -24, -25, -26, -22, -19, -24, -25, -23, -21, -22,
-    -23, -24, -19, -23, -19, -24, -26, -19, -21, -26, -23, -22, -24, -22, -26, -21, -23, -23, -21, -24,
-    -24, -22, -20, -21, -21, -22, -20, -26, -21, -25, -21, -19, -19, -22, -22, -23, -19, -19, -24, -21,
-    -23, -23, -20, -24, -26, -22, -25, -25, -26, -21, -22, -21, -19, -20, -23, -22, -21, -23, -22, -20,
-    -21, -25, -20, -26, -23, -19, -23, -26, -25, -25, -23, -21, -26, -22, -20, -22, -19, -19, -26, -23};
+    -1, 1,  3,  -4, -4, -4, 2,  -1, -4, 2,  -3, 1,  1,  -3, 0,  2,  2,  -2, -3, 3,  -2, -2, -2, -2,
+    -4, -1, -2, 1,  0,  -1, -2, -3, 3,  0,  2,  0,  1,  0,  -2, 1,  -1, 1,  -3, 1,  -3, -1, 2,  -2,
+    -1, 1,  -1, -4, -2, 0,  -4, -4, 0,  -2, 1,  0,  -3, 1,  1,  1,  -3, 3,  0,  -4, 0,  -2, 1,  -2,
+    -2, 3,  1,  0,  -4, -2, 3,  -3, 1,  -2, 0,  -1, 0,  0,  0,  -4, 3,  -3, 0,  1,  -1, 0,  -4, -1,
+    -1, 0,  -4, -4, 3,  -2, 1,  1,  -1, -4, -2, -3, 0,  0,  3,  -1, 2,  3,  0,  2,  0,  2,  -2, 1};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/biases_data.h

@@ -20,4 +20,4 @@
 #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] = {-1, 0, 0, 2, -1, -1, 1, -3, -4};

+ 0 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/config_data.h

@@ -29,7 +29,6 @@
 #define FULLY_CONNECTED_MVE_0_INPUT_BATCHES 1
 #define FULLY_CONNECTED_MVE_0_INPUT_OFFSET 3
 #define FULLY_CONNECTED_MVE_0_OUTPUT_OFFSET -2
-#define FULLY_CONNECTED_MVE_0_WEIGHTS_OFFSET 0
 #define FULLY_CONNECTED_MVE_0_OUTPUT_MULTIPLIER 1073741824
 #define FULLY_CONNECTED_MVE_0_OUTPUT_SHIFT 1
 #define FULLY_CONNECTED_MVE_0_ACCUMULATION_DEPTH 16

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/input_data.h

@@ -20,4 +20,4 @@
 #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] = {-5, -3, -5, -3, -3, -6, -1, -5, -4, -3, -2, 0, -2, -1, -2, -6};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/output_ref_data.h

@@ -20,4 +20,4 @@
 #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] = {0, -29, 33, -5, 28, -5, 19, -7, 16};

+ 5 - 5
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_0/weights_data.h

@@ -21,8 +21,8 @@
 #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};
+    1,  0,  -1, -3, -4, -3, 3,  -2, 3,  3,  1,  2,  -2, -4, -4, 2, 3,  2,  3,  -1, -2, 2,  -4, 0,  1,  -3, -3, -3, 1,
+    1,  -3, -4, -3, 3,  2,  3,  1,  -4, 3,  -3, -1, 3,  1,  -2, 2, 3,  -4, -3, 2,  -4, 0,  3,  0,  -2, 0,  -1, -2, 0,
+    3,  -3, -1, -2, -3, -1, -4, 1,  2,  -1, -4, -4, 1,  -3, -3, 2, 3,  1,  -3, -2, -4, -3, -2, 2,  1,  1,  1,  -2, 0,
+    3,  -3, -2, -1, -4, -2, 2,  1,  -1, -4, 2,  2,  3,  3,  2,  0, -3, 2,  3,  0,  3,  3,  -1, -4, -4, 0,  1,  -4, -1,
+    -3, 3,  2,  3,  2,  -3, -1, -3, 0,  3,  -2, -3, -2, 3,  -4, 3, -1, -4, 2,  2,  3,  1,  -1, 1,  0,  -4, -2, -3};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/biases_data.h

@@ -20,4 +20,4 @@
 #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] = {0, 2, -1, 0};

+ 0 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/config_data.h

@@ -29,7 +29,6 @@
 #define FULLY_CONNECTED_MVE_1_INPUT_BATCHES 1
 #define FULLY_CONNECTED_MVE_1_INPUT_OFFSET 1
 #define FULLY_CONNECTED_MVE_1_OUTPUT_OFFSET 3
-#define FULLY_CONNECTED_MVE_1_WEIGHTS_OFFSET -3
 #define FULLY_CONNECTED_MVE_1_OUTPUT_MULTIPLIER 1073741824
 #define FULLY_CONNECTED_MVE_1_OUTPUT_SHIFT 1
 #define FULLY_CONNECTED_MVE_1_ACCUMULATION_DEPTH 20

+ 2 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/input_data.h

@@ -20,4 +20,5 @@
 #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] = {-1, 1,  -2, 1,  -5, 1,  -2, -2, -5, -4,
+                                              -2, -1, -1, -5, -3, -5, 1,  -4, -1, -2};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/output_ref_data.h

@@ -20,4 +20,4 @@
 #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] = {32, -16, 19, -5};

+ 4 - 4
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_mve_1/weights_data.h

@@ -20,7 +20,7 @@
 #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] = {
+    2,  -4, 1, -3, -3, 1,  0, -2, -4, 0,  1,  2,  -2, -1, 0,  -3, -2, 0,  1,  -1, 2,  2,  -1, 2,  -1, -3, -2,
+    -3, 0,  3, -4, -3, -3, 3, 2,  1,  0,  2,  2,  2,  -4, 0,  0,  1,  3,  -2, -3, 3,  -1, -4, -4, -1, 0,  -1,
+    -4, 0,  1, 2,  3,  -3, 1, -4, -1, -2, -2, -2, -1, 0,  -2, 1,  1,  -2, 0,  -4, -2, 3,  -3, 2,  3,  2};

+ 0 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/config_data.h

@@ -29,7 +29,6 @@
 #define FULLY_CONNECTED_NULL_BIAS_0_INPUT_BATCHES 2
 #define FULLY_CONNECTED_NULL_BIAS_0_INPUT_OFFSET 1
 #define FULLY_CONNECTED_NULL_BIAS_0_OUTPUT_OFFSET 0
-#define FULLY_CONNECTED_NULL_BIAS_0_WEIGHTS_OFFSET -3
 #define FULLY_CONNECTED_NULL_BIAS_0_OUTPUT_MULTIPLIER 1073741824
 #define FULLY_CONNECTED_NULL_BIAS_0_OUTPUT_SHIFT 1
 #define FULLY_CONNECTED_NULL_BIAS_0_ACCUMULATION_DEPTH 33

+ 4 - 4
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/input_data.h

@@ -20,7 +20,7 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t fully_connected_null_bias_0_input[66] = {-3, -2, 0,  1,  -3, -4, -3, -2, -1, -5, -4, 2,  -1, -1, -4, -4, -5,
-                                                    -1, 2,  -3, -5, -1, -2, -5, 1,  -4, -4, 1,  -1, -5, -5, -2, -3, 1,
-                                                    2,  2,  -5, -1, 0,  -4, 1,  -3, -2, -4, 1,  2,  -3, -4, -3, -5, -3,
-                                                    2,  1,  -4, -1, 2,  1,  -5, -1, -5, -1, -2, -5, 1,  -1, -5};
+const q7_t fully_connected_null_bias_0_input[66] = {-4, -1, -4, -1, 0,  -4, 1,  -4, -2, 1,  -1, 0,  -2, 1,  1,  0,  2,
+                                                    -4, -5, -4, 2,  -4, 2,  -5, 0,  0,  1,  0,  -2, 1,  -5, -3, 1,  -3,
+                                                    -3, -1, -2, -3, -1, 1,  -5, 0,  0,  -1, -2, 0,  0,  0,  -4, -2, -4,
+                                                    -3, -4, -2, 2,  -5, -4, -3, -5, -1, 1,  1,  -1, -1, -2, -3};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/output_ref_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t fully_connected_null_bias_0_output_ref[10] = {-46, 26, -40, 57, 23, 3, 24, -28, 54, -9};
+const q7_t fully_connected_null_bias_0_output_ref[10] = {-64, -3, 0, -25, 3, 54, -4, 22, 21, -51};

+ 6 - 5
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_null_bias_0/weights_data.h

@@ -21,8 +21,9 @@
 #include <stdint.h>
 
 const q7_t fully_connected_null_bias_0_weights[165] = {
-    5, 3,  3, -1, 5, 2, 3,  6,  1,  3, 4, -1, 3, 3,  4,  5, 4,  0,  2, 1,  4,  1, 5, -1, 0, 2, 3, 4,  3,  5, 4, 1, 4,
-    3, 6,  2, -1, 1, 3, 5,  3,  2,  5, 4, 2,  0, 2,  -1, 4, 1,  -1, 4, 1,  -1, 1, 3, 1,  6, 4, 5, 1,  2,  0, 2, 6, 4,
-    2, -1, 0, 5,  1, 2, 1,  -1, -1, 3, 5, 6,  6, -1, 6,  6, 4,  2,  4, 5,  5,  4, 2, 6,  5, 6, 1, -1, 3,  3, 6, 1, 6,
-    0, 4,  5, 1,  0, 4, -1, 1,  1,  5, 4, -1, 6, 5,  3,  0, -1, 1,  4, -1, 0,  5, 2, -1, 1, 4, 4, 6,  6,  0, 6, 0, 3,
-    2, 6,  1, 6,  6, 6, 4,  6,  2,  2, 3, 4,  5, 1,  5,  4, -1, 5,  5, 1,  3,  1, 2, 0,  6, 0, 5, 2,  -1, 1, 5, 1, 6};
+    0,  -2, 3,  3,  0,  -3, 2,  -2, 3,  0,  1,  -2, 0,  0,  -3, -2, -4, 0,  3,  -1, -2, 3,  -3, 2,  -4, -4, -3, -1,
+    -3, 3,  0,  1,  0,  3,  1,  2,  -4, -3, 1,  3,  -4, -1, 2,  2,  -4, -4, -2, -1, 3,  -1, -3, -2, -2, -3, -4, 2,
+    3,  1,  3,  2,  -2, 1,  -2, 3,  1,  -3, -4, 2,  1,  -4, 0,  3,  3,  3,  3,  2,  -4, 1,  -1, -2, -1, -1, 1,  -2,
+    0,  3,  -1, 2,  -1, -4, 2,  -2, -1, -4, 3,  -2, -3, 0,  2,  -4, 2,  -1, 2,  -2, 2,  -3, -1, 3,  3,  -3, 0,  3,
+    -3, 1,  -3, 3,  3,  -4, 2,  0,  0,  -4, -2, -1, 1,  -3, -4, 0,  1,  3,  3,  -1, 3,  3,  -2, 3,  -1, -2, -4, 3,
+    3,  -4, 2,  -2, -4, -3, 1,  -1, 3,  3,  0,  -3, 2,  -1, -2, 1,  2,  0,  3,  -3, 1,  2,  -2, -1, 3};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/biases_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const int32_t fully_connected_out_activation_biases[4] = {13, -11, 5, 1};
+const int32_t fully_connected_out_activation_biases[4] = {-5, -13, -12, 7};

+ 0 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/config_data.h

@@ -29,7 +29,6 @@
 #define FULLY_CONNECTED_OUT_ACTIVATION_INPUT_BATCHES 1
 #define FULLY_CONNECTED_OUT_ACTIVATION_INPUT_OFFSET 0
 #define FULLY_CONNECTED_OUT_ACTIVATION_OUTPUT_OFFSET 0
-#define FULLY_CONNECTED_OUT_ACTIVATION_WEIGHTS_OFFSET 0
 #define FULLY_CONNECTED_OUT_ACTIVATION_OUTPUT_MULTIPLIER 1073741824
 #define FULLY_CONNECTED_OUT_ACTIVATION_OUTPUT_SHIFT 1
 #define FULLY_CONNECTED_OUT_ACTIVATION_ACCUMULATION_DEPTH 10

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/input_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t fully_connected_out_activation_input[10] = {-4, -4, 11, -3, 14, -4, 13, 5, 0, 12};
+const q7_t fully_connected_out_activation_input[10] = {0, -5, -14, 3, 6, 8, -9, 11, -14, -14};

+ 1 - 1
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/output_ref_data.h

@@ -20,4 +20,4 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t fully_connected_out_activation_output_ref[4] = {120, -105, -22, 120};
+const q7_t fully_connected_out_activation_output_ref[4] = {120, -105, 120, 120};

+ 3 - 3
CMSIS/NN/Tests/UnitTest/TestCases/TestData/fully_connected_out_activation/weights_data.h

@@ -20,6 +20,6 @@
 #pragma once
 #include <stdint.h>
 
-const q7_t fully_connected_out_activation_weights[40] = {-13, -10, 5,   -1,  7,  3, 8,   -4,  -12, -4, -1,  3, 3,  2,
-                                                         -1,  10,  -5,  -11, -9, 5, -10, 10,  1,   -1, -12, 5, 10, 1,
-                                                         1,   1,   -14, -15, 8,  5, 1,   -14, -9,  -8, 7,   7};
+const q7_t fully_connected_out_activation_weights[40] = {-5, -3,  -6, 13, 2,  9,  -5, -10, -10, -6, -3,  -13, 10, 0,
+                                                         -8, -13, 10, -6, 9,  -4, -2, -14, -11, -2, -13, 9,   6,  1,
+                                                         10, -11, -9, -1, -4, 0,  4,  -15, -1,  -1, -2,  -13};

+ 5 - 5
CMSIS/NN/Tests/UnitTest/TestCases/test_arm_fully_connected_s8/test_arm_fully_connected_s8.c

@@ -56,7 +56,7 @@ void fully_connected_arm_fully_connected_s8(void)
     output_dims.c = FULLY_CONNECTED_OUT_CH;
 
     fc_params.input_offset = FULLY_CONNECTED_INPUT_OFFSET;
-    fc_params.filter_offset = FULLY_CONNECTED_WEIGHTS_OFFSET;
+    fc_params.filter_offset = 0;
     fc_params.output_offset = FULLY_CONNECTED_OUTPUT_OFFSET;
     fc_params.activation.min = FULLY_CONNECTED_OUT_ACTIVATION_MIN;
     fc_params.activation.max = FULLY_CONNECTED_OUT_ACTIVATION_MAX;
@@ -110,7 +110,7 @@ void fully_connected_mve_0_arm_fully_connected_s8(void)
     output_dims.n = FULLY_CONNECTED_MVE_0_INPUT_BATCHES;
     output_dims.c = FULLY_CONNECTED_MVE_0_OUT_CH;
     fc_params.input_offset = FULLY_CONNECTED_MVE_0_INPUT_OFFSET;
-    fc_params.filter_offset = FULLY_CONNECTED_MVE_0_WEIGHTS_OFFSET;
+    fc_params.filter_offset = 0;
     fc_params.output_offset = FULLY_CONNECTED_MVE_0_OUTPUT_OFFSET;
     fc_params.activation.min = FULLY_CONNECTED_MVE_0_OUT_ACTIVATION_MIN;
     fc_params.activation.max = FULLY_CONNECTED_MVE_0_OUT_ACTIVATION_MAX;
@@ -162,7 +162,7 @@ void fully_connected_mve_1_arm_fully_connected_s8(void)
     output_dims.n = FULLY_CONNECTED_MVE_1_INPUT_BATCHES;
     output_dims.c = FULLY_CONNECTED_MVE_1_OUT_CH;
     fc_params.input_offset = FULLY_CONNECTED_MVE_1_INPUT_OFFSET;
-    fc_params.filter_offset = FULLY_CONNECTED_MVE_1_WEIGHTS_OFFSET;
+    fc_params.filter_offset = 0;
     fc_params.output_offset = FULLY_CONNECTED_MVE_1_OUTPUT_OFFSET;
     fc_params.activation.min = FULLY_CONNECTED_MVE_1_OUT_ACTIVATION_MIN;
     fc_params.activation.max = FULLY_CONNECTED_MVE_1_OUT_ACTIVATION_MAX;
@@ -214,7 +214,7 @@ void fully_connected_null_bias_0_arm_fully_connected_s8(void)
     output_dims.n = FULLY_CONNECTED_NULL_BIAS_0_INPUT_BATCHES;
     output_dims.c = FULLY_CONNECTED_NULL_BIAS_0_OUT_CH;
     fc_params.input_offset = FULLY_CONNECTED_NULL_BIAS_0_INPUT_OFFSET;
-    fc_params.filter_offset = FULLY_CONNECTED_NULL_BIAS_0_WEIGHTS_OFFSET;
+    fc_params.filter_offset = 0;
     fc_params.output_offset = FULLY_CONNECTED_NULL_BIAS_0_OUTPUT_OFFSET;
     fc_params.activation.min = FULLY_CONNECTED_NULL_BIAS_0_OUT_ACTIVATION_MIN;
     fc_params.activation.max = FULLY_CONNECTED_NULL_BIAS_0_OUT_ACTIVATION_MAX;
@@ -277,7 +277,7 @@ void fully_connected_out_activation_arm_fully_connected_s8(void)
     output_dims.n = FULLY_CONNECTED_OUT_ACTIVATION_INPUT_BATCHES;
     output_dims.c = FULLY_CONNECTED_OUT_ACTIVATION_OUT_CH;
     fc_params.input_offset = FULLY_CONNECTED_OUT_ACTIVATION_INPUT_OFFSET;
-    fc_params.filter_offset = FULLY_CONNECTED_OUT_ACTIVATION_WEIGHTS_OFFSET;
+    fc_params.filter_offset = 0;
     fc_params.output_offset = FULLY_CONNECTED_OUT_ACTIVATION_OUTPUT_OFFSET;
     fc_params.activation.min = FULLY_CONNECTED_OUT_ACTIVATION_OUT_ACTIVATION_MIN;
     fc_params.activation.max = FULLY_CONNECTED_OUT_ACTIVATION_OUT_ACTIVATION_MAX;

+ 8 - 13
CMSIS/NN/Tests/UnitTest/generate_test_data.py

@@ -686,7 +686,7 @@ class FullyConnectedSettings(TestSettings):
 
     def __init__(self, dataset, testtype, args, in_ch=1, out_ch=1, x_in=1, y_in=1, w_x=1, w_y=1, stride_x=1, stride_y=1,
                  pad=False, randmin=-4, randmax=4, outminrange=-128, outmaxrange=127, batches=1, input_scale=1.0,
-                 input_zero_point=0, weights_scale=1.0, weights_zero_point=0, bias_scale=1.0, output_scale=1.0,
+                 input_zero_point=0, weights_scale=1.0, bias_scale=1.0, output_scale=1.0,
                  output_zero_point=0, generate_bias=True, out_activation_min=None, out_activation_max=None):
         super().__init__(dataset, testtype, args, in_ch, out_ch, x_in, y_in, w_x, w_y, stride_x, stride_y, pad, randmin,
                          randmax, outminrange, outmaxrange, batches, generate_bias=generate_bias,
@@ -700,7 +700,6 @@ class FullyConnectedSettings(TestSettings):
         self.input_scale = input_scale
         self.input_zero_point = input_zero_point
         self.weights_scale = weights_scale
-        self.weights_zero_point = weights_zero_point
         self.bias_scale = bias_scale
         self.output_scale = output_scale
         self.output_zero_point = output_zero_point
@@ -714,7 +713,6 @@ class FullyConnectedSettings(TestSettings):
 
         with open(filepath, "a") as f:
             self.write_c_header_offsets(f, prefix)
-            f.write("#define {}_WEIGHTS_OFFSET {}\n".format(prefix, -self.weights_zero_point))
             f.write("#define {}_OUTPUT_MULTIPLIER {}\n".format(prefix, self.quantized_multiplier))
             f.write("#define {}_OUTPUT_SHIFT {}\n".format(prefix, self.quantized_shift))
             f.write("#define {}_ACCUMULATION_DEPTH {}\n".format(prefix, self.input_ch*self.x_input*self.y_input))
@@ -736,7 +734,7 @@ class FullyConnectedSettings(TestSettings):
         return self.clamp(result, self.INT32_MIN, self.INT32_MAX)
 
     def quantize_weights(self, value):
-        result = round(value / self.weights_scale) + self.weights_zero_point
+        result = round(value / self.weights_scale)
         return self.clamp(result, self.INT8_MIN, self.INT8_MAX)
 
     def generate_data(self, input_data=None, weights=None, biases=None):
@@ -894,25 +892,22 @@ def load_all_testdatasets():
     dataset = 'fully_connected'
     ALL_TESTDATA_SETS[dataset] = FullyConnectedSettings(dataset, type_of_test, args, in_ch=10, out_ch=6, x_in=2, y_in=1,
                                                         w_x=2, w_y=1, batches=3, input_zero_point=-50,
-                                                        weights_zero_point=-22, output_zero_point=-2)
+                                                        output_zero_point=-2)
     dataset = 'fully_connected_mve_0'
     ALL_TESTDATA_SETS[dataset] = FullyConnectedSettings(dataset, type_of_test, args, in_ch=16, out_ch=9, x_in=1, y_in=1,
                                                         input_zero_point=-3, w_x=1, w_y=1, batches=1,
                                                         output_zero_point=-2)
     dataset = 'fully_connected_mve_1'
     ALL_TESTDATA_SETS[dataset] = FullyConnectedSettings(dataset, type_of_test, args, in_ch=20, out_ch=4, x_in=1, y_in=1,
-                                                        input_zero_point=-1, weights_zero_point=3, w_x=1, w_y=1,
-                                                        batches=1, output_zero_point=3)
+                                                        input_zero_point=-1, w_x=1, w_y=1, batches=1,
+                                                        output_zero_point=3)
     dataset = 'fully_connected_null_bias_0'
     ALL_TESTDATA_SETS[dataset] = FullyConnectedSettings(dataset, type_of_test, args, in_ch=33, out_ch=5,
-                                                        input_zero_point=-1, weights_zero_point=3, batches=2,
-                                                        generate_bias=False)
+                                                        input_zero_point=-1, batches=2, generate_bias=False)
     dataset = 'fully_connected_out_activation'
     ALL_TESTDATA_SETS[dataset] = FullyConnectedSettings(dataset, type_of_test, args, in_ch=10, out_ch=4, randmin=-15,
-                                                        randmax=15, input_zero_point=0, weights_zero_point=0,
-                                                        output_zero_point=0, out_activation_min=-105,
-                                                        out_activation_max=120)
-
+                                                        randmax=15, input_zero_point=0, output_zero_point=0,
+                                                        out_activation_min=-105, out_activation_max=120)
     type_of_test = 'avgpool'
     dataset = 'avgpooling'
     ALL_TESTDATA_SETS[dataset] = PoolingSettings(dataset, type_of_test, args, channels=8, x_in=22, y_in=12, stride_x=9,