Merged with develop

LLNL · Nov 21, 2023 · 35fa67a · 35fa67a
2 parents 7c389bf + de253fb
commit 35fa67a
Show file tree

Hide file tree

Showing 1,144 changed files with 59,003 additions and 56,637 deletions.
diff --git a/.clang-format b/.clang-format
@@ -140,7 +140,6 @@ SpacesInConditionalStatement        : false
 SpacesInContainerLiterals           : true
 SpacesInParentheses                 : false
 SpacesInSquareBrackets              : false
-SpaceBeforeSquareBrackets           : false
 Standard                            : c++14
 TabWidth: 2
 UseCRLF : false

diff --git a/.github/actions/test-driver/action.yml b/.github/actions/test-driver/action.yml
@@ -26,5 +26,5 @@ runs:
       run: |
         git config --global --add safe.directory $GITHUB_WORKSPACE
         cd test
-        ./test_driver.sh --testtype CUSTOM --env env/docker.sh --tpls --realtype ${{ inputs.precision }} --indexsize ${{ inputs.indexsize }}
+        ./test_driver.sh --testtype CUSTOM --env env/docker.sh --tpls --sunrealtype ${{ inputs.precision }} --indexsize ${{ inputs.indexsize }}
       shell: bash
diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml
@@ -1,9 +1,15 @@
 #
-name: double precision build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc double precision (TPLs, no GPUs)
 
 on:
   push:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build_and_test:
@@ -25,10 +31,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
-        uses: actions/upload-artifact@v2.2.4
+      - 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/
diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml
@@ -1,8 +1,14 @@
 #
-name: extended precision build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc extended precision (TPLs, no GPUs)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build_and_test:
@@ -24,10 +30,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
-        uses: actions/upload-artifact@v2.2.4
+      - 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/
diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml
@@ -1,14 +1,20 @@
-name: MacOS short test
+name: Build and Test - MacOS (short)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  build_and_test:
     # The CMake configure and build commands are platform agnostic and should work equally
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.

diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml
@@ -1,8 +1,14 @@
 #
-name: single precision build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc single precision (TPLs, no GPUs)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build_and_test:
@@ -24,10 +30,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
-        uses: actions/upload-artifact@v2.2.4
+      - 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/
diff --git a/.github/workflows/spack-develop.yml b/.github/workflows/spack-develop.yml
@@ -1,12 +1,17 @@
 #
-name: spack@develop build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc spack@develop (TPLs, no GPUs)
 
 on:
   pull_request:
+  merge_group:
   workflow_dispatch:
   schedule:
   - cron: '00 22 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
@@ -27,10 +32,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
-        uses: actions/upload-artifact@v2.2.4
+      - 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/
diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml
@@ -1,16 +1,28 @@
-name: Ubuntu (clang) short test
+name: Build - Ubuntu/Clang (no TPLs)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  build_cycle_log_levels:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        # 2 is what all other builds use (its the default), so skip it here
+        logging_level: [0, 1, 3, 4, 5] 
+
     steps:
     - name: Install LLVM and Clang
       uses: KyleMayes/install-llvm-action@v1
@@ -22,14 +34,32 @@ jobs:
     - name: Configure CMake
       # 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}} -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++)
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++) -DSUNDIALS_LOGGING_LEVEL=${{matrix.logging_level}}
 
     - name: Build
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C ${{env.BUILD_TYPE}}
+  build_cycle_profiling:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        profiling: ['OFF', 'ON']
+
+    steps:
+    - name: Install LLVM and Clang
+      uses: KyleMayes/install-llvm-action@v1
+      with:
+        version: "14.0"
+
+    - uses: actions/checkout@v3
+
+    - name: Configure CMake
+      # 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}} -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++) -DSUNDIALS_BUILD_WITH_PROFILING=${{matrix.profiling}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml
@@ -1,14 +1,20 @@
-name: Windows (mingw) short test
+name: Build and Test - Windows/mingw (short)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  buil_and_test:
     runs-on: windows-latest
 
     steps:
@@ -21,7 +27,7 @@ jobs:
     - name: Configure CMake
       # 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 -G "MinGW Makefiles" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -G "MinGW Makefiles" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_LOGGING_LEVEL=2 -DSUNDIALS_TEST_UNITTESTS=OFF -DEXAMPLES_ENABLE_CXX=ON
 
     - name: Build
       # Build your program with the given configuration

diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml
@@ -1,14 +1,20 @@
-name: Windows short test
+name: Build and Test - Windows/MSVC (short)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  build_and_test:
     runs-on: windows-latest
 
     steps:
@@ -17,7 +23,7 @@ jobs:
     - name: Configure CMake
       # 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}} -DBUILD_STATIC_LIBS=OFF
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC_LIBS=OFF -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_LOGGING_LEVEL=2 -DSUNDIALS_TEST_UNITTESTS=ON -DEXAMPLES_ENABLE_CXX=ON
 
     - name: Build
       # Build your program with the given configuration

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -10,6 +10,8 @@ build:
   os: ubuntu-20.04
   tools:
     python: "3.9"
+  apt_packages:
+    - graphviz
 
 # Build documentation in the doc/ directory with Sphinx
 sphinx: