Merge branch 'main' into jmm/fix-out-of-bounds

Author: jonahm-LANL

.github/workflows/formatting.yml

@@ -18,7 +18,7 @@ jobs:
           run: export DEBIAN_FRONTEND=noninteractive
         - name: install dependencies
           run: |
-            sudo apt-get install -y --force-yes -qq git clang-format
+            sudo apt-get install -y --force-yes -qq git clang-format-19
         - name: check formatting
           continue-on-error: true
-          run: find . -regex '.*\.\(cpp\|hpp\)' | xargs clang-format -style=file -i && git diff --exit-code --ignore-submodules
+          run: find . -regex '.*\.\(cpp\|hpp\)' | xargs clang-format-19 -style=file -i && git diff --exit-code --ignore-submodules

cmake/Format.cmake

@@ -14,8 +14,8 @@
 find_program(
     CLANG_FORMAT
     NAMES
-        clang-format-12 # Debian package manager, among others, provide this name
-        clang-format-mp-12.0 # MacPorts
+        clang-format-19 # Debian package manager, among others, provide this name
+        clang-format-mp-19.0 # MacPorts
         clang-format # Default name
     )
 
@@ -36,15 +36,15 @@ endif()
 if (NOT CLANG_FORMAT_VERSION)
     message(
         WARNING
-        "Couldn't determine clang-format version. clang-format 12.0 is \
+        "Couldn't determine clang-format version. clang-format 19.0 is \
         expected - results on other versions may not be stable")
 
     set(CLANG_FORMAT_VERSION "0.0.0" CACHE STRING "clang-format version not found")
-elseif (NOT (CLANG_FORMAT_VERSION VERSION_GREATER_EQUAL "12.0" AND
-         CLANG_FORMAT_VERSION VERSION_LESS "13.0"))
+elseif (NOT (CLANG_FORMAT_VERSION VERSION_GREATER_EQUAL "19.0" AND
+         CLANG_FORMAT_VERSION VERSION_LESS "20.0"))
     message(
         WARNING
-        "clang-format version 12.0 is required - results on other \
+        "clang-format version 19.0 is required - results on other \
         versions may not be stable")
 endif()
 

spiner/databox.hpp

@@ -475,8 +475,8 @@ PORTABLE_FORCEINLINE_FUNCTION T DataBox<T, Grid_t, Concept>::interpToReal(
 }
 
 template <typename T, typename Grid_t, typename Concept>
-PORTABLE_FORCEINLINE_FUNCTION T
-DataBox<T, Grid_t, Concept>::interpToReal(const T x2, const T x1, const int idx) const noexcept {
+PORTABLE_FORCEINLINE_FUNCTION T DataBox<T, Grid_t, Concept>::interpToReal(
+    const T x2, const T x1, const int idx) const noexcept {
   assert(rank_ == 3);
   for (int r = 1; r < rank_; ++r) {
     assert(indices_[r] == IndexType::Interpolated);
@@ -490,8 +490,8 @@ DataBox<T, Grid_t, Concept>::interpToReal(const T x2, const T x1, const int idx)
 
   // TODO: prefectch corners for speed?
   // TODO: re-order access pattern?
-  return (w2[0] *
-              (w1[0] * dataView_(ix2, ix1, idx) + w1[1] * dataView_(ix2, ix1 + 1, idx)) +
+  return (w2[0] * (w1[0] * dataView_(ix2, ix1, idx) +
+                   w1[1] * dataView_(ix2, ix1 + 1, idx)) +
           w2[1] * (w1[0] * dataView_(ix2 + 1, ix1, idx) +
                    w1[1] * dataView_(ix2 + 1, ix1 + 1, idx)));
 }

test/test.cpp

@@ -1006,7 +1006,9 @@ int main(int argc, char *argv[]) {
   Kokkos::initialize();
 #endif
   int result;
-  { result = Catch::Session().run(argc, argv); }
+  {
+    result = Catch::Session().run(argc, argv);
+  }
 #ifdef PORTABILITY_STRATEGY_KOKKOS
   Kokkos::finalize();
 #endif