未验证 提交 dbc32e66 编写于 作者: J Jason 提交者: GitHub

Merge pull request #147 from mamingjie-China/develop

modify the output
...@@ -31,7 +31,6 @@ def register(kind, shape, layer, weights): ...@@ -31,7 +31,6 @@ def register(kind, shape, layer, weights):
k) is str, 'invalid param "kind" for register, not a list of str' k) is str, 'invalid param "kind" for register, not a list of str'
assert k not in g_custom_layers, 'this type[%s] has already been registered' % ( assert k not in g_custom_layers, 'this type[%s] has already been registered' % (
k) k)
print('register layer[%s]' % (k))
g_custom_layers[k] = { g_custom_layers[k] = {
'shape': shape, 'shape': shape,
'layer': layer, 'layer': layer,
......
...@@ -124,9 +124,6 @@ class CaffeOpMapper(OpMapper): ...@@ -124,9 +124,6 @@ class CaffeOpMapper(OpMapper):
data[idx] = np.squeeze(d, axis=sq_axis) data[idx] = np.squeeze(d, axis=sq_axis)
shape_new = data[idx].shape shape_new = data[idx].shape
if len(shape_old) != shape_new:
print('squeeze idx:%d, with kind:%s,name:%s' % \
(idx, node.layer_type, node.layer.name))
return data return data
def get_kernel_parameters(self, kind, params): def get_kernel_parameters(self, kind, params):
...@@ -956,7 +953,6 @@ class CaffeOpMapper(OpMapper): ...@@ -956,7 +953,6 @@ class CaffeOpMapper(OpMapper):
input = self.graph.get_bottom_node(node, idx=i, copy=True) input = self.graph.get_bottom_node(node, idx=i, copy=True)
if i == 1 and op == 'DetectionOutput': if i == 1 and op == 'DetectionOutput':
input = self.graph.get_bottom_node(node, idx=i, copy=True) input = self.graph.get_bottom_node(node, idx=i, copy=True)
print(input.layer_type)
while input is not None and input.layer_type != 'Softmax': while input is not None and input.layer_type != 'Softmax':
input = self.graph.get_bottom_node(input, idx=0, copy=True) input = self.graph.get_bottom_node(input, idx=0, copy=True)
assert input is not None, 'This kind of DetectionOutput is not supported!' assert input is not None, 'This kind of DetectionOutput is not supported!'
......
...@@ -44,7 +44,6 @@ def register(kind, shape, layer, child_func, weights): ...@@ -44,7 +44,6 @@ def register(kind, shape, layer, child_func, weights):
k) is str, 'invalid param "kind" for register, not a list of str' k) is str, 'invalid param "kind" for register, not a list of str'
assert k not in g_custom_layers, 'this type[%s] has already been registered' % ( assert k not in g_custom_layers, 'this type[%s] has already been registered' % (
k) k)
print('register layer[%s]' % (k))
g_custom_layers[k] = { g_custom_layers[k] = {
'shape': shape, 'shape': shape,
'layer': layer, 'layer': layer,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册