Fix bug in binary op

Author: v-shux

keras2ncnn/keras_converter.py

@@ -424,6 +424,8 @@ def SeparableConv2D_helper(
         else:
             activation_type = 0
 
+        weight_data_size = int(layer['weight']['pointwise_kernel:0'].size)
+
         ncnn_graph_attr = ncnn_helper.dump_args(
             'Convolution',
             num_output=num_output,
@@ -497,15 +499,15 @@ def Add_helper(
             keras_graph_helper,
             ncnn_graph_helper,
             ncnn_helper):
-        ncnn_graph_attr = ncnn_helper.dump_args('Eltwise', op_type=1)
+        ncnn_graph_attr = ncnn_helper.dump_args('BinaryOp', op_type=0, with_scalar=0)
 
         ncnn_graph_helper.node(
             layer['layer']['name'],
             keras_graph_helper.get_node_inbounds(
                 layer['layer']['name']))
         ncnn_graph_helper.set_node_attr(
             layer['layer']['name'], {
-                'type': 'Eltwise', 'param': ncnn_graph_attr, 'binary': []})
+                'type': 'BinaryOp', 'param': ncnn_graph_attr, 'binary': []})
 
     def Multiply_helper(
             self,
@@ -1090,15 +1092,15 @@ def Maximum_helper(
             keras_graph_helper,
             ncnn_graph_helper,
             ncnn_helper):
-        ncnn_graph_attr = ncnn_helper.dump_args('Eltwise', op_type=2)
+        ncnn_graph_attr = ncnn_helper.dump_args('BinaryOp', op_type=4, with_scalar=0)
 
         ncnn_graph_helper.node(
             layer['layer']['name'],
             keras_graph_helper.get_node_inbounds(
                 layer['layer']['name']))
         ncnn_graph_helper.set_node_attr(
             layer['layer']['name'], {
-                'type': 'Eltwise', 'param': ncnn_graph_attr, 'binary': []})
+                'type': 'BinaryOp', 'param': ncnn_graph_attr, 'binary': []})
 
     def TensorFlowOpLayer_helper(
             self,
@@ -1140,7 +1142,7 @@ def TensorFlowOpLayer_helper(
             #         'type': 'MemoryData', 'param': ncnn_graph_attr, 'binary': [[constant['0']]]})
 
             # Insert the mul layer
-            ncnn_graph_attr = ncnn_helper.dump_args('BinaryOp', op_type=2, with_scalar=constant['0'])
+            ncnn_graph_attr = ncnn_helper.dump_args('BinaryOp', op_type=2, with_scalar=1, b=constant['0'])
 
             ncnn_graph_helper.node(
                 layer['layer']['name'],

keras2ncnn/ncnn_param.py

@@ -12,7 +12,7 @@ class NcnnParamDispatcher:
         'BinaryOp': {
             0: {'op_type': 0},
             1: {'with_scalar': 0},
-            # 2: {'b': 0.},
+            2: {'b': 0.},
         },
 
         'Clip': {