Enable cmake-format and clang-format with new utility

* Bump hpc-coding-conventions to latest master
* enable formatting of CMake files in CMake/package/ sub-directory

Author: tristan0x

.bbp-project.yaml

@@ -0,0 +1,8 @@
+tools:
+  ClangFormat:
+    enable: True
+    include:
+      match:
+      - coreneuron/.*\.((cu)|(h)|([chi]pp))$
+  CMakeFormat:
+    enable: True

.gitignore

@@ -11,3 +11,4 @@ spconfig.*
 .clang-tidy
 .cmake-format.yaml
 .pre-commit-config.yaml
+.bbp-project-venv/

CMake/hpc-coding-conventions

@@ -4,12 +4,11 @@
 # See top-level LICENSE file for details.
 # =============================================================================
 
-find_program(SPHINX_EXECUTABLE
-        NAMES sphinx-build
-        DOC "/path/to/sphinx-build")
+find_program(
+  SPHINX_EXECUTABLE
+  NAMES sphinx-build
+  DOC "/path/to/sphinx-build")
 
 include(FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(Sphinx
-        "Failed to find sphinx-build executable"
-        SPHINX_EXECUTABLE)
+find_package_handle_standard_args(Sphinx "Failed to find sphinx-build executable" SPHINX_EXECUTABLE)

CMake/packages/FindSphinx.cmake

@@ -4,6 +4,7 @@
 # See top-level LICENSE file for details.
 # =============================================================================
 
+# ~~~
 # Findlikwid
 # -------------
 #
@@ -26,12 +27,12 @@
 #   likwid_FOUND     - set to true if the library is found
 #   likwid_INCLUDE   - list of required include directories
 #   likwid_LIBRARIES - list of required library directories
+# ~~~
 
 find_path(likwid_INCLUDE_DIRS "likwid.h" HINTS "${LIKWID_DIR}/include")
 find_library(likwid_LIBRARIES likwid HINTS "${LIKWID_DIR}/lib")
 
 # Checks 'REQUIRED', 'QUIET' and versions.
 include(FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(likwid
-    REQUIRED_VARS likwid_INCLUDE_DIRS likwid_LIBRARIES)
+find_package_handle_standard_args(likwid REQUIRED_VARS likwid_INCLUDE_DIRS likwid_LIBRARIES)

CMake/packages/Findlikwid.cmake

@@ -4,6 +4,7 @@
 # See top-level LICENSE file for details.
 # =============================================================================
 
+# ~~~
 # Findnmodl
 # -------------
 #
@@ -26,19 +27,21 @@
 #   nmodl_FOUND   - set to true if the library is found
 #   nmodl_INCLUDE - list of required include directories
 #   nmodl_BINARY  - the nmodl binary
-
+# ~~~
 
 # UNIX paths are standard, no need to write.
-find_program(nmodl_BINARY NAMES nmodl${CMAKE_EXECUTABLE_SUFFIX}
-        HINTS "${CORENRN_NMODL_DIR}/bin" QUIET)
+find_program(
+  nmodl_BINARY
+  NAMES nmodl${CMAKE_EXECUTABLE_SUFFIX}
+  HINTS "${CORENRN_NMODL_DIR}/bin" QUIET)
 
 find_path(nmodl_INCLUDE "nmodl/fast_math.ispc" HINTS "${CORENRN_NMODL_DIR}/include")
 find_path(nmodl_PYTHONPATH "nmodl/__init__.py" HINTS "${CORENRN_NMODL_DIR}/lib")
 
 # Checks 'REQUIRED', 'QUIET' and versions.
 include(FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(nmodl
+find_package_handle_standard_args(
+  nmodl
   FOUND_VAR nmodl_FOUND
   REQUIRED_VARS nmodl_BINARY nmodl_INCLUDE nmodl_PYTHONPATH)
-

CMake/packages/Findnmodl.cmake

@@ -4,6 +4,7 @@
 # See top-level LICENSE file for details.
 # =============================================================================
 
+# ~~~
 # Findreportinglib
 # -------------
 #
@@ -26,17 +27,18 @@
 #   reportinglib_FOUND - set to true if the library is found
 #   reportinglib_INCLUDE_DIRS - list of required include directories
 #   reportinglib_LIBRARIES - list of libraries to be linked
+# ~~~
 
 # UNIX paths are standard, no need to write.
 find_path(reportinglib_INCLUDE_DIR reportinglib/Report.h)
 find_library(reportinglib_LIBRARY reportinglib)
 get_filename_component(reportinglib_LIB_DIR ${reportinglib_LIBRARY} DIRECTORY)
-find_program (reportinglib_somaDump somaDump ${reportinglib_LIB_DIR}/../bin)
+find_program(reportinglib_somaDump somaDump ${reportinglib_LIB_DIR}/../bin)
 
 # Checks 'REQUIRED', 'QUIET' and versions.
 include(FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(reportinglib
+find_package_handle_standard_args(
+  reportinglib
   FOUND_VAR reportinglib_FOUND
   REQUIRED_VARS reportinglib_INCLUDE_DIR reportinglib_LIBRARY reportinglib_LIB_DIR)
-

CMake/packages/Findreportinglib.cmake

@@ -85,17 +85,6 @@ list(APPEND CMAKE_MODULE_PATH ${CORENEURON_PROJECT_SOURCE_DIR}/CMake
 # =============================================================================
 set(CODING_CONV_PREFIX "CORENRN")
 set(CORENRN_3RDPARTY_DIR "external")
-# Adds .cu with respect to the current default in hpc-coding-conventions, and drops various patterns
-# that don't match anything in CoreNEURON.
-set(CORENRN_ClangFormat_FILES_RE
-    "^.*\\\\.cu$$" "^.*\\\\.h$$" "^.*\\\\.[chi]pp$$"
-    CACHE STRING "List of regular expressions matching C/C++ filenames" FORCE)
-set(CORENRN_ClangFormat_EXCLUDES_RE
-    ""
-    CACHE STRING "list of regular expressions to exclude C/C++ files from formatting" FORCE)
-set(CORENRN_CMakeFormat_EXCLUDES_RE
-    "CMake/packages/.*$$"
-    CACHE STRING "list of regular expressions to exclude CMake files from formatting" FORCE)
 include(AddHpcCodingConvSubmodule)
 add_subdirectory(CMake/hpc-coding-conventions/cpp)