Merge pull request #19 from kuke/convert_conv

Support conversion of recognize_digits models

README.md

@@ -43,10 +43,10 @@ TBD
 
 ## Supported models
 
-We aim to at least support all the models from our model bank. During our preliminary stage, we plan to support the models generated from:
+We aim to at least support all the models from our model bank. During our preliminary stage, we have validated the inference model's conversion on following models:
 
 - [fit_a_line](https://github.com/PaddlePaddle/Paddle/blob/develop/python/paddle/fluid/tests/book/test_fit_a_line.py)
-- [machine_translation](https://github.com/PaddlePaddle/Paddle/blob/develop/python/paddle/fluid/tests/book/test_machine_translation.py)
+- [recognize_digits](https://github.com/PaddlePaddle/Paddle/blob/develop/python/paddle/fluid/tests/book/test_recognize_digits.py)
 
 ## License
 Provided under the [Apache-2.0 license](LICENSE).

convert.py

@@ -20,7 +20,6 @@
 
 import fluid_onnx.ops as ops
 from fluid_onnx.variables import paddle_variable_to_onnx_tensor
-from fluid_onnx.variables import PADDLE_TO_ONNX_DTYPE
 
 
 def parse_args():
@@ -59,16 +58,8 @@ def convert(args):
         for var_name in global_block.vars:
             var = global_block.var(var_name)
             if var_name not in ['feed', 'fetch'] and var.persistable:
-                param = fluid.executor.fetch_var(var_name, inference_scope)
-                param_node = helper.make_node(
-                    'Constant',
-                    inputs=[],
-                    outputs=[var_name],
-                    value=helper.make_tensor(
-                        name=var_name,
-                        dims=var.shape,
-                        data_type=PADDLE_TO_ONNX_DTYPE[var.dtype],
-                        vals=param.flatten().tolist()))
+                param_node = ops.node_maker['constant'](var=var,
+                                                        scope=inference_scope)
                 onnx_nodes.append(param_node)
 
         # Create inputs
@@ -92,12 +83,13 @@ def convert(args):
                 if op.type in ops.node_maker:
                     # TODO(kuke): deal with the corner case that vars in 
                     #     different blocks have the same name
-                    node_proto = ops.node_maker[op.type](
-                        inputs=op.input_arg_names,
-                        attrs=op.attr_names,
-                        outputs=op.output_arg_names)
+                    node_proto = ops.node_maker[op.type](operator=op,
+                                                         scope=inference_scope)
 
-                    onnx_nodes.append(node_proto)
+                    if isinstance(node_proto, tuple):
+                        onnx_nodes.extend(list(node_proto))
+                    else:
+                        onnx_nodes.append(node_proto)
                 else:
                     if op.type not in ['feed', 'fetch']:
                         raise NotImplementedError("OP[%s] is not supported in "
@@ -113,7 +105,7 @@ def convert(args):
         # Model check
         checker.check_model(onnx_model)
 
-        # Output readable model
+        # Print model
         print("The converted model is:\n{}".format(onnx_model))
 
         # Save converted model

fluid/__init__.py

@@ -0,0 +1,13 @@
+#   Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

fluid/utils.py

@@ -0,0 +1,23 @@
+# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+def get_op_io_info(op):
+    inputs = dict([(name, op.input(name)) for name in op.input_names])
+    attrs = dict(
+        [(name, op.attr(name))
+         for name in op.attr_names]) if op.attr_names is not None else None
+    outputs = dict([(name, op.output(name)) for name in op.output_names])
+
+    return inputs, attrs, outputs