Implement ANeuralNetworksModel_addOperationEx in sample runtimes (#1515)

This commit implements ANeuralNetworksModel_addOperationEx in sample
runtimes (logging, template).

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/runtimes/logging/src/nnapi_logging.cc b/runtimes/logging/src/nnapi_logging.cc
index 876a072..d3c7b0f 100644 (file)
--- a/runtimes/logging/src/nnapi_logging.cc
+++ b/runtimes/logging/src/nnapi_logging.cc
@@ -1,4 +1,5 @@
 #include <NeuralNetworks.h>
+#include <NeuralNetworksEx.h>
 
 #include <stdexcept>
 #include <iostream>
@@ -251,6 +252,29 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model,
   return ANEURALNETWORKS_NO_ERROR;
 }
 
+int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model,
+                                        ANeuralNetworksOperationTypeEx type, uint32_t inputCount,
+                                        const uint32_t *inputs, uint32_t outputCount,
+                                        const uint32_t *outputs)
+{
+  std::cout << __FUNCTION__ << "(model: " << model
+            << ", type: " << type
+            << ", inputCount: " << inputCount << ", outputCount: " << outputCount << ")"
+            << std::endl;
+
+  for (uint32_t input = 0; input < inputCount; ++input)
+  {
+    std::cout << "  input(" << input << "): " << inputs[input] << std::endl;
+  }
+  for (uint32_t output = 0; output < outputCount; ++output)
+  {
+    std::cout << "  output(" << output << "): " << outputs[output] << std::endl;
+  }
+
+  return ANEURALNETWORKS_NO_ERROR;
+}
+
+
 int ANeuralNetworksModel_identifyInputsAndOutputs(ANeuralNetworksModel *model,
                                                   uint32_t inputCount,
                                                   const uint32_t *inputs,

diff --git a/runtimes/template/src/model.cc b/runtimes/template/src/model.cc
index 79baa73..f2d65d2 100644 (file)
--- a/runtimes/template/src/model.cc
+++ b/runtimes/template/src/model.cc
@@ -1,4 +1,5 @@
 #include <NeuralNetworks.h>
+#include <NeuralNetworksEx.h>
 
 #include "model.h"
 
@@ -39,6 +40,14 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model,
   return ANEURALNETWORKS_NO_ERROR;
 }
 
+int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel* model,
+                                        ANeuralNetworksOperationTypeEx type, uint32_t inputCount,
+                                        const uint32_t* inputs, uint32_t outputCount,
+                                        const uint32_t* outputs)
+{
+  return ANEURALNETWORKS_NO_ERROR;
+}
+
 int ANeuralNetworksModel_identifyInputsAndOutputs(ANeuralNetworksModel *model,
                                                   uint32_t inputCount,
                                                   const uint32_t *inputs,