Enable NNAPI I/O identify validation check (#4810)

Enable ValidationTestIdentify.DuplicateInputs and ValidationTestIdentify.DuplicateOutputs for acl_cl kernel
Enable all ValidationTestIdentify test for cpu kernel

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

diff --git a/runtimes/neurun/frontend/nnapi/wrapper/model.cc b/runtimes/neurun/frontend/nnapi/wrapper/model.cc
index c845251..6575a75 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/wrapper/model.cc
+++ b/runtimes/neurun/frontend/nnapi/wrapper/model.cc
@@ -164,6 +164,13 @@ bool ANeuralNetworksModel::addModelOutput(uint32_t index) noexcept
   try
   {
     const neurun::model::operand::Index ind{index};
+
+    // Duplicated output is not allowed
+    if (_model->getOutputs().contains(ind))
+    {
+      return false;
+    }
+
     _model->addOutput(ind);
   }
   catch (const std::exception &e)

diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun
index 3386be3..e14489e 100644 (file)
--- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun
+++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun
@@ -3,8 +3,6 @@
 #
 # Not support operations
 ValidationTestCompilation.Finish
-ValidationTestIdentify.DuplicateInputs
-ValidationTestIdentify.DuplicateOutputs
 ValidationTestExecution.SetInput
 ValidationTestExecution.SetOutput
 ValidationTestExecution.SetInputFromMemory

diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu
index 3fb6ae1..a527f27 100644 (file)
--- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu
+++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu
@@ -9,11 +9,6 @@ TrivialTest.BroadcastMulTwo
 ValidationTestCompilation.SetPreference
 ValidationTestCompilation.CreateExecution
 ValidationTestCompilation.Finish
-ValidationTestIdentify.InputIsOutput
-ValidationTestIdentify.OutputIsInput
-ValidationTestIdentify.DuplicateInputs
-ValidationTestIdentify.DuplicateOutputs
-ValidationTestIdentify.Ok
 ValidationTestExecution.SetInput
 ValidationTestExecution.SetOutput
 ValidationTestExecution.SetInputFromMemory

diff --git a/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun b/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun
index 4eed396..6969cca 100644 (file)
--- a/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun
+++ b/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun
@@ -9,11 +9,6 @@ TrivialTest.BroadcastMulTwo
 ValidationTestCompilation.SetPreference
 ValidationTestCompilation.CreateExecution
 ValidationTestCompilation.Finish
-ValidationTestIdentify.InputIsOutput
-ValidationTestIdentify.OutputIsInput
-ValidationTestIdentify.DuplicateInputs
-ValidationTestIdentify.DuplicateOutputs
-ValidationTestIdentify.Ok
 ValidationTestExecution.SetInput
 ValidationTestExecution.SetOutput
 ValidationTestExecution.SetInputFromMemory