Merge remote-tracking branch 'gh/develop' into feature/gunney/copy-sidre-to-conduit

Author: gunney1

.mailmap

@@ -24,6 +24,7 @@ Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus Harrison <cyrush@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus Harrison <harrison37@llnl.gov>
 Cyrus D. Harrison <harrison37@llnl.gov>         Cyrus <cyrush@llnl.gov>
 Daniel Taller <taller1@llnl.gov>                Danny Taller <66029857+dtaller@users.noreply.github.com>
+Eric B. Chin <chin23@llnl.gov>                  E. B. Chin <ebchin@gmail.com>
 Esteban Pauli <pauli2@llnl.gov>                 Esteban Pauli <40901502+estebanpauli@users.noreply.github.com>
 Evan Taylor Desantola <desantola1@llnl.gov>     Evan Taylor DeSantola <desantola1@llnl.gov>
 format-robot <no-reply@llnl.gov>                format-robot <axom-dev@llnl.gov>
@@ -67,6 +68,8 @@ Robert Carson <rac428@cornell.edu>              Robert <rac428@cornell.edu>
 Robert Carson <rac428@cornell.edu>              rcarson3 <rac428@cornell.edu>
 Robert Cohn <robert.s.cohn@intel.com>           rscohn2 <rscohn2@gmail.com>
 Samuel P. Mish <mish2@llnl.gov>                 samuelpmishLLNL <61714427+samuelpmishLLNL@users.noreply.github.com>
+Sterbentz <stermark@isu.edu>                    Sterbentz <sterbentz3@lonestarr.llnl.gov>
+
 
 Axom Shared User <axom-dev@llnl.gov>            Asctoolkit Shared User <axom-dev@llnl.gov>
 Axom Shared User <axom-dev@llnl.gov>            Asctoolkit Shared User <atk@cab687.llnl.gov>

.uberenv_config.json

@@ -4,12 +4,12 @@
 "package_final_phase": "initconfig",
 "package_source_dir": "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_commit": "cade66d842a894075938bc5528475d9fcd8bd559",
+"spack_commit": "0161b662f73b75d25b31b5422f336eb97c26cdb8",
 "spack_configs_path": "scripts/spack/configs",
 "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"],
 "spack_concretizer": "clingo",
 "vcpkg_url": "https://github.com/microsoft/vcpkg",
-"vcpkg_commit": "898b728edc5e0d12b50015f9cd18247c4257a3eb",
+"vcpkg_commit": "d5ec528843d29e3a52d745a64b469f810b2cedbf",
 "vcpkg_triplet": "x64-windows",
 "vcpkg_ports_path": "scripts/vcpkg_ports"
 }

RELEASE-NOTES.md

@@ -41,6 +41,10 @@ to use Open Cascade's file I/O capabilities in support of Quest applications.
 - Adds a piecewise method to load external data using `sidre::IOManager`.  This adds new overloaded methods
   of `loadExternalData` in `sidre::IOManager` and `sidre::Group`.
 - Adds intersection routines between `primal::Ray` objects and `primal::NURBSCurve`/`primal::NURBSPatch` objects.
+- Adds LineFileTagCombiner to Lumberjack to allow combining messages if line number, file, and tag are equal.
+- Adds some support for 2D shaping in `quest::IntersectionShaper`, using STL meshes with zero for z-coordinates or in-memory triangles as input.
+- Adds ability in Lumberjack to own and set communicators.
+- Adds `NonCollectiveRootCommunicator` to Lumberjack to provide an MPI-based communicator for logging messages non-collectively.
 
 ###  Changed
 - `primal::NumericArray` has been moved to `core`.  The header is `core/NumericArray.hpp`.

data

@@ -134,7 +134,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2024.07.0-6plzos2py72y3ns2y72j3ksqdc3qrfqo" CACHE
 
 set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib_cray/2024_10_28_13_16_23/._view/duoudtvvq736czrjvwlncemhjhg3agix" CACHE PATH "")
 
