Convert TF Lite's DIV to NN API's (#1398)

For #1199 and #1366

This commit links TF Lite's DIV operation to NN API's.  It also enables
the Div test in the framework test.

Signed-off-by: Sangmin Seo <sangmin7.seo@samsung.com>

diff --git a/libs/support/tflite/src/nnapi_delegate.cpp b/libs/support/tflite/src/nnapi_delegate.cpp
index 371f2c1..59e109c 100644 (file)
--- a/libs/support/tflite/src/nnapi_delegate.cpp
+++ b/libs/support/tflite/src/nnapi_delegate.cpp
@@ -242,6 +242,10 @@ void AddOpsAndParams(tflite::Interpreter *interpreter, ANeuralNetworksModel *nn_
         nn_op_type = ANEURALNETWORKS_SUB;
         add_add_params();
         break;
+      case tflite::BuiltinOperator_DIV:
+        nn_op_type = ANEURALNETWORKS_DIV;
+        add_add_params();
+        break;
       case tflite::BuiltinOperator_AVERAGE_POOL_2D:
         add_pooling_params(node.builtin_data);
         nn_op_type = ANEURALNETWORKS_AVERAGE_POOL_2D;
@@ -329,7 +333,6 @@ void AddOpsAndParams(tflite::Interpreter *interpreter, ANeuralNetworksModel *nn_
       case tflite::BuiltinOperator_TOPK_V2:
       case tflite::BuiltinOperator_TRANSPOSE:
       case tflite::BuiltinOperator_MEAN:
-      case tflite::BuiltinOperator_DIV:
       case tflite::BuiltinOperator_SPLIT:
       case tflite::BuiltinOperator_SQUEEZE:
       case tflite::BuiltinOperator_STRIDED_SLICE:

diff --git a/tests/framework/tests/div/broadcast/config.sh b/tests/framework/tests/div/broadcast/config.sh
index 4fd08b0..164b201 100644 (file)
--- a/tests/framework/tests/div/broadcast/config.sh
+++ b/tests/framework/tests/div/broadcast/config.sh
@@ -1,3 +1,2 @@
 MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
 MODELFILE_NAME="div_test_broadcast.tflite"
-STATUS="disabled"