JDAI-CV
diff --git a/‎common/daq.fbs‎
Lines changed: 7 additions & 1 deletion b/‎common/daq.fbs‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎dnnlibrary/DaqReader.cpp‎
Lines changed: 31 additions & 33 deletions b/‎dnnlibrary/DaqReader.cpp‎
Lines changed: 31 additions & 33 deletions
@@ -7,7 +7,7 @@ enum DataType:byte { Float32 = 0, Int8, Int32, Float16, Bool8,
 enum FuseCode:byte { None = 0, 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}
+    Dequantize, LRN, Tanh, Floor, Logistic}
 
 table Tensor {
     data_type:DataType;
@@ -174,6 +174,11 @@ table Floor {
     output:string;
 }
 
+table Logistic {
+    input:string;
+    output:string;
+}
+
 table Layer {
     type:LayerType;
     conv2d_param:Conv2D;
@@ -195,6 +200,7 @@ table Layer {
     lrn_param:LRN;
     tanh_param:Tanh;
     floor_param:Floor;
+    logistic_param:Logistic;
 }
 
 table Model {
 
@@ -19,44 +19,48 @@ void ReadDaqImpl(const uint8_t *buf, ModelBuilder &builder);
 
 std::string layer_type_to_str(DNN::LayerType type) {
     switch (type) {
+            // DaqReader auto generated layer_type_to_str start
+        case DNN::LayerType::Conv2D:
+            return "Conv2D";
+        case DNN::LayerType::AvePool:
+            return "AvePool";
+        case DNN::LayerType::MaxPool:
+            return "MaxPool";
+        case DNN::LayerType::Relu:
+            return "Relu";
+        case DNN::LayerType::Softmax:
+            return "Softmax";
         case DNN::LayerType::FC:
-            return "fc";
+            return "FC";
         case DNN::LayerType::Add:
             return "Add";
-        case DNN::LayerType::Relu:
-            return "relu";
-        case DNN::LayerType::Conv2D:
-            return "conv";
         case DNN::LayerType::Concat:
-            return "concat";
-        case DNN::LayerType::MaxPool:
-            return "maxpool";
-        case DNN::LayerType::AvePool:
-            return "avepool";
-        case DNN::LayerType::Softmax:
-            return "softmax";
+            return "Concat";
         case DNN::LayerType::DepthwiseConv2D:
-            return "depthwsie";
+            return "DepthwiseConv2D";
         case DNN::LayerType::BatchToSpace:
-            return "batch2space";
+            return "BatchToSpace";
         case DNN::LayerType::SpaceToBatch:
-            return "space2batch";
+            return "SpaceToBatch";
         case DNN::LayerType::StridedSlice:
-            return "stridedslice";
+            return "StridedSlice";
         case DNN::LayerType::Mul:
-            return "mul";
-        case DNN::LayerType::MulScalar:
-            return "mulscalar";
+            return "Mul";
         case DNN::LayerType::AddScalar:
-            return "addscalar";
+            return "AddScalar";
+        case DNN::LayerType::MulScalar:
+            return "MulScalar";
         case DNN::LayerType::Dequantize:
-            return "dequantize";
+            return "Dequantize";
         case DNN::LayerType::LRN:
             return "LRN";
         case DNN::LayerType::Tanh:
-            return "tanh";
+            return "Tanh";
         case DNN::LayerType::Floor:
-            return "floor";
+            return "Floor";
+        case DNN::LayerType::Logistic:
+            return "Logistic";
+            // DaqReader auto generated layer_type_to_str end
     }
 }
 
@@ -275,29 +279,19 @@ void AddLayers(const DNN::Model &model, ModelBuilder &builder) {
                 break;
             }
             case DNN::LayerType::BatchToSpace: {
-#if __ANDROID_API__ >= __ANDROID_API_P__
                 ADD_LAYER(batch_to_space, BatchToSpaceND, input, block_sizes,
                           output);
                 break;
-#endif
             }
             case DNN::LayerType::SpaceToBatch: {
-#if __ANDROID_API__ >= __ANDROID_API_P__
                 ADD_LAYER(space_to_batch, SpaceToBatchND, input, block_sizes,
                           pads, output);
                 break;
-#endif
             }
             case DNN::LayerType::StridedSlice: {
-#if __ANDROID_API__ >= __ANDROID_API_P__
                 ADD_LAYER(strided_slice, StridedSlice, input, starts, ends,
                           strides, begin_mask, end_mask, shrink_axis_mask,
                           output);
-#else
-                throw std::invalid_argument("Unsupported layer " +
-                                            layer_type_to_str(layer->type()) +
-                                            " in API 28");
-#endif
                 break;
             }
             case DNN::LayerType::LRN: {
@@ -312,6 +306,10 @@ void AddLayers(const DNN::Model &model, ModelBuilder &builder) {
                 ADD_LAYER(floor, Floor, input, output);
                 break;
             }
+            case DNN::LayerType::Logistic: {
+                ADD_LAYER(logistic, Logistic, input, output);
+                break;
+            }
         }
     }
 }