Add the missing auto-generated code

JDAI-CV · Nov 2, 2019 · e637232 · e637232
1 parent f498eac
commit e637232
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 7 deletions.
diff --git a/common/daq.fbs b/common/daq.fbs
@@ -5,9 +5,36 @@ enum DataType:byte { Float32, Int8, Int32, Float16, Bool8,
     QUANT8_ASYMM, QUANT8_SYMM, QUANT8_SYMM_PER_CHANNEL, 
     QUANT16_ASYMM, QUANT16_SYMM}
 enum FuseCode:byte { None, Relu, Relu1, Relu6 }
-enum LayerType:byte { Conv2D = 0, AvePool, MaxPool, Relu, Softmax, FC, Add, Concat,
-    DepthwiseConv2D, BatchToSpace, SpaceToBatch, StridedSlice, Mul, AddScalar, MulScalar,
-    Dequantize, LRN, Tanh, Floor, Logistic}
+enum LayerType:byte {
+// Auto generated layer types start
+    Conv2D,
+    AvePool,
+    MaxPool,
+    Relu,
+    Softmax,
+    FC,
+    Add,
+    Concat,
+    DepthwiseConv2D,
+    BatchToSpace,
+    SpaceToBatch,
+    StridedSlice,
+    Mul,
+    AddScalar,
+    MulScalar,
+    Dequantize,
+    LRN,
+    Tanh,
+    Floor,
+    Logistic,
+    PReLU,
+    Pow,
+    Neg,
+    Minimum,
+    Maximum,
+    Log,
+// Auto generated layer types end
+    }
 
 table Tensor {
     data_type:DataType;

diff --git a/generate_code.py b/generate_code.py
@@ -303,6 +303,9 @@ def generate_fbs():
     for i, op in enumerate(cfg):
         cogoutl(f"    {op['dnn']}_param:{op['dnn']};")
     update_code('common/daq.fbs', 'Auto generated fields', reformat=False)
+    for i, op in enumerate(cfg):
+        cogoutl(f"    {op['dnn']},")
+    update_code('common/daq.fbs', 'Auto generated layer types', reformat=False)
 
 
 def generate_model_builder():

diff --git a/include/common/daq_generated.h b/include/common/daq_generated.h
@@ -182,11 +182,17 @@ enum class LayerType : int8_t {
   Tanh = 17,
   Floor = 18,
   Logistic = 19,
+  PReLU = 20,
+  Pow = 21,
+  Neg = 22,
+  Minimum = 23,
+  Maximum = 24,
+  Log = 25,
   MIN = Conv2D,
-  MAX = Logistic
+  MAX = Log
 };
 
-inline const LayerType (&EnumValuesLayerType())[20] {
+inline const LayerType (&EnumValuesLayerType())[26] {
   static const LayerType values[] = {
     LayerType::Conv2D,
     LayerType::AvePool,
@@ -207,7 +213,13 @@ inline const LayerType (&EnumValuesLayerType())[20] {
     LayerType::LRN,
     LayerType::Tanh,
     LayerType::Floor,
-    LayerType::Logistic
+    LayerType::Logistic,
+    LayerType::PReLU,
+    LayerType::Pow,
+    LayerType::Neg,
+    LayerType::Minimum,
+    LayerType::Maximum,
+    LayerType::Log
   };
   return values;
 }
@@ -234,13 +246,19 @@ inline const char * const *EnumNamesLayerType() {
     "Tanh",
     "Floor",
     "Logistic",
+    "PReLU",
+    "Pow",
+    "Neg",
+    "Minimum",
+    "Maximum",
+    "Log",
     nullptr
   };
   return names;
 }
 
 inline const char *EnumNameLayerType(LayerType e) {
-  if (e < LayerType::Conv2D || e > LayerType::Logistic) return "";
+  if (e < LayerType::Conv2D || e > LayerType::Log) return "";
   const size_t index = static_cast<size_t>(e);
   return EnumNamesLayerType()[index];
 }