Fix split implementation and test (#4622)

* Fix split implementation and test

Fix plit implementation based on NeuralNetworksEx.h spec
- Fix split in nnapi_delegate.cpp
- Fix pacl implementation
- Fix spli test

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

* Fix comment

11 files changed, 22 insertions, 11 deletions

diff --git a/tests/nnapi/specs/Ex/split_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/split_ex_1D_float.mod.py
index 97b61462e..137ece828 100644
--- a/tests/nnapi/specs/Ex/split_ex_1D_float.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_1D_float.mod.py
@@ -2,6 +2,7 @@
 model = Model()
 i1 = Input("op1", "TENSOR_FLOAT32", "{8}")
 axis = Int32Scalar("axis", 0)
+num_out = Int32Scalar("num_out", 8)
 i2 = Output("op2", "TENSOR_FLOAT32", "{1}")
 i3 = Output("op3", "TENSOR_FLOAT32", "{1}")
 i4 = Output("op4", "TENSOR_FLOAT32", "{1}")
@@ -11,7 +12,7 @@ i7 = Output("op7", "TENSOR_FLOAT32", "{1}")
 i8 = Output("op8", "TENSOR_FLOAT32", "{1}")
 i9 = Output("op9", "TENSOR_FLOAT32", "{1}")
 
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3, i4, i5, i6, i7, i8, i9])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3, i4, i5, i6, i7, i8, i9])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_1D_int32.mod.py b/tests/nnapi/specs/Ex/split_ex_1D_int32.mod.py
index 378b37707..9bfc215f6 100644
--- a/tests/nnapi/specs/Ex/split_ex_1D_int32.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_1D_int32.mod.py
@@ -2,6 +2,7 @@
 model = Model()
 i1 = Input("op1", "TENSOR_INT32", "{8}")
 axis = Int32Scalar("axis", 0)
+num_out = Int32Scalar("num_out", 8)
 i2 = Output("op2", "TENSOR_INT32", "{1}")
 i3 = Output("op3", "TENSOR_INT32", "{1}")
 i4 = Output("op4", "TENSOR_INT32", "{1}")
@@ -11,7 +12,7 @@ i7 = Output("op7", "TENSOR_INT32", "{1}")
 i8 = Output("op8", "TENSOR_INT32", "{1}")
 i9 = Output("op9", "TENSOR_INT32", "{1}")
 
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3, i4, i5, i6, i7, i8, i9])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3, i4, i5, i6, i7, i8, i9])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_float_1.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_float_1.mod.py
index 3059fae7c..2353a8a0f 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_float_1.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_float_1.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_FLOAT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", 0)
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_FLOAT32", "{1,2,2,2}")
 i3 = Output("op3", "TENSOR_FLOAT32", "{1,2,2,2}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_float_2.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_float_2.mod.py
index faa59bc3c..30ecf2416 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_float_2.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_float_2.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_FLOAT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", 3)
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_FLOAT32", "{2,2,2,1}")
 i3 = Output("op3", "TENSOR_FLOAT32", "{2,2,2,1}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_float_3.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_float_3.mod.py
index 2091e4b4a..1f7a07880 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_float_3.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_float_3.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_FLOAT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", -4) # Negative axis
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_FLOAT32", "{1,2,2,2}")
 i3 = Output("op3", "TENSOR_FLOAT32", "{1,2,2,2}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_int32_1.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_1.mod.py
index 3e9438f50..b1c6692ee 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_int32_1.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_int32_1.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_INT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", 0)
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_INT32", "{1,2,2,2}")
 i3 = Output("op3", "TENSOR_INT32", "{1,2,2,2}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_int32_2.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_2.mod.py
index 83253cb14..88a7cca48 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_int32_2.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_int32_2.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_INT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", 1)
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_INT32", "{2,1,2,2}")
 i3 = Output("op3", "TENSOR_INT32", "{2,1,2,2}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_int32_3.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_3.mod.py
index b20b2053b..6f5cc621b 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_int32_3.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_int32_3.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_INT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", 2)
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_INT32", "{2,2,1,2}")
 i3 = Output("op3", "TENSOR_INT32", "{2,2,1,2}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_int32_4.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_4.mod.py
index 3c255cc48..fb6710171 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_int32_4.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_int32_4.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_INT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", 3)
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_INT32", "{2,2,2,1}")
 i3 = Output("op3", "TENSOR_INT32", "{2,2,2,1}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_int32_5.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_5.mod.py
index 30e5e245d..338794855 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_int32_5.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_int32_5.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_INT32", "{2,2,2,2}")
 axis = Int32Scalar("axis", -4) # Negative axis
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_INT32", "{1,2,2,2}")
 i3 = Output("op3", "TENSOR_INT32", "{1,2,2,2}")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0
diff --git a/tests/nnapi/specs/Ex/split_ex_4D_quant8.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_quant8.mod.py
index 46cb3ab78..a3dbffaa9 100644
--- a/tests/nnapi/specs/Ex/split_ex_4D_quant8.mod.py
+++ b/tests/nnapi/specs/Ex/split_ex_4D_quant8.mod.py
@@ -2,9 +2,10 @@
 model = Model()
 i1 = Input("op1", "TENSOR_QUANT8_ASYMM", "{2,2,2,2}, 0.5f, 1")
 axis = Int32Scalar("axis", 0)
+num_out = Int32Scalar("num_out", 2)
 i2 = Output("op2", "TENSOR_QUANT8_ASYMM", "{1,2,2,2}, 0.5f, 1")
 i3 = Output("op3", "TENSOR_QUANT8_ASYMM", "{1,2,2,2}, 0.5f, 1")
-model = model.Operation("SPLIT_EX", axis, i1).To([i2, i3])
+model = model.Operation("SPLIT_EX", i1, axis, num_out).To([i2, i3])
 
 # Example 1. Input in operand 0,
 input0 = {i1: # input 0