From: Rafal Walczyna <r.walczyna@samsung.com>
Date: Mon, 14 Jun 2021 09:17:33 +0000 (+0200)
Subject: [ML] Add new HWType and NNFWType enums
X-Git-Tag: submit/tizen/20210616.104612~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae9afa9bb229813b088f5fab306eab5a0b6f9086;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[ML] Add new HWType and NNFWType enums

[XWALK-2312]
[TWDAPI-277]

Tested also with code:
var HWType = ["ANY", "NPU_SLSI"];

var NNFWType = ["ANY", "NNTR_INF", "PYTORCH", "SRNPU", "VD_AIFW"];

HWType.forEach(hw => {
    NNFWType.forEach(nnfw => {
        console.log(nnfw + ", " + hw + ": " + tizen.ml.checkNNFWAvailability(nnfw, hw))
    });
});

[Verification] 100% passrate

Change-Id: I9257240d1596c2b017581997b488a01447385060
Signed-off-by: Rafal Walczyna <r.walczyna@samsung.com>
---

diff --git a/src/ml/js/ml_manager.js b/src/ml/js/ml_manager.js
index 92167d2a..afdc2a3a 100755
--- a/src/ml/js/ml_manager.js
+++ b/src/ml/js/ml_manager.js
@@ -40,7 +40,11 @@ var NNFWType = {
     SNPE: 'SNPE',
     TENSORFLOW: 'TENSORFLOW',
     TENSORFLOW_LITE: 'TENSORFLOW_LITE',
-    VIVANTE: 'VIVANTE'
+    VIVANTE: 'VIVANTE',
+    PYTORCH: 'PYTORCH',
+    NNTR_INF: 'NNTR_INF',
+    VD_AIFW: 'VD_AIFW',
+    SRNPU: 'SRNPU'
 };
 
 var HWType = {
@@ -54,7 +58,8 @@ var HWType = {
     NPU_EDGE_TPU: 'NPU_EDGE_TPU',
     NPU_MOVIDIUS: 'NPU_MOVIDIUS',
     NPU_SR: 'NPU_SR',
-    NPU_VIVANTE: 'NPU_VIVANTE'
+    NPU_VIVANTE: 'NPU_VIVANTE',
+    NPU_SLSI: 'NPU_SLSI'
 };
 
 MachineLearningManager.prototype.checkNNFWAvailability = function() {
diff --git a/src/ml/ml_utils.cc b/src/ml/ml_utils.cc
index 3c42b184..14a516ec 100644
--- a/src/ml/ml_utils.cc
+++ b/src/ml/ml_utils.cc
@@ -32,6 +32,7 @@ const PlatformEnum<ml_nnfw_hw_e> HWTypeEnum{{"ANY", ML_NNFW_HW_ANY},
                                             {"NPU", ML_NNFW_HW_NPU},
                                             {"NPU_EDGE_TPU", ML_NNFW_HW_NPU_EDGE_TPU},
                                             {"NPU_MOVIDIUS", ML_NNFW_HW_NPU_MOVIDIUS},
+                                            {"NPU_SLSI", ML_NNFW_HW_NPU_SLSI},
                                             {"NPU_SR", ML_NNFW_HW_NPU_SR},
                                             {"NPU_VIVANTE", ML_NNFW_HW_NPU_VIVANTE}};
 
@@ -41,10 +42,14 @@ const PlatformEnum<ml_nnfw_type_e> NNFWTypeEnum{{"ANY", ML_NNFW_TYPE_ANY},
                                                 {"EDGE_TPU", ML_NNFW_TYPE_EDGE_TPU},
                                                 {"MVNC", ML_NNFW_TYPE_MVNC},
                                                 {"NNFW", ML_NNFW_TYPE_NNFW},
+                                                {"NNTR_INF", ML_NNFW_TYPE_NNTR_INF},
                                                 {"OPEN_VINO", ML_NNFW_TYPE_OPENVINO},
+                                                {"PYTORCH", ML_NNFW_TYPE_PYTORCH},
                                                 {"SNPE", ML_NNFW_TYPE_SNPE},
+                                                {"SRNPU", ML_NNFW_TYPE_SRNPU},
                                                 {"TENSORFLOW", ML_NNFW_TYPE_TENSORFLOW},
                                                 {"TENSORFLOW_LITE", ML_NNFW_TYPE_TENSORFLOW_LITE},
+                                                {"VD_AIFW", ML_NNFW_TYPE_VD_AIFW},
                                                 {"VIVANTE", ML_NNFW_TYPE_VIVANTE}};
 
 const PlatformEnum<ml_tensor_type_e> TensorTypeEnum{