fix cmake-lint problems. (PaddlePaddle#43406)

* cmake-lint * update
Difers · Jun 14, 2022 · 59f8923 · 59f8923
1 parent d74d183
commit 59f8923
Show file tree

Hide file tree

Showing 49 changed files with 160 additions and 208 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -81,64 +81,3 @@ repos:
     -   id: cmakelint
         args: [--config=./tools/codestyle/.cmakelintrc]
         # exclude files which need to be fixed
-        exclude: |
-            (?x)^(
-                CMakeLists.txt|
-                python/paddle/fluid/tests/unittests/CMakeLists.txt|             
-                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|
-                paddle/fluid/framework/fleet/CMakeLists.txt|
-                paddle/fluid/inference/CMakeLists.txt|
-                paddle/fluid/inference/tests/api/CMakeLists.txt|
-                paddle/fluid/operators/CMakeLists.txt|
-                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/coveralls.cmake|
-                cmake/external/glog.cmake|
-                cmake/external/onnxruntime.cmake|
-                cmake/external/openblas.cmake|
-                cmake/external/xpu.cmake|
-                cmake/hip.cmake|
-                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/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/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/infrt/external_kernels/CMakeLists.txt|
-                paddle/infrt/kernel/phi/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
-            )$
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,10 +16,10 @@ if(APPLE AND WITH_ARM)
   # cmake 3.19.2 version starts to support M1
   cmake_minimum_required(VERSION 3.19.2)
   cmake_policy(VERSION 3.19.2)
-else(APPLE AND WITH_ARM)
+else()
   cmake_minimum_required(VERSION 3.15)
   cmake_policy(VERSION 3.10)
-endif(APPLE AND WITH_ARM)
+endif()
 # use to get_property location of static lib
 # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html?highlight=cmp0026
 cmake_policy(SET CMP0026 OLD)
@@ -152,7 +152,7 @@ if(WIN32)
       if(${flag_var} MATCHES "/MD")
         string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
       endif()
-    endforeach(flag_var)
+    endforeach()
   endif()
 
   # NOTE(zhouwei): msvc max/min macro conflict with std::min/max, define NOMINMAX globally
@@ -179,10 +179,10 @@ if(WIN32)
       math(EXPR PROCESS_MAX "${CPU_CORES} * 2 / 3")
       set(${flag_var} "${${flag_var}} /MP${PROCESS_MAX}")
     endif()
-  endforeach(flag_var)
+  endforeach()
   foreach(flag_var CMAKE_CXX_FLAGS CMAKE_C_FLAGS)
     set(${flag_var} "${${flag_var}} /w")
-  endforeach(flag_var)
+  endforeach()
 
   # Windows Remove /Zi, /ZI for Release, MinSizeRel builds
   foreach(flag_var
@@ -191,7 +191,7 @@ if(WIN32)
     if(${flag_var} MATCHES "/Z[iI]")
       string(REGEX REPLACE "/Z[iI]" "" ${flag_var} "${${flag_var}}")
     endif()
-  endforeach(flag_var)
+  endforeach()
 
   set(CMAKE_C_FLAGS
       "${CMAKE_C_FLAGS} /wd4068 /wd4129 /wd4244 /wd4267 /wd4297 /wd4530 /wd4577 /wd4819 /wd4838"
@@ -207,7 +207,7 @@ if(WIN32)
     if(MSVC_STATIC_CRT)
       set(${flag_var} "${${flag_var}} /NODEFAULTLIB:MSVCRT.LIB")
     endif()
-  endforeach(flag_var)
+  endforeach()
 
   if(WITH_WIN_DUMP_DBG)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zi")
@@ -216,16 +216,16 @@ if(WIN32)
     foreach(flag_var CMAKE_SHARED_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS
                      CMAKE_EXE_LINKER_FLAGS CMAKE_LINKER_FLAGS)
       set(${flag_var} "${${flag_var}} /DEBUG /OPT:REF /OPT:ICF")
-    endforeach(flag_var)
+    endforeach()
 
     add_definitions("-DWITH_WIN_DUMP_DBG")
   endif()
 
-else(WIN32)
+else()
   set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations -Wno-deprecated-declarations"
   )
-endif(WIN32)
+endif()
 
 find_package(Git REQUIRED)
 
@@ -430,7 +430,7 @@ endif()
 if(WITH_ROCM)
   include(hip)
   include(miopen) # set miopen libraries, must before configure
-endif(WITH_ROCM)
+endif()
 
 if(WITH_XPU_KP)
   include(xpu_kp)

diff --git a/cmake/FindNumPy.cmake b/cmake/FindNumPy.cmake
@@ -26,7 +26,7 @@ if(PYTHON_EXECUTABLE)
     OUTPUT_VARIABLE NUMPY_PATH)
 elseif(_numpy_out)
   message(STATUS "Python executable not found.")
-endif(PYTHON_EXECUTABLE)
+endif()
 
 find_path(PYTHON_NUMPY_INCLUDE_DIR numpy/arrayobject.h
           HINTS "${NUMPY_PATH}" "${PYTHON_INCLUDE_PATH}")
@@ -35,7 +35,7 @@ if(PYTHON_NUMPY_INCLUDE_DIR)
   set(PYTHON_NUMPY_FOUND
       1
       CACHE INTERNAL "Python numpy found")
-endif(PYTHON_NUMPY_INCLUDE_DIR)
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(NumPy DEFAULT_MSG PYTHON_NUMPY_INCLUDE_DIR)
diff --git a/cmake/configure.cmake b/cmake/configure.cmake
@@ -14,19 +14,19 @@
 
 if(NOT WITH_PYTHON)
   add_definitions(-DPADDLE_NO_PYTHON)
-endif(NOT WITH_PYTHON)
+endif()
 
 if(WITH_TESTING)
   add_definitions(-DPADDLE_WITH_TESTING)
-endif(WITH_TESTING)
+endif()
 
 if(WITH_INFERENCE_API_TEST)
   add_definitions(-DPADDLE_WITH_INFERENCE_API_TEST)
-endif(WITH_INFERENCE_API_TEST)
+endif()
 
 if(NOT WITH_PROFILER)
   add_definitions(-DPADDLE_DISABLE_PROFILER)
-endif(NOT WITH_PROFILER)
+endif()
 
 if(WITH_AVX AND AVX_FOUND)
   set(SIMD_FLAG ${AVX_FLAG})
@@ -60,8 +60,8 @@ if(WIN32)
       FATAL
       "Windows build only support msvc. Which was binded by the nvcc compiler of NVIDIA."
     )
