parser add depthwidseconv

saber/funcs/detection_output.h

@@ -72,7 +72,7 @@ class DetectionOutput : public BaseFunc<
         CHECK_EQ(shape_out.dims(), 4) << "only support 4d layout";
         shape_out[0] = 1;
         shape_out[1] = 1;
-        shape_out[2] = param.keep_top_k;
+        shape_out[2] = param.keep_top_k * input[0]->num();
         shape_out[3] = 7;
 
         return output[0]->set_shape(shape_out);

tools/external_converter_v2/parser/caffe/caffe_layer_param_transmit.py

@@ -369,6 +369,10 @@ def Parser_convolutiondepthwise(args):
     else:
         OpsRegister()["Convolution"].axis = 1
     OpsRegister()["Convolution"].bias_term = convolution_param.bias_term
+<<<<<<< HEAD
+
+=======
+>>>>>>> upstream/developing
 
 @ParserFeedDecorator("Cropping")
 def Parser_crop(args):