merge develop to gpugraph

.clang-format

@@ -24,4 +24,6 @@ Standard:  Cpp11
 AllowAllParametersOfDeclarationOnNextLine: true
 BinPackParameters: false
 BinPackArguments: false
+IncludeBlocks: Preserve
+IncludeIsMainSourceRegex: (\.cu)$
 ...

.cmake-format.py

@@ -0,0 +1,125 @@
+# Copyright (c) 2022 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.
+
+# -----------------------------
+# Options affecting formatting.
+# -----------------------------
+with section("format"):
+
+    # How wide to allow formatted cmake files
+    line_width = 80
+
+# ------------------------------------------------
+# Options affecting comment reflow and formatting.
+# ------------------------------------------------
+with section("markup"):
+    # enable comment markup parsing and reflow
+    enable_markup = False
+
+    # If comment markup is enabled, don't reflow the first comment block in each
+    # listfile. Use this to preserve formatting of your copyright/license
+    # statements.
+    first_comment_is_literal = True
+
+# ----------------------------------
+# Options affecting listfile parsing
+# ----------------------------------
+with section("parse"):
+    # Additional FLAGS and KWARGS for custom commands
+    additional_commands = {
+        "cc_library": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "nv_library": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "hip_library": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "xpu_library": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "hip_library": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "hip_library": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "go_library": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "copy": {
+            "kwargs": {
+                "SRCS": '*',
+                "DSTS": '*',
+            }
+        },
+        "cc_test": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "nv_test": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "hip_test": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "xpu_test": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "go_test": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        },
+        "py_test": {
+            "kwargs": {
+                "SRCS": '*',
+                "DEPS": '*',
+            }
+        }
+    }

.gitignore

@@ -5,6 +5,7 @@ paddle/fluid/API_PR.spec
 paddle/fluid/eager/api/generated/*
 paddle/fluid/op_use_default_grad_maker_DEV.spec
 paddle/fluid/op_use_default_grad_maker_PR.spec
+paddle/fluid/operators/ops_extra_info.h
 paddle/phi/api/backward/backward_api.h
 paddle/phi/api/backward/sparse_bw_api.h
 paddle/phi/api/include/api.h
@@ -64,5 +65,9 @@ paddle/infrt/dialect/pd/common/pd_ops_info.h
 paddle/infrt/tests/dialect/Output
 paddle/infrt/tests/lit.cfg.py
 paddle/infrt/kernel/phi/infershaped/infershaped_kernel_launchers.cc
-paddle/fluid/pybind/eager_final_state_op_function_impl.h
-paddle/fluid/pybind/tmp_eager_final_state_op_function_impl.h
+paddle/fluid/pybind/eager_final_state_op_function.cc
+
+# these files (directories) are generated before build system generation
+paddle/fluid/operators/generated_op.cc
+paddle/phi/ops/compat/generated_sig.cc
+paddle/phi/api/yaml/parsed_apis/

.pre-commit-config.yaml

@@ -1,14 +1,19 @@
 repos:
 -   repo: https://github.com/Lucas-C/pre-commit-hooks.git
-    sha: v1.0.1
+    rev: v1.1.14
     hooks:
     -   id: remove-crlf
         files: (?!.*third_party)^.*$ | (?!.*book)^.*$
--   repo: https://github.com/PaddlePaddle/mirrors-yapf.git
-    sha: 0d79c0c469bab64f7229c9aca2b1186ef47f0e37
+-   repo: https://github.com/google/yapf
+    rev: v0.32.0
     hooks:
     -   id: yapf
         files: (.*\.(py|bzl)|BUILD|.*\.BUILD|WORKSPACE)$
+        exclude: |
+            (?x)^(
+                python/paddle/fluid/tests/unittests/dygraph_to_static/test_error.py|
+                python/paddle/fluid/tests/unittests/dygraph_to_static/test_origin_info.py
+            )$
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.1.0
     hooks:
@@ -19,15 +24,19 @@ repos:
         files: (?!.*third_party)^.*$ | (?!.*book)^.*$
     -   id: end-of-file-fixer
     -   id: sort-simple-yaml
-        files: (api|backward)\.yaml$
+        files: (api|backward|api_[a-z_]+)\.yaml$
 -   repo: local
     hooks:
-    -   id: clang-format-with-version-check
+    -   id: clang-format
         name: clang-format
         description: Format files with ClangFormat.
         entry: bash ./tools/codestyle/clang_format.hook -i
         language: system
-        files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx|proto|xpu|kps)$
+        files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx|xpu|kps)$
+        exclude: |
+            (?x)^(
+                paddle/fluid/distributed/ps/thirdparty/round_robin.h
+            )$
 -   repo: local
     hooks:
     -   id: cpplint-cpp-source
@@ -55,3 +64,19 @@ repos:
             (?x)^(
                 paddle/utils/.*
             )$
+-   repo: https://github.com/cheshirekow/cmake-format-precommit
+    rev: v0.6.13
+    hooks:
+    -   id: cmake-format
+        # exclude paddle/fluid/operators/CMakeLists.txt, see the comment
+        # https://github.com/PaddlePaddle/Paddle/pull/43057#pullrequestreview-993471860
+        exclude: |
+            (?x)^(
+                paddle/fluid/operators/CMakeLists.txt
+            )$
+
+-   repo: https://github.com/cmake-lint/cmake-lint
+    rev: 1.4.2
+    hooks:
+    -   id: cmakelint
+        args: [--config=./tools/codestyle/.cmakelintrc]