-  endif(NOT MSVC)
-endif(WIN32)
+  endif()
+endif()
 
 if(WITH_MUSL)
   add_definitions(-DPADDLE_WITH_MUSL)
@@ -195,9 +195,9 @@ if(WITH_MKLML AND MKLML_IOMP_LIB)
   if(WIN32)
     # openmp not support well for now on windows
     set(OPENMP_FLAGS "")
-  else(WIN32)
+  else()
     set(OPENMP_FLAGS "-fopenmp")
-  endif(WIN32)
+  endif()
   set(CMAKE_C_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS ${OPENMP_FLAGS})
   set(CMAKE_CXX_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS ${OPENMP_FLAGS})
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENMP_FLAGS}")
@@ -221,15 +221,15 @@ endif()
 
 if(WITH_BRPC_RDMA)
   add_definitions(-DPADDLE_WITH_BRPC_RDMA)
-endif(WITH_BRPC_RDMA)
+endif()
 
 if(ON_INFER)
   add_definitions(-DPADDLE_ON_INFERENCE)
-endif(ON_INFER)
+endif()
 
 if(WITH_CRYPTO)
   add_definitions(-DPADDLE_WITH_CRYPTO)
-endif(WITH_CRYPTO)
+endif()
 
 if(WITH_CUSTOM_DEVICE AND NOT WIN32)
   add_definitions(-DPADDLE_WITH_CUSTOM_DEVICE)

diff --git a/cmake/coveralls.cmake b/cmake/coveralls.cmake
@@ -96,7 +96,7 @@ if(WITH_COVERAGE)
       if(NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
         list(REMOVE_ITEM PADDLE_SOURCES ${TMP_PATH})
       endif()
-    endforeach(TMP_PATH)
+    endforeach()
   endforeach()
 
   # convert to absolute path

diff --git a/cmake/cuda.cmake b/cmake/cuda.cmake
@@ -274,7 +274,7 @@ set(CMAKE_CUDA_STANDARD 14)
 # So replace /W[1-4] with /W0
 if(WIN32)
   string(REGEX REPLACE "/W[1-4]" " /W0 " CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS}")
-endif(WIN32)
+endif()
 # in cuda9, suppress cuda warning on eigen
 set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -w")
 # Set :expt-relaxed-constexpr to suppress Eigen warnings
@@ -293,7 +293,7 @@ if(WIN32)
       if(${flag_var} MATCHES "-MD")
         string(REGEX REPLACE "-MD" "-MT" ${flag_var} "${${flag_var}}")
       endif()
-    endforeach(flag_var)
+    endforeach()
   endif()
 endif()
 

diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake
@@ -25,7 +25,8 @@ if(WIN32)
 elseif(LINUX)
   if(WITH_ROCM)
     # For HIPCC Eigen::internal::device::numeric_limits is not EIGEN_DEVICE_FUNC
-    # which will cause compiler error of using __host__ funciont in __host__ __device__
+    # which will cause compiler error of using __host__ funciont
+    # in __host__ __device__
     file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/eigen/Meta.h native_src)
     file(TO_NATIVE_PATH ${EIGEN_SOURCE_DIR}/Eigen/src/Core/util/Meta.h
          native_dst)

diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake
@@ -28,12 +28,12 @@ if(WIN32)
       CACHE FILEPATH "glog library." FORCE)
   set(GLOG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4530")
   add_definitions("/DGOOGLE_GLOG_DLL_DECL=")
-else(WIN32)
+else()
   set(GLOG_LIBRARIES
       "${GLOG_INSTALL_DIR}/lib/libglog.a"
       CACHE FILEPATH "glog library." FORCE)
   set(GLOG_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-endif(WIN32)
+endif()
 
 include_directories(${GLOG_INCLUDE_DIR})
 

diff --git a/cmake/external/mklml.cmake b/cmake/external/mklml.cmake
@@ -32,7 +32,8 @@ if(WIN32)
   set(MKLML_SHARED_IOMP_LIB ${MKLML_LIB_DIR}/libiomp5md.dll)
 else()
   #TODO(intel-huying):
-  #  Now enable csrmm function in mklml library temporarily, it will be updated as offical version later.
+  #  Now enable csrmm function in mklml library temporarily,
+  #  it will be updated as offical version later.
   set(MKLML_VER
       "csrmm_mklml_lnx_2019.0.5"
       CACHE STRING "" FORCE)
@@ -51,8 +52,9 @@ message(STATUS "MKLML_VER: ${MKLML_VER}, MKLML_URL: ${MKLML_URL}")
 set(MKLML_PREFIX_DIR ${THIRD_PARTY_PATH}/mklml)
 set(MKLML_SOURCE_DIR ${THIRD_PARTY_PATH}/mklml/src/extern_mklml)
 
-# Ninja Generator can not establish the correct dependency relationship between the imported library with target,
-# the product file in the ExternalProject need to be specified manually, please refer to
+# Ninja Generator can not establish the correct dependency relationship
+# between the imported library with target, the product file
+# in the ExternalProject need to be specified manually, please refer to
 # https://stackoverflow.com/questions/54866067/cmake-and-ninja-missing-and-no-known-rule-to-make-it
 # It is the same to all other ExternalProject.
 ExternalProject_Add(

diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake
@@ -58,7 +58,7 @@ if(NOT WIN32)
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ""
     BUILD_BYPRODUCTS ${CBLAS_LIBRARIES})
-else(NOT WIN32)
+else()
   set(CBLAS_LIBRARIES
       "${CBLAS_INSTALL_DIR}/lib/openblas${CMAKE_STATIC_LIBRARY_SUFFIX}"
       CACHE FILEPATH "openblas library." FORCE)
@@ -92,4 +92,4 @@ else(NOT WIN32)
     BUILD_BYPRODUCTS ${CBLAS_LIBRARIES})
   set(OPENBLAS_SHARED_LIB
       ${CBLAS_INSTALL_DIR}/bin/openblas${CMAKE_SHARED_LIBRARY_SUFFIX})
-endif(NOT WIN32)
+endif()
diff --git a/cmake/external/paddle2onnx.cmake b/cmake/external/paddle2onnx.cmake
@@ -69,7 +69,7 @@ else()
   set(PADDLE2ONNX_COMPILE_LIB
       "${PADDLE2ONNX_INSTALL_DIR}/lib/libpaddle2onnx.so"
       CACHE FILEPATH "paddle2onnx compile library." FORCE)
-endif(WIN32)
+endif()
 
 if(WIN32)
   set(PADDLE2ONNX_URL

diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake
@@ -16,7 +16,7 @@ include(ExternalProject)
 # Always invoke `FIND_PACKAGE(Protobuf)` for importing function protobuf_generate_cpp
 if(NOT WIN32)
   find_package(Protobuf QUIET)
-endif(NOT WIN32)
+endif()
 
 unset_var(PROTOBUF_INCLUDE_DIR)
 unset_var(PROTOBUF_FOUND)
@@ -147,7 +147,7 @@ set(PROTOBUF_ROOT
     CACHE PATH "Folder contains protobuf")
 if(WIN32)
   set(PROTOBUF_ROOT ${THIRD_PARTY_PATH}/install/protobuf)
-endif(WIN32)
+endif()
 
 if(NOT "${PROTOBUF_ROOT}" STREQUAL "")
   find_path(
@@ -349,4 +349,4 @@ if(NOT PROTOBUF_FOUND)
   # `protoc.exe` existed before calling it.
   set(EXTERN_PROTOBUF_DEPEND extern_protobuf)
   prompt_protobuf_lib(extern_protobuf)
-endif(NOT PROTOBUF_FOUND)
+endif()
diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake
@@ -134,9 +134,9 @@ if(WITH_XPU_BKCL)
   set(XPU_BKCL_INC_DIR "${THIRD_PARTY_PATH}/install/xpu/include")
   include_directories(${XPU_BKCL_INC_DIR})
   target_link_libraries(xpulib ${XPU_API_LIB} ${XPU_RT_LIB} ${XPU_BKCL_LIB})
-else(WITH_XPU_BKCL)
+else()
   target_link_libraries(xpulib ${XPU_API_LIB} ${XPU_RT_LIB})
-endif(WITH_XPU_BKCL)
+endif()
 
 add_dependencies(xpulib ${XPU_PROJECT})