clang-format: check *.h too (#805)

* ring_ref_solution.h: not used, remove

Author: olupton

CMakeLists.txt

@@ -89,7 +89,7 @@ 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$$" "^.*\\\\.[chi]pp$$"
+    "^.*\\\\.cu$$" "^.*\\\\.h$$" "^.*\\\\.[chi]pp$$"
     CACHE STRING "List of regular expressions matching C/C++ filenames" FORCE)
 set(CORENRN_ClangFormat_EXCLUDES_RE
     ""

coreneuron/mpi/nrnmpi.h

@@ -33,34 +33,39 @@ struct NRNMPI_Spike {
     double spiketime;
 };
 
-// Those functions and classes are part of a mechanism to dynamically or statically load mpi functions
+// Those functions and classes are part of a mechanism to dynamically or statically load mpi
+// functions
 struct mpi_function_base;
 
 struct mpi_manager_t {
-  void register_function(mpi_function_base* ptr) {
-    m_function_ptrs.push_back(ptr);
-  }
-  void resolve_symbols(void* dlsym_handle);
-private:
-  std::vector<mpi_function_base*> m_function_ptrs;
-  // true when symbols are resolved
+    void register_function(mpi_function_base* ptr) {
+        m_function_ptrs.push_back(ptr);
+    }
+    void resolve_symbols(void* dlsym_handle);
+
+  private:
+    std::vector<mpi_function_base*> m_function_ptrs;
+    // true when symbols are resolved
 };
 
 inline mpi_manager_t& mpi_manager() {
-  static mpi_manager_t x;
-  return x;
+    static mpi_manager_t x;
+    return x;
 }
 
 struct mpi_function_base {
-  void resolve(void* dlsym_handle);
-  operator bool() const { return m_fptr; }
-  mpi_function_base(const char* name)
-  : m_name{name} {
-    mpi_manager().register_function(this);
-  }
-protected:
-  void* m_fptr{};
-  const char* m_name;
+    void resolve(void* dlsym_handle);
+    operator bool() const {
+        return m_fptr;
+    }
+    mpi_function_base(const char* name)
+        : m_name{name} {
+        mpi_manager().register_function(this);
+    }
+
+  protected:
+    void* m_fptr{};
+    const char* m_name;
 };
 
 // This could be done with a simpler
@@ -72,14 +77,14 @@ struct mpi_function {};
 #define cnrn_make_integral_constant_t(x) std::integral_constant<std::decay_t<decltype(x)>, x>
 
 template <typename function_ptr, function_ptr fptr>
-struct mpi_function<std::integral_constant<function_ptr, fptr>> : mpi_function_base {
+struct mpi_function<std::integral_constant<function_ptr, fptr>>: mpi_function_base {
     using mpi_function_base::mpi_function_base;
-    template <typename... Args> // in principle deducible from `function_ptr`
+    template <typename... Args>  // in principle deducible from `function_ptr`
     auto operator()(Args&&... args) const {
 #ifdef CORENRN_ENABLE_MPI_DYNAMIC
         // Dynamic MPI, m_fptr should have been initialised via dlsym.
         assert(m_fptr);
-        return (*reinterpret_cast<decltype(fptr)>(m_fptr))(std::forward<Args>( args )...);
+        return (*reinterpret_cast<decltype(fptr)>(m_fptr))(std::forward<Args>(args)...);
 #else
         // No dynamic MPI, use `fptr` directly. Will produce link errors if libmpi.so is not linked.
         return (*fptr)(std::forward<Args>(args)...);

coreneuron/mpi/nrnmpidec.h

@@ -29,15 +29,32 @@ extern "C" void nrnmpi_check_threading_support_impl();
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_check_threading_support_impl)>
     nrnmpi_check_threading_support;
 // Write given buffer to a new file using MPI collective I/O
-extern "C" void nrnmpi_write_file_impl(const std::string& filename, const char* buffer, size_t length);
+extern "C" void nrnmpi_write_file_impl(const std::string& filename,
+                                       const char* buffer,
+                                       size_t length);
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_write_file_impl)> nrnmpi_write_file;
 
 
 /* from mpispike.cpp */
-extern "C" int nrnmpi_spike_exchange_impl(int* nin, NRNMPI_Spike* spikeout, int icapacity, NRNMPI_Spike** spikein, int& ovfl, int nout, NRNMPI_Spikebuf* spbufout, NRNMPI_Spikebuf* spbufin);
+extern "C" int nrnmpi_spike_exchange_impl(int* nin,
+                                          NRNMPI_Spike* spikeout,
+                                          int icapacity,
+                                          NRNMPI_Spike** spikein,
+                                          int& ovfl,
+                                          int nout,
+                                          NRNMPI_Spikebuf* spbufout,
+                                          NRNMPI_Spikebuf* spbufin);
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_spike_exchange_impl)>
     nrnmpi_spike_exchange;
-extern "C" int nrnmpi_spike_exchange_compressed_impl(int, unsigned char*&, int, int*, int, unsigned char*, int, unsigned char*, int& ovfl);
+extern "C" int nrnmpi_spike_exchange_compressed_impl(int,
+                                                     unsigned char*&,
+                                                     int,
+                                                     int*,
+                                                     int,
+                                                     unsigned char*,
+                                                     int,
+                                                     unsigned char*,
+                                                     int& ovfl);
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_spike_exchange_compressed_impl)>
     nrnmpi_spike_exchange_compressed;
 extern "C" int nrnmpi_int_allmax_impl(int i);
@@ -47,18 +64,18 @@ extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_int_allgather_impl)> nr
 extern "C" void nrnmpi_int_alltoall_impl(int* s, int* r, int n);
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_int_alltoall_impl)> nrnmpi_int_alltoall;
 extern "C" void nrnmpi_int_alltoallv_impl(const int* s,
-                                      const int* scnt,
-                                      const int* sdispl,
-                                      int* r,
-                                      int* rcnt,
-                                      int* rdispl);
+                                          const int* scnt,
+                                          const int* sdispl,
+                                          int* r,
+                                          int* rcnt,
+                                          int* rdispl);
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_int_alltoallv_impl)> nrnmpi_int_alltoallv;
 extern "C" void nrnmpi_dbl_alltoallv_impl(double* s,
-                                      int* scnt,
-                                      int* sdispl,
-                                      double* r,
-                                      int* rcnt,
-                                      int* rdispl);
+                                          int* scnt,
+                                          int* sdispl,
+                                          double* r,
+                                          int* rcnt,
+                                          int* rdispl);
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_dbl_alltoallv_impl)> nrnmpi_dbl_alltoallv;
 extern "C" double nrnmpi_dbl_allmin_impl(double x);
 extern mpi_function<cnrn_make_integral_constant_t(nrnmpi_dbl_allmin_impl)> nrnmpi_dbl_allmin;

coreneuron/nrnoc/md1redef.h

@@ -8,16 +8,16 @@
 
 #pragma once
 
-#define v _v
-#define area _area
+#define v        _v
+#define area     _area
 #define thisnode _thisnode
-#define GC _GC
-#define EC _EC
-#define extnode _extnode
-#define xain _xain
-#define xbout _xbout
-#define i _i
-#define sec _sec
+#define GC       _GC
+#define EC       _EC
+#define extnode  _extnode
+#define xain     _xain
+#define xbout    _xbout
+#define i        _i
+#define sec      _sec
 
 #undef Memb_list
 #undef nodelist
@@ -31,13 +31,13 @@
 #undef weights
 #undef weight_index_
 
-#define nodelist _nodelist
-#define nodeindices _nodeindices
-#define data _data
-#define pdata _pdata
-#define prop _prop
-#define nodecount _nodecount
-#define pval _pval
-#define id _id
-#define weights _weights
+#define nodelist      _nodelist
+#define nodeindices   _nodeindices
+#define data          _data
+#define pdata         _pdata
+#define prop          _prop
+#define nodecount     _nodecount
+#define pval          _pval
+#define id            _id
+#define weights       _weights
 #define weight_index_ _weight_index

coreneuron/utils/nrn_assert.h

@@ -32,4 +32,3 @@ static void abortf(const char* fmt, ...) {
 /** assert()-like macro, independent of NDEBUG status */
 #define nrn_assert(x) \
     ((x) || (abortf("%s:%d: Assertion '%s' failed.\n", __FILE__, __LINE__, #x), 0))
-

coreneuron/utils/utils_cuda.h

@@ -12,5 +12,24 @@
 #include <cuda_runtime_api.h>
 
 // From Random123 lib
-#define CHECKLAST(MSG) 	do { cudaError_t e = cudaGetLastError(); if (e != cudaSuccess) {fprintf(stderr, "%s:%d: CUDA Error: %s: %s\n", __FILE__, __LINE__, (MSG), cudaGetErrorString(e)); exit(1); }} while(0)
-#define CHECKCALL(RET)	do { cudaError_t e = (RET); if (e != cudaSuccess) { fprintf(stderr, "%s:%d: CUDA Error: %s\n", __FILE__, __LINE__, cudaGetErrorString(e)); exit(1); } } while(0)
+#define CHECKLAST(MSG)                             \
+    do {                                           \
+        cudaError_t e = cudaGetLastError();        \
+        if (e != cudaSuccess) {                    \
+            fprintf(stderr,                        \
+                    "%s:%d: CUDA Error: %s: %s\n", \
+                    __FILE__,                      \
+                    __LINE__,                      \
+                    (MSG),                         \
+                    cudaGetErrorString(e));        \
+            exit(1);                               \
+        }                                          \
+    } while (0)
+#define CHECKCALL(RET)                                                                             \
+    do {                                                                                           \
+        cudaError_t e = (RET);                                                                     \
+        if (e != cudaSuccess) {                                                                    \
+            fprintf(stderr, "%s:%d: CUDA Error: %s\n", __FILE__, __LINE__, cudaGetErrorString(e)); \
+            exit(1);                                                                               \
+        }                                                                                          \
+    } while (0)

coreneuron/utils/vrecitem.h

@@ -83,6 +83,6 @@ class VecPlayContinuous: public PlayRecord {
     std::size_t discon_index_{};
     std::size_t ubound_index_{};
 
-    PlayRecordEvent* e_ = nullptr; // Need to be a raw pointer for acc
+    PlayRecordEvent* e_ = nullptr;  // Need to be a raw pointer for acc
 };
 }  // namespace coreneuron