Merge remote-tracking branch 'upstream/develop' into feature/bgunnar5…

…/sina-integration

.github/workflows/test_windows_tpls.yml

@@ -29,21 +29,21 @@ jobs:
 
     steps:
     - name: Checkout repo w/ submodules
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Set up python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.10'
 
     - name: List path and files
       run: ls
     - name: Run uberenv (${{ matrix.triplet }})
       run: python3 ./scripts/uberenv/uberenv.py --triplet ${{ matrix.triplet }}
     - name: Save Uberenv logs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
         name: uberenv_artifacts_${{ matrix.triplet }}_${{ matrix.cfg }}.zip
@@ -73,7 +73,7 @@ jobs:
         ls
         ctest -C ${{ matrix.cfg }} --no-compress-output -T Test 
     - name: Save CTest logs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
         name: ctest_artifacts_${{ matrix.triplet }}_${{ matrix.cfg }}.zip

.gitlab/build_lassen.yml

@@ -59,18 +59,6 @@ lassen-gcc_8_3_1_cuda-src:
     HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
   extends: [.src_build_on_lassen]
 
-lassen-xl_16_1_1-src:
-  variables:
-    COMPILER: "[email protected]"
-    HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
-  extends: [.src_build_on_lassen]
-
-lassen-xl_16_1_1_cuda-src:
-  variables:
-    COMPILER: "[email protected]_cuda"
-    HOST_CONFIG: "lassen-blueos_3_ppc64le_ib_p9-${COMPILER}.cmake"
-  extends: [.src_build_on_lassen]
-
 ####
 # Full Build jobs
 lassen-clang_10_0_1-full:
@@ -98,16 +86,3 @@ lassen-gcc_8_3_1_cuda-full:
     SPEC: "%${COMPILER}~mfem+cuda"
     EXTRA_SPEC: "cuda_arch=70"
   extends: [.full_build_on_lassen]
-
-lassen-xl_16_1_1-full:
-  variables:
-    COMPILER: "[email protected]"
-    SPEC: "%${COMPILER}+mfem~openmp~cpp14"
-  extends: [.full_build_on_lassen]
-
-lassen-xl_16_1_1_cuda-full:
-  variables:
-    COMPILER: "[email protected]"
-    SPEC: "%${COMPILER}+mfem+cuda~openmp~cpp14"
-    EXTRA_SPEC: "cuda_arch=70"
-  extends: [.full_build_on_lassen]

.uberenv_config.json

@@ -4,7 +4,7 @@
 "package_final_phase": "initconfig",
 "package_source_dir": "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_commit": "6d244b3f6776b3697861c6b5cebbee376c30bff3",
+"spack_commit": "cade66d842a894075938bc5528475d9fcd8bd559",
 "spack_configs_path": "scripts/spack/configs",
 "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"],
 "spack_concretizer": "clingo",

CITATION.cff

@@ -24,6 +24,7 @@ authors:
   given-names: Cyrus
 - family-names: Hornung
   given-names: Richard
+  orcid:  "https://orcid.org/0000-0002-9495-6972"
 - family-names: Larsen
   given-names: Matthew
 - family-names: Moody

RELEASE

@@ -1,6 +1,6 @@
 *******************************************************************************
 
-Axom: ................................, version 0.9.0
+Axom: ................................, version 0.10.0
 
 Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC. 
 Produced at the Lawrence Livermore National Laboratory.

RELEASE-NOTES.md

@@ -19,7 +19,27 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 
 ## [Unreleased] - Release date yyyy-mm-dd
 
+###  Added
+
+###  Changed
+
+###  Deprecated
+
+###  Removed
+
+###  Fixed
+- Added a guard for sidre-related mint API usage in a quest example
+- Removed `std::ends` usage from `SLIC_ASSERT`,`SLIC_ASSERT_MSG`,`SLIC_CHECK`,
+  and `SLIC_CHECK_MSG` macros that prevented Lumberjack from combining
+  messages.
+
+
+## [Version 0.10.0] - Release date 2024-09-27
+
 ### Added
+- Added SLIC constructors that take in a `std::string` for the stream. If string is
+  interpreted as a file name, the file is not opened until SLIC flushes and the
+  stream has at least one message logged.
 - Primal: Adds a `clip()` operator overload for clipping a 2D polygon against
   another 2D polygon.
 - Primal: Adds `Polygon::reverseOrientation()` to reverse orientation of
@@ -46,6 +66,10 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 - Quest: Adds an example to query winding numbers on an MFEM NURBS mesh
 
 ### Changed
+- Updates to [Conduit version 0.9.2][https://github.com/LLNL/conduit/releases/tag/v0.9.2]
+- Updates to [RAJA version 2024.07.0][https://github.com/LLNL/RAJA/releases/tag/v2024.07.0]
+- Updates to [camp version 2024.07.0][https://github.com/LLNL/camp/releases/tag/v2024.07.0]
+- Updates to [Umpire version 2024.07.0][https://github.com/LLNL/Umpire/releases/tag/v2024.07.0]
 - `axom::CLI::ExitCodes::Success` has been changed to `axom::CLI::ExitCodes::CLI11_Success`
   to avoid conflict when X11 `#define`s `Success`.
 - `MarchingCubes` masking now uses the mask field's integer values instead of
@@ -75,6 +99,10 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
   (and `adiak` for metadata) and are available when axom is configured with `CALIPER_DIR` and `ADIAK_DIR` 
   config variables.
 - Removes caching of `{PACKAGE}_FOUND` variables in `SetupAxomThirdParty.cmake`
+- We no longer test Axom with the XL compiler. So users should consider XL unsupported.
+
+### Fixed
+- `numerics::eigen_solve()` has been corrected to avoid an early return with error state.
 
 ## [Version 0.9.0] - Release date 2024-03-19
 
@@ -1088,20 +1116,21 @@ fractions for the associated materials must be supplied before shaping.
 - Use this section in case of vulnerabilities
 
 
-[Unreleased]:    https://github.com/LLNL/axom/compare/v0.9.0...develop
-[Version 0.9.0]: https://github.com/LLNL/axom/compare/v0.8.1...v0.9.0
-[Version 0.8.1]: https://github.com/LLNL/axom/compare/v0.8.0...v0.8.1
-[Version 0.8.0]: https://github.com/LLNL/axom/compare/v0.7.0...v0.8.0
-[Version 0.7.0]: https://github.com/LLNL/axom/compare/v0.6.1...v0.7.0
-[Version 0.6.1]: https://github.com/LLNL/axom/compare/v0.6.0...v0.6.1
-[Version 0.6.0]: https://github.com/LLNL/axom/compare/v0.5.0...v0.6.0
-[Version 0.5.0]: https://github.com/LLNL/axom/compare/v0.4.0...v0.5.0
-[Version 0.4.0]: https://github.com/LLNL/axom/compare/v0.3.3...v0.4.0
-[Version 0.3.3]: https://github.com/LLNL/axom/compare/v0.3.2...v0.3.3
-[Version 0.3.2]: https://github.com/LLNL/axom/compare/v0.3.1...v0.3.2
-[Version 0.3.1]: https://github.com/LLNL/axom/compare/v0.3.0...v0.3.1
-[Version 0.3.0]: https://github.com/LLNL/axom/compare/v0.2.9...v0.3.0
-[Version 0.2.9]: https://github.com/LLNL/axom/compare/v0.2.8...v0.2.9
+[Unreleased]:     https://github.com/LLNL/axom/compare/v0.10.0...develop
+[Version 0.10.0]: https://github.com/LLNL/axom/compare/v0.9.0...v0.10.0
+[Version 0.9.0]:  https://github.com/LLNL/axom/compare/v0.8.1...v0.9.0
+[Version 0.8.1]:  https://github.com/LLNL/axom/compare/v0.8.0...v0.8.1
+[Version 0.8.0]:  https://github.com/LLNL/axom/compare/v0.7.0...v0.8.0
+[Version 0.7.0]:  https://github.com/LLNL/axom/compare/v0.6.1...v0.7.0
+[Version 0.6.1]:  https://github.com/LLNL/axom/compare/v0.6.0...v0.6.1
+[Version 0.6.0]:  https://github.com/LLNL/axom/compare/v0.5.0...v0.6.0
+[Version 0.5.0]:  https://github.com/LLNL/axom/compare/v0.4.0...v0.5.0
+[Version 0.4.0]:  https://github.com/LLNL/axom/compare/v0.3.3...v0.4.0
+[Version 0.3.3]:  https://github.com/LLNL/axom/compare/v0.3.2...v0.3.3
+[Version 0.3.2]:  https://github.com/LLNL/axom/compare/v0.3.1...v0.3.2
+[Version 0.3.1]:  https://github.com/LLNL/axom/compare/v0.3.0...v0.3.1
+[Version 0.3.0]:  https://github.com/LLNL/axom/compare/v0.2.9...v0.3.0
+[Version 0.2.9]:  https://github.com/LLNL/axom/compare/v0.2.8...v0.2.9
 
 [clang-format]: https://releases.llvm.org/10.0.0/tools/clang/docs/ClangFormatStyleOptions.html
 [MFEM]: https://mfem.org

azure-pipelines.yml

@@ -9,13 +9,15 @@ variables:
   DO_BUILD: 'yes'
   DO_TEST: 'yes'
   DO_CLEAN: 'no'
-  CLANG14_IMAGENAME: 'axom/tpls:clang-14_07-10-24_20h-47m'
-  GCC13_IMAGENAME: 'axom/tpls:gcc-13_07-10-24_20h-47m'
+  CLANG14_IMAGENAME: 'axom/tpls:clang-14_10-10-24_01h-31m'
+  GCC13_IMAGENAME: 'axom/tpls:gcc-13_10-10-24_01h-31m'
   system.debug: false
 
 jobs:
 - job: Build_and_Test
 
+  timeoutInMinutes: 90
+
   strategy:
     matrix:
       linux_gcc13: