modify code format

Author: jiangjiajun

.pre-commit-config.yaml

@@ -1,12 +1,8 @@
--   repo: local
+-   repo: https://github.com/PaddlePaddle/mirrors-yapf.git
+    sha: 0d79c0c469bab64f7229c9aca2b1186ef47f0e37
     hooks:
     -   id: yapf
-        name: yapf
-        entry: yapf
-        language: system
-        args: [-i, --style .style.yapf]
         files: \.py$
-
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     sha: a11d9314b22d8f8c7556443875b731ef05965464
     hooks:
@@ -18,6 +14,7 @@
     -   id: check-symlinks
     -   id: check-added-large-files
 -   repo: local
+
     hooks:
     -   id: copyright_checker
         name: copyright_checker

setup.py

@@ -11,8 +11,7 @@
     version=x2paddle.__version__,
     author="dltp-sz",
     author_email="[email protected]",
-    description=
-    "a toolkit for converting trained model to PaddlePaddle from other deep learning frameworks.",
+    description="a toolkit for converting trained model to PaddlePaddle from other deep learning frameworks.",
     long_description=long_description,
     long_description_content_type="text/plain",
     url="https://github.com/PaddlePaddle/x2paddle",
@@ -23,6 +22,4 @@
         "Operating System :: OS Independent",
     ],
     license='Apache 2.0',
-    entry_points={'console_scripts': [
-        'x2paddle=x2paddle.convert:main',
-    ]})
+    entry_points={'console_scripts': ['x2paddle=x2paddle.convert:main', ]})

x2paddle/convert.py

@@ -48,8 +48,7 @@ def arg_parser():
         "-f",
         type=_text_type,
         default=None,
-        help=
-        "define which deeplearning framework(tensorflow/caffe/onnx/paddle2onnx)"
+        help="define which deeplearning framework(tensorflow/caffe/onnx/paddle2onnx)"
     )
     parser.add_argument(
         "--caffe_proto",
@@ -126,7 +125,6 @@ def tf2paddle(model_path,
         optimizer.merge_bias()
         optimizer.optimize_sub_graph()
 
-
 #        optimizer.merge_batch_norm()
 #        optimizer.merge_prelu()
     else:

x2paddle/core/fluid_code.py

@@ -46,8 +46,9 @@ def get_code(self):
             for input in self.inputs:
                 if isinstance(input, GraphNode):
                     if hasattr(input, "index"):
-                        in_list += (input.layer_name + "[{}]".format(
-                            input.index) + ", ")
+                        in_list += (
+                            input.layer_name + "[{}]".format(input.index) + ", "
+                        )
                     else:
                         in_list += (input.layer_name + ", ")
                 elif isinstance(input, six.string_types):

x2paddle/decoder/caffe_decoder.py

@@ -34,8 +34,8 @@ def import_caffepb(self):
             if not os.path.isfile(self.caffe_proto):
                 raise Exception(
                     "The .py file compiled by caffe.proto is not exist.")
-            (filepath, tempfilename) = os.path.split(
-                os.path.abspath(self.caffe_proto))
+            (filepath,
+             tempfilename) = os.path.split(os.path.abspath(self.caffe_proto))
             (filename, extension) = os.path.splitext(tempfilename)
             sys.path.append(filepath)
             out = __import__(filename)
@@ -50,12 +50,10 @@ class CaffeGraphNode(GraphNode):
     def __init__(self, layer, type_str, layer_name=None):
         if layer_name is None:
             super(CaffeGraphNode, self).__init__(
-                layer,
-                layer.name.replace('/', '_').replace('-', '_'))
+                layer, layer.name.replace('/', '_').replace('-', '_'))
         else:
             super(CaffeGraphNode, self).__init__(
-                layer,
-                layer_name.replace('/', '_').replace('-', '_'))
+                layer, layer_name.replace('/', '_').replace('-', '_'))
         self.layer_type = type_str
         self.fluid_code = FluidCode()
         self.data = None