Merge pull request #132 from SunAhong1993/master

Master

caffe2fluid/kaffe/custom_layers/normalize.py

@@ -47,7 +47,6 @@ def normalize_layer(input,
     scale_attr = fluid.ParamAttr(name=param_prefix + '_scale')
     scale_param = fluid.layers.create_parameter(
         shape=shape, dtype=input.dtype, name=name, attr=scale_attr)
-
     out = fluid.layers.elementwise_mul(
         x=l2_norm, y=scale_param, axis=-1 if channel_shared else 1)
     return out

caffe2fluid/kaffe/custom_layers/priorbox.py

@@ -32,7 +32,7 @@ def priorbox_layer(inputs,
                    name,
                    min_size,
                    max_size=None,
-                   aspect_ratio=None,
+                   aspect_ratio=1.0,
                    variance=[0.1, 0.1, 0.2, 0.2],
                    flip=False,
                    clip=False,

caffe2fluid/kaffe/net_template.py

@@ -100,7 +100,7 @@ def main():
     npy_weight = args.npy_path
     fluid_model = args.model_param_path
     outputs = None
-    if len(sys.argv) >= 6:
+    if args.need_layers_name:
         outputs = args.need_layers_name.split(',')
 
     ret = MyNet.convert(npy_weight, fluid_model, outputs)