OSDN Git Service

Add OEM_OPERATION to NN HAL.
authorMiao Wang <miaowang@google.com>
Wed, 30 Aug 2017 00:43:19 +0000 (17:43 -0700)
committerMiao Wang <miaowang@google.com>
Thu, 31 Aug 2017 17:57:29 +0000 (10:57 -0700)
Bug: 63905942
Test: mm
Test: All unit tests pass on Sailfish
Change-Id: I8c8068b248d682fbf1db37de78666c9cbca376b4

neuralnetworks/1.0/types.hal

index 4bd6a08..959506a 100644 (file)
@@ -41,40 +41,41 @@ enum OperandType : uint32_t {
 // TODO: Currently they are the same.  Add a conversion when finalizing the model.
 // When modifying, be sure to update HAL_NUM_OPERATION_TYPES in HalIntefaces.h.
 enum OperationType : uint32_t {
-    AVERAGE_POOL                 = 0,
-    CONCATENATION                = 1,
-    CONV                         = 2,
-    DEPTHWISE_CONV               = 3,
-    MAX_POOL                     = 4,
-    L2_POOL                      = 5,
-    DEPTH_TO_SPACE               = 6,
-    SPACE_TO_DEPTH               = 7,
-    LOCAL_RESPONSE_NORMALIZATION = 8,
-    SOFTMAX                      = 9,
-    RESHAPE                      = 10,
-    SPLIT                        = 11,
-    FAKE_QUANT                   = 12,
-    ADD                          = 13,
-    FULLY_CONNECTED              = 14,
-    CAST                         = 15,
-    MUL                          = 16,
-    L2_NORMALIZATION             = 17,
-    LOGISTIC                     = 18,
-    RELU                         = 19,
-    RELU6                        = 20,
-    RELU1                        = 21,
-    TANH                         = 22,
-    DEQUANTIZE                   = 23,
-    FLOOR                        = 24,
-    GATHER                       = 25,
-    RESIZE_BILINEAR              = 26,
-    LSH_PROJECTION               = 27,
-    LSTM                         = 28,
-    SVDF                         = 29,
-    RNN                          = 30,
-    N_GRAM                       = 31,
-    EMBEDDING_LOOKUP             = 32,
-    HASHTABLE_LOOKUP             = 33,
+    OEM_OPERATION                = 0,
+    AVERAGE_POOL                 = 1,
+    CONCATENATION                = 2,
+    CONV                         = 3,
+    DEPTHWISE_CONV               = 4,
+    MAX_POOL                     = 5,
+    L2_POOL                      = 6,
+    DEPTH_TO_SPACE               = 7,
+    SPACE_TO_DEPTH               = 8,
+    LOCAL_RESPONSE_NORMALIZATION = 9,
+    SOFTMAX                      = 10,
+    RESHAPE                      = 11,
+    SPLIT                        = 12,
+    FAKE_QUANT                   = 13,
+    ADD                          = 14,
+    FULLY_CONNECTED              = 15,
+    CAST                         = 16,
+    MUL                          = 17,
+    L2_NORMALIZATION             = 18,
+    LOGISTIC                     = 19,
+    RELU                         = 20,
+    RELU6                        = 21,
+    RELU1                        = 22,
+    TANH                         = 23,
+    DEQUANTIZE                   = 24,
+    FLOOR                        = 25,
+    GATHER                       = 26,
+    RESIZE_BILINEAR              = 27,
+    LSH_PROJECTION               = 28,
+    LSTM                         = 29,
+    SVDF                         = 30,
+    RNN                          = 31,
+    N_GRAM                       = 32,
+    EMBEDDING_LOOKUP             = 33,
+    HASHTABLE_LOOKUP             = 34,
 };
 
 // Two special values that can be used instead of a regular poolIndex.