-set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/rocmcc/rocmcc-5.2.3-magic/llvm/bin/clang-format" CACHE PATH "")
+set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/rocmcc/rocmcc-6.2.1-magic/llvm/bin/clang-format" CACHE PATH "")
 
 set(PYTHON_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib_cray/2024_10_28_13_16_23/gcc-10.3.1/python-3.12.5-khbdgeaypdfyrrvyywvvqt47x66jd5ol/bin/python3.12" CACHE PATH "")
 

host-configs/tioga-toss_4_x86_64_ib_cray-cce@18.0.0_hip.cmake

@@ -132,7 +132,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2024.07.0-hcbpird6z6buwcx5sd5t3aqho4yxqv6z" CACHE
 
 set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib_cray/2024_10_28_13_16_23/._view/duoudtvvq736czrjvwlncemhjhg3agix" CACHE PATH "")
 
-set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/rocmcc/rocmcc-5.2.3-magic/llvm/bin/clang-format" CACHE PATH "")
+set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/rocmcc/rocmcc-6.2.1-magic/llvm/bin/clang-format" CACHE PATH "")
 
 set(PYTHON_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib_cray/2024_10_28_13_16_23/gcc-10.3.1/python-3.12.5-khbdgeaypdfyrrvyywvvqt47x66jd5ol/bin/python3.12" CACHE PATH "")
 

host-configs/tioga-toss_4_x86_64_ib_cray-rocmcc@6.1.2_hip.cmake

@@ -132,7 +132,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2024.07.0-vnqw3c4b6ivlgf4k2oevxu3jg3b4vbjm" CACHE
 
 set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib_cray/2024_10_28_13_16_23/._view/duoudtvvq736czrjvwlncemhjhg3agix" CACHE PATH "")
 
-set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/rocmcc/rocmcc-5.2.3-magic/llvm/bin/clang-format" CACHE PATH "")
+set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/rocmcc/rocmcc-6.2.1-magic/llvm/bin/clang-format" CACHE PATH "")
 
 set(PYTHON_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib_cray/2024_10_28_13_16_23/gcc-10.3.1/python-3.12.5-khbdgeaypdfyrrvyywvvqt47x66jd5ol/bin/python3.12" CACHE PATH "")
 

host-configs/tioga-toss_4_x86_64_ib_cray-rocmcc@6.2.1_hip.cmake

@@ -217,6 +217,11 @@ spack:
       externals:
       - spec: ghostscript@9.25
         prefix: /usr
+    git:
+      buildable: false
+      externals:
+      - spec: git@2.45.0
+        prefix: /usr/tce/packages/git/git-2.45.0
     gmake:
       buildable: false
       externals:
@@ -345,14 +350,16 @@ spack:
       version: [2.24.0]
     mfem:
       require: "@4.6.0"
+    opencascade:
+      require: "@7.8.1+data_exchange~draw"
+    py-jsonschema:
+      require: "@:4.17" #Anything after this requires py-rpds which requires rust and adds 40 minutes
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     scr:
       require: "@3.0.1~shared~tests~examples"
     umpire:
       require: "@2024.07.0~shared~examples~werror"
-    opencascade:
-      require: "@7.8.1+data_exchange~draw"
 
     # Globally lock in versions of Devtools
     cmake:

scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml

@@ -205,6 +205,11 @@ spack:
       externals:
       - spec: ghostscript@9.27
         prefix: /usr
+    git:
+      buildable: false
+      externals:
+      - spec: git@2.45.0
+        prefix: /collab/usr/global/tools/tce4/opt/git-2.45.0
     gmake:
       buildable: false
       externals:
@@ -276,6 +281,11 @@ spack:
       externals:
       - spec: readline@7.0
         prefix: /usr
+    slurm:
+      buildable: false
+      externals:
+      - spec: slurm@24.05.5
+        prefix: /usr
     swig:
       buildable: false
       externals:
@@ -312,14 +322,18 @@ spack:
       version: [2.24.0]
     mfem:
       require: "@4.6.0"
+    opencascade:
+      require: "@7.8.1+data_exchange~draw"
+    py-jsonschema:
+      require: "@:4.17" #Anything after this requires py-rpds which requires rust and adds 40 minutes
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     scr:
       require: "@3.0.1~shared~tests~examples"
     umpire:
       require: "@2024.07.0~shared~examples~werror"
-    opencascade:
-      require: "@7.8.1+data_exchange~draw"
+    libyogrt:
+      require: "scheduler=slurm"
 
   # Lock in versions of Devtools
     cmake:

scripts/spack/configs/toss_4_x86_64_ib/spack.yaml

@@ -354,6 +354,11 @@ spack:
       externals:
       - spec: ghostscript@9.25
         prefix: /usr
+    git:
+      buildable: false
+      externals:
+      - spec: git@2.45.0
+        prefix: /collab/usr/global/tools/tce4/opt/git-2.45.0
     gmake:
       buildable: false
       externals:
@@ -486,6 +491,8 @@ spack:
       version: [2.24.0]
     mfem:
       require: "@4.6.0"
+    py-jsonschema:
+      require: "@:4.17" #Anything after this requires py-rpds which requires rust and adds 40 minutes
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     scr: