sunstepper rebase

.clang-format

@@ -79,7 +79,7 @@ EmptyLineAfterAccessModifier                  : Never
 EmptyLineBeforeAccessModifier                 : Always
 ExperimentalAutoDetectBinPacking              : false
 FixNamespaceComments                          : true
-IncludeBlocks                   : Preserve
+IncludeBlocks                   : Regroup
 IncludeCategories               :
 - Regex                           : '^(<|"(gtest|gmock|isl|json)/)'
   Priority                        : 1

.git-blame-ignore-revs

@@ -2,5 +2,3 @@
 fab1cecb7d91cff53b31730af5d00ff154c3b6ce
 # Remove deprecated types in 7.0.0
 cc6960349aa92e2bcad9168a6dacff99b21c329c
-# Apply formatting to Fortran files
-23581e8454955283139e551a7bcd1b85d8b7c77b

.github/workflows/build-ci-containers-e4s.yml

@@ -14,19 +14,19 @@ jobs:
       run: |
         cat /proc/cpuinfo
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v2
     - name: Login to container registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push Docker images
-      uses: docker/build-push-action@v6.0.2
+      uses: docker/build-push-action@v3.0.0
       with:
           context: "./docker/sundials-ci/e4s-base"
           build-args: e4s_version=22.05
@@ -44,19 +44,19 @@ jobs:
       run: |
         cat /proc/cpuinfo
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v2
     - name: Login to container registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push Docker images
-      uses: docker/build-push-action@v6.0.2
+      uses: docker/build-push-action@v3.0.0
       with:
           context: "./docker/sundials-ci/e4s-quarterly"
           build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

.github/workflows/build-ci-containers-nightly.yml

@@ -20,19 +20,19 @@ jobs:
       run: |
         cat /proc/cpuinfo
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v2
     - name: Login to container registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push Docker images
-      uses: docker/build-push-action@v6.0.2
+      uses: docker/build-push-action@v3.0.0
       with:
           context: "./docker/sundials-ci/spack-nightly"
           build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

.github/workflows/check-clang-format.yml

@@ -1,6 +1,7 @@
 name: Checks - clang-format
 
 on:
+  push:
   pull_request:
   workflow_dispatch:
 
@@ -13,10 +14,7 @@ jobs:
       - name: Install git
         run: |
           apt update
-          apt install -y git python3-pip
-
-      - name: Install fprettify
-        run: pip install fprettify
+          apt install -y git
 
       - name: Check out repository code
         uses: actions/checkout@v4
@@ -38,12 +36,12 @@ jobs:
 
       - name: Run git diff if we failed
         if: failure()
-        run:  /usr/bin/git diff > clang_format.patch
+        run:  /usr/bin/git diff > diff
 
-      - name: Archive diff as a patch if we failed
+      - name: Archive diff if we failed
         uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: clang_format.patch
+          name: diff
           path: |
-            ${{ github.workspace }}/clang_format.patch
+            ${{ github.workspace }}/diff

.github/workflows/ubuntu-latest.yml → .github/workflows/double-precision.yml

@@ -1,11 +1,8 @@
 #
-name: Build and Test - Ubuntu/gcc (TPLs, no GPUs)
+name: Build and Test - Ubuntu/gcc double precision (TPLs, no GPUs)
 
 on:
   push:
-    branches:
-      - main
-      - develop
   pull_request:
   merge_group:
   workflow_dispatch:
@@ -24,24 +21,11 @@ jobs:
       max-parallel: 2
       matrix:
         indexsize: [32, 64]
-        # Disable extended tests until compiler warnings are addressed
-        precision: ['single', 'double']
-        buildtype: ['Debug', 'Release', 'RelWithDebInfo']
-        exclude:
-          - buildtype: Debug
-            precision: single
-          # - buildtype: Debug
-          #   precision: extended
-          - buildtype: Release
-            precision: single
-          # - buildtype: Release
-          #   precision: extended
-          - buildtype: RelWithDebInfo
-            precision: double
-
+        precision: ['double']
+        buildtype: ['Debug', 'Release']
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Run test_driver.sh

.github/workflows/extended-precision.yml

@@ -0,0 +1,48 @@
+#
+name: Build and Test - Ubuntu/gcc extended precision (TPLs, no GPUs)
+
+on:
+  pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/llnl/sundials-ci-int${{ matrix.indexsize }}-${{ matrix.precision }}:latest
+      options: --user root
+    strategy:
+      matrix:
+        indexsize: [32, 64]
+        precision: ['extended']
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Run test_driver.sh
+        uses: ./.github/actions/test-driver
+        with:
+          indexsize: ${{ matrix.indexsize }}
+          precision: ${{ matrix.precision }}
+      - name: Archive build files from failed build
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: build_files
+          path: |
+            ${{ github.workspace }}/test/build_*
+            !${{ github.workspace }}/test/build_*/Testing/output
+      - name: Archive output files from failed build
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: output_files
+          path: |
+            ${{ github.workspace }}/test/build_*/Testing/
+            

.github/workflows/macos-latest.yml

@@ -22,16 +22,12 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory.
-      run: |
-        cmake \
-        -B ${{github.workspace}}/build \
-        -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-        -D ENABLE_ALL_WARNINGS=ON \
-        -D ENABLE_WARNINGS_AS_ERRORS=ON
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
       # Build your program with the given configuration