From 5591004d77898b332d2411fea7caa7e2e4f76e69 Mon Sep 17 00:00:00 2001 From: "Jack S. Hale" Date: Mon, 22 Apr 2024 21:57:33 +0200 Subject: [PATCH] Lint. (#3157) --- cpp/CMakeLists.txt | 24 +++++++++++++++++------- cpp/cmake/modules/FindSCOTCH.cmake | 19 ++++++++++++------- python/dolfinx/wrappers/fem.cpp | 24 ++++++++++-------------- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index a5a367de3a1..b0884d23923 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -108,9 +108,15 @@ set_package_properties( ) if(DOLFINX_ENABLE_PETSC) - set(_REQUIRE_PETSC TRUE CACHE BOOL "Is PETSc REQUIRED?") + set(_REQUIRE_PETSC + TRUE + CACHE BOOL "Is PETSc REQUIRED?" + ) else() - set(_REQUIRE_PETSC FALSE CACHE BOOL "Is PETSc REQUIRED?") + set(_REQUIRE_PETSC + FALSE + CACHE BOOL "Is PETSc REQUIRED?" + ) endif() option(DOLFINX_ENABLE_PETSC "Compile with support for PETSc." ON) @@ -122,7 +128,6 @@ set_package_properties( PURPOSE "Linear and nonlinear solvers" ) - if(DOLFINX_ENABLE_PARMETIS) set(_REQUIRE_PARMETIS TRUE @@ -318,7 +323,7 @@ find_package(HDF5 REQUIRED COMPONENTS C) if(NOT HDF5_IS_PARALLEL) message( FATAL_ERROR - "Found serial HDF5 build, MPI HDF5 build required, try setting HDF5_DIR or HDF5_ROOT" + "Found serial HDF5 build, MPI HDF5 build required, try setting HDF5_DIR or HDF5_ROOT" ) endif() @@ -368,7 +373,7 @@ endif() if(DOLFINX_ENABLE_PETSC) find_package(PkgConfig REQUIRED) set(ENV{PKG_CONFIG_PATH} - "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PETSC_DIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" + "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PETSC_DIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" ) if(_REQUIRE_PETSC) pkg_search_module(PETSC REQUIRED IMPORTED_TARGET PETSc>=3.15 petsc>=3.15) @@ -378,7 +383,9 @@ if(DOLFINX_ENABLE_PETSC) # Setting for FeatureSummary if(PETSC_FOUND) - message(STATUS "Found PETSc version ${PETSC_VERSION}, prefix: ${PETSC_PREFIX}") + message( + STATUS "Found PETSc version ${PETSC_VERSION}, prefix: ${PETSC_PREFIX}" + ) set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND PETSc) else() set_property(GLOBAL APPEND PROPERTY PACKAGES_NOT_FOUND PETSc) @@ -412,7 +419,10 @@ if(DOLFINX_ENABLE_SLEPC AND PETSC_FOUND) set_property(GLOBAL APPEND PROPERTY PACKAGES_NOT_FOUND SLEPc) endif() elseif(_REQUIRE_SLEPC AND NOT PETSC_FOUND) - message(FATAL_ERROR "SLEPc requested, but no configured because PETSc was not found.") + message( + FATAL_ERROR + "SLEPc requested, but no configured because PETSc was not found." + ) endif() if(DOLFINX_ENABLE_SCOTCH AND _REQUIRE_SCOTCH) diff --git a/cpp/cmake/modules/FindSCOTCH.cmake b/cpp/cmake/modules/FindSCOTCH.cmake index 561e218ddb8..855dad09e44 100644 --- a/cpp/cmake/modules/FindSCOTCH.cmake +++ b/cpp/cmake/modules/FindSCOTCH.cmake @@ -50,8 +50,8 @@ message(STATUS "Checking for package 'SCOTCH-PT'") # Check for header file find_path( SCOTCH_INCLUDE_DIRS ptscotch.h - HINTS ${SCOTCH_DIR}/include $ENV{SCOTCH_DIR}/include - ${SCOTCH_ROOT}/include $ENV{SCOTCH_ROOT}/include ${PETSC_INCLUDE_DIRS} + HINTS ${SCOTCH_DIR}/include $ENV{SCOTCH_DIR}/include ${SCOTCH_ROOT}/include + $ENV{SCOTCH_ROOT}/include ${PETSC_INCLUDE_DIRS} PATH_SUFFIXES scotch DOC "Directory where the SCOTCH-PT header is located" ) @@ -60,7 +60,8 @@ find_path( find_library( SCOTCH_LIBRARY NAMES scotch - HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} + HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib + $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} NO_DEFAULT_PATH DOC "The SCOTCH library" ) @@ -74,7 +75,8 @@ find_library( find_library( SCOTCHERR_LIBRARY NAMES scotcherr - HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib $ENV{SCOTCH_ROOT}/lib + HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib + $ENV{SCOTCH_ROOT}/lib NO_DEFAULT_PATH DOC "The SCOTCH-ERROR library" ) @@ -88,7 +90,8 @@ find_library( find_library( PTSCOTCH_LIBRARY NAMES ptscotch - HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} + HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib + $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} NO_DEFAULT_PATH DOC "The PTSCOTCH library" ) @@ -102,7 +105,8 @@ find_library( find_library( PTESMUMPS_LIBRARY NAMES ptesmumps esmumps - HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} + HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib + $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} NO_DEFAULT_PATH DOC "The PTSCOTCH-ESMUMPS library" ) @@ -116,7 +120,8 @@ find_library( find_library( PTSCOTCHERR_LIBRARY NAMES ptscotcherr - HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} + HINTS ${SCOTCH_DIR}/lib $ENV{SCOTCH_DIR}/lib ${SCOTCH_ROOT}/lib + $ENV{SCOTCH_ROOT}/lib ${PETSC_LIBRARY_DIRS} NO_DEFAULT_PATH DOC "The PTSCOTCH-ERROR library" ) diff --git a/python/dolfinx/wrappers/fem.cpp b/python/dolfinx/wrappers/fem.cpp index 5903819883a..7e56313c970 100644 --- a/python/dolfinx/wrappers/fem.cpp +++ b/python/dolfinx/wrappers/fem.cpp @@ -148,9 +148,8 @@ void declare_function_space(nb::module_& m, std::string type) cell_permutations.data(), cell_permutations.size()); for (std::size_t i = 0; i < cell_permutations.size(); i++) { - self.T_apply( - x_span.subspan(i * data_per_cell, data_per_cell), - perm_span[i], dim); + self.T_apply(x_span.subspan(i * data_per_cell, data_per_cell), + perm_span[i], dim); } }, nb::arg("x"), nb::arg("cell_permutations"), nb::arg("dim")) @@ -169,9 +168,8 @@ void declare_function_space(nb::module_& m, std::string type) cell_permutations.data(), cell_permutations.size()); for (std::size_t i = 0; i < cell_permutations.size(); i++) { - self.Tt_apply( - x_span.subspan(i * data_per_cell, data_per_cell), - perm_span[i], dim); + self.Tt_apply(x_span.subspan(i * data_per_cell, data_per_cell), + perm_span[i], dim); } }, nb::arg("x"), nb::arg("cell_permutations"), nb::arg("dim")) @@ -213,9 +211,8 @@ void declare_function_space(nb::module_& m, std::string type) for (std::size_t i = 0; i < cell_permutations.size(); i++) { - self.T_apply( - x_span.subspan(i * data_per_cell, data_per_cell), - perm_span[i], dim); + self.T_apply(x_span.subspan(i * data_per_cell, data_per_cell), + perm_span[i], dim); } }, nb::arg("x"), nb::arg("cell_permutations"), nb::arg("dim")) @@ -235,9 +232,8 @@ void declare_function_space(nb::module_& m, std::string type) for (std::size_t i = 0; i < cell_permutations.size(); i++) { - self.Tt_apply( - x_span.subspan(i * data_per_cell, data_per_cell), - perm_span[i], dim); + self.Tt_apply(x_span.subspan(i * data_per_cell, data_per_cell), + perm_span[i], dim); } }, nb::arg("x"), nb::arg("cell_permutations"), nb::arg("dim")) @@ -903,8 +899,8 @@ void declare_real_functions(nb::module_& m) dolfinx::fem::ElementDofLayout layout = dolfinx::fem::create_element_dof_layout(*p, topology.cell_type()); - std::function, std::uint32_t)> - permute_inv = nullptr; + std::function, std::uint32_t)> permute_inv + = nullptr; if (element.needs_dof_permutations()) permute_inv = element.dof_permutation_fn(true, true); return dolfinx::fem::create_dofmap(comm.get(), layout, topology,