Merge branch 'develop' into triplet_margin_distance_loss

PaddlePaddle · Jun 8, 2022 · bc5106d · bc5106d
2 parents f468086 + cab0f2f
commit bc5106d
Show file tree

Hide file tree

Showing 190 changed files with 7,022 additions and 1,810 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
     -   id: remove-crlf
         files: (?!.*third_party)^.*$ | (?!.*book)^.*$
 -   repo: https://github.com/google/yapf
-    sha: v0.32.0
+    rev: v0.32.0
     hooks:
     -   id: yapf
         files: (.*\.(py|bzl)|BUILD|.*\.BUILD|WORKSPACE)$
@@ -74,3 +74,117 @@ repos:
             (?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]
+        # exclude files which need to be fixed
+        exclude: |
+            (?x)^(
+                cmake/generic.cmake|
+                CMakeLists.txt|
+                paddle/fluid/pybind/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/CMakeLists.txt|
+                paddle/fluid/eager/auto_code_generator/CMakeLists.txt|
+                paddle/fluid/framework/CMakeLists.txt|
+                paddle/fluid/eager/auto_code_generator/final_state_generator/CMakeLists.txt|
+                cmake/third_party.cmake|
+                paddle/fluid/inference/tests/infer_ut/CMakeLists.txt|
+                cmake/configure.cmake|
+                paddle/fluid/inference/api/demo_ci/CMakeLists.txt|
+                cmake/flags.cmake|
+                cmake/inference_lib.cmake|
+                cmake/external/protobuf.cmake|
+                cmake/system.cmake|
+                cmake/cudnn.cmake|
+                cmake/external/mkldnn.cmake|
+                cmake/unity_build.cmake|
+                paddle/fluid/framework/fleet/CMakeLists.txt|
+                paddle/fluid/inference/CMakeLists.txt|
+                paddle/fluid/inference/tests/api/CMakeLists.txt|
+                paddle/fluid/operators/CMakeLists.txt|
+                paddle/phi/api/lib/CMakeLists.txt|
+                cmake/external/gflags.cmake|
+                cmake/external/lite.cmake|
+                cmake/external/poplar.cmake|
+                cmake/python_module.cmake|
+                python/paddle/fluid/tests/unittests/asp/CMakeLists.txt|
+                cmake/cuda.cmake|
+                cmake/FindNumPy.cmake|
+                cmake/phi.cmake|
+                paddle/fluid/framework/ir/CMakeLists.txt|
+                paddle/fluid/platform/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/mlu/CMakeLists.txt|
+                python/paddle/tests/CMakeLists.txt|
+                cmake/ccache.cmake|
+                cmake/coveralls.cmake|
+                cmake/external/glog.cmake|
+                cmake/external/onnxruntime.cmake|
+                cmake/external/openblas.cmake|
+                cmake/external/xpu.cmake|
+                cmake/hip.cmake|
+                paddle/fluid/distributed/CMakeLists.txt|
+                paddle/fluid/framework/details/CMakeLists.txt|
+                paddle/fluid/imperative/CMakeLists.txt|
+                paddle/fluid/inference/analysis/ir_passes/CMakeLists.txt|
+                paddle/fluid/inference/api/CMakeLists.txt|
+                paddle/fluid/operators/controlflow/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/distributed_passes/CMakeLists.txt|
+                cmake/cblas.cmake|
+                cmake/coverallsGcovJsons.cmake|
+                cmake/external/brpc.cmake|
+                cmake/external/cryptopp.cmake|
+                cmake/external/gtest.cmake|
+                cmake/external/llvm.cmake|
+                cmake/external/utf8proc.cmake|
+                cmake/external/warpctc.cmake|
+                cmake/external/zlib.cmake|
+                cmake/FindGperftools.cmake|
+                cmake/operators.cmake|
+                cmake/tensorrt.cmake|
+                paddle/fluid/inference/api/details/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/xpu/CMakeLists.txt|
+                cmake/external/arm_brpc.cmake|
+                cmake/external/concurrentqueue.cmake|
+                cmake/external/eigen.cmake|
+                cmake/external/mklml.cmake|
+                cmake/external/paddle2onnx.cmake|
+                cmake/miopen.cmake|
+                cmake/nccl.cmake|
+                cmake/simd.cmake|
+                paddle/fluid/distributed/fleet_executor/CMakeLists.txt|
+                paddle/fluid/eager/api/generated/fluid_generated/forwards/CMakeLists.txt|
+                paddle/fluid/framework/io/CMakeLists.txt|
+                paddle/fluid/imperative/tests/CMakeLists.txt|
+                paddle/fluid/inference/analysis/CMakeLists.txt|
+                paddle/fluid/inference/tests/infer_ut/external-cmake/gtest-cpp.cmake|
+                paddle/fluid/memory/allocation/CMakeLists.txt|
+                paddle/fluid/memory/CMakeLists.txt|
+                paddle/fluid/operators/cinn/CMakeLists.txt|
+                paddle/fluid/operators/collective/CMakeLists.txt|
+                paddle/fluid/operators/ipu/CMakeLists.txt|
+                paddle/fluid/operators/jit/CMakeLists.txt|
+                paddle/fluid/operators/pscore/CMakeLists.txt|
+                paddle/fluid/platform/device/ipu/CMakeLists.txt|
+                paddle/fluid/platform/dynload/CMakeLists.txt|
+                paddle/infrt/external_kernels/CMakeLists.txt|
+                paddle/infrt/kernel/phi/CMakeLists.txt|
+                paddle/phi/backends/dynload/CMakeLists.txt|
+                paddle/phi/CMakeLists.txt|
+                paddle/phi/kernels/CMakeLists.txt|
+                paddle/phi/tests/core/CMakeLists.txt|
+                python/CMakeLists.txt|
+                python/paddle/fluid/contrib/slim/tests/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/autograd/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/distribution/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/dygraph_to_static/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/fft/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/ipu/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/mkldnn/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/npu/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/ps/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/rnn/CMakeLists.txt|
+                python/paddle/fluid/tests/unittests/sequence/CMakeLists.txt
+            )$