diff --git a/.travis.yml b/.travis.yml index 69cd7c720dffc742458dba0bb432794b160026e4..7f181a905b9ae093bc183890ac3ef0b167fd0cdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: - '3.6' script: - - if [[ $TRAVIS_PYTHON_VERSION != 2.7 ]]; then /bin/bash ./scripts/check_code_style.sh; fi + - if [[ $TRAVIS_PYTHON_VERSION != 2.7 ]]; then /bin/bash ./tools/check_code_style.sh; fi notifications: email: diff --git a/scripts/check_code_style.sh b/tools/check_code_style.sh similarity index 100% rename from scripts/check_code_style.sh rename to tools/check_code_style.sh diff --git a/x2paddle/__init__.py b/x2paddle/__init__.py index 98a433b31058a4c8166312666d91533a8e53e50a..3d187266f146fb216a04537da37dc5df0811acc4 100644 --- a/x2paddle/__init__.py +++ b/x2paddle/__init__.py @@ -1 +1 @@ -__version__ = "0.4.5" +__version__ = "0.5.0" diff --git a/x2paddle/op_mapper/caffe_op_mapper.py b/x2paddle/op_mapper/caffe_op_mapper.py index 1d451639e7063b72b888ecf913c9d2be9cc8bb3e..3e3f249f2e75ace83876d5154aa1f9a034f1b668 100644 --- a/x2paddle/op_mapper/caffe_op_mapper.py +++ b/x2paddle/op_mapper/caffe_op_mapper.py @@ -954,6 +954,13 @@ class CaffeOpMapper(OpMapper): inputs_node = [] for i in range(len(node.inputs)): input = self.graph.get_bottom_node(node, idx=i, copy=True) + if i == 1 and op == 'DetectionOutput': + 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': + input = self.graph.get_bottom_node(input, idx=0, copy=True) + assert input is not None, 'This kind of DetectionOutput is not supported!' + input = self.graph.get_bottom_node(input, idx=0, copy=True) inputs_node.append(input) node.fluid_code.add_layer(func.__code__.co_name, inputs=inputs_node,