Merge branch 'master' into exodiff-changeset-modifications

sandialabs · Feb 18, 2025 · 0755cf2 · 0755cf2
2 parents 98db272 + 308a412
commit 0755cf2
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 57 deletions.
diff --git a/.github/workflows/build_netcdf_no_hdf5.yml b/.github/workflows/build_netcdf_no_hdf5.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         compiler: [ gnu, clang, mpi ]
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
     steps:
 
       - name: Harden Runner
@@ -48,7 +48,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.netcdf }}
-          key: TPL-v5-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.netcdf }}
+          key: TPL-v3-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.netcdf }}
 
       - name: Build TPL-${{ matrix.compiler }}-${{ matrix.netcdf }}
         if: steps.cache-TPL.outputs.cache-hit != 'true'
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
         config:
         - {
             name: "Debug serial build",
@@ -108,7 +108,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.config.compiler }}-${{ matrix.netcdf }}
-          key: TPL-v5-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.netcdf }}
+          key: TPL-v3-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.netcdf }}
 
       - name: Check Cache
         shell: bash -l {0}

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         compiler: [ gnu, clang, mpi ]
         hdf5: [ V110, V114 ]
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
     steps:
 
@@ -48,7 +48,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
         if: steps.cache-TPL.outputs.cache-hit != 'true'
@@ -71,7 +71,7 @@ jobs:
       matrix:
         compiler: [ gnu, clang, mpi ]
         hdf5: [ V110, V114 ]
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
     steps:
 
@@ -91,7 +91,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Check Cache
         shell: bash -l {0}

diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml
@@ -26,7 +26,7 @@ jobs:
       matrix:
         compiler: [ gnu, clang, mpi ]
         hdf5: [ V114 ]
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
     steps:
 
@@ -49,7 +49,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v3-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
         if: steps.cache-TPL.outputs.cache-hit != 'true'
@@ -69,7 +69,7 @@ jobs:
       fail-fast: false
       matrix:
         hdf5: [ V114 ]
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
         config:
         - {
@@ -396,7 +396,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v2-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v3-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Check Cache
         shell: bash -l {0}

diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -15,8 +15,8 @@ jobs:
     strategy:
       matrix:
         compiler: [ gnu ]
-        hdf5: [ V110 ]
-        netcdf: [ 4.9.2 ]
+        hdf5: [ V114 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
     steps:
 
@@ -39,7 +39,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v3-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
         if: steps.cache-TPL.outputs.cache-hit != 'true'
@@ -61,8 +61,8 @@ jobs:
     strategy:
       matrix:
         compiler: [ gnu ]
-        hdf5: [ V110 ]
-        netcdf: [ 4.9.2 ]
+        hdf5: [ V114 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
     steps:
 
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v3-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Check Cache
         shell: bash -l {0}

diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml
@@ -22,7 +22,7 @@ jobs:
       matrix:
         compiler: [ intel, mpi ]
         hdf5: [ V114 ]
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
 
     defaults:
@@ -72,7 +72,7 @@ jobs:
       uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-        key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+        key: TPL-v3intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
     - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
       if: steps.cache-TPL.outputs.cache-hit != 'true'
@@ -93,7 +93,7 @@ jobs:
       matrix:
         compiler: [ intel, mpi ]
         hdf5: [ V114 ]
-        netcdf: [ 4.9.2 ]
+        netcdf: [ 4.9.3 ]
         cgns: [ 4.4.0 ]
     steps:
 
@@ -136,7 +136,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v3intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Check Cache
         shell: bash -l {0}

diff --git a/TPL/matio/runcmake.sh b/TPL/matio/runcmake.sh
@@ -62,12 +62,12 @@ cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \
 	 -DMATIO_DEFAULT_FILE_VERSION=${DEFAULT_VERSION} \
          -DMATIO_MAT73:BOOL=${HDF5} \
          -DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} \
+	 -DCMAKE_INSTALL_RPATH=${INSTALL_PATH}/lib \
          -DCMAKE_INSTALL_LIBDIR:PATH=lib \
 	 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
          -DMATIO_WITH_HDF5:BOOL=${HDF5} \
          -DMATIO_WITH_ZLIB:BOOL=ON \
-         -DHDF5_ROOT:PATH=${INSTALL_PATH} \
-         -DHDF5_DIR:PATH=${INSTALL_PATH} \
+         -DHDF5_DIR:PATH=${INSTALL_PATH}/cmake \
 	 ${LOCAL_ZLIB} ${EXTRA_DEPS}
 
 

diff --git a/TPL/netcdf/runcmake.sh b/TPL/netcdf/runcmake.sh
@@ -32,9 +32,9 @@ fi
 if [[ "$HDF5" == "ON" || "$HDF5" == "YES" ]]
 then
     export HDF5_PLUGIN_PATH=${INSTALL_PATH}/lib/hdf5/lib/plugin
-    HDF5_INFO="-DHDF5_ROOT:PATH=${INSTALL_PATH} -DHDF5_DIR:PATH=${INSTALL_PATH} -D${PREFIX}ENABLE_NETCDF4:BOOL=ON -D${PREFIX}PLUGIN_INSTALL_DIR=YES"
+    HDF5_INFO="-DHDF5_ROOT:PATH=${INSTALL_PATH} -DHDF5_DIR:PATH=${INSTALL_PATH} -D${PREFIX}ENABLE_HDF5:BOOL=ON -D${PREFIX}PLUGIN_INSTALL_DIR=YES"
 else
-    HDF5_INFO="-DENABLE_HDF5=OFF -D${PREFIX}ENABLE_NETCDF4:BOOL=OFF"
+    HDF5_INFO="-DENABLE_HDF5=OFF -D${PREFIX}ENABLE_HDF5:BOOL=OFF"
 fi
 
 NEEDS_ZLIB="${NEEDS_ZLIB:-NO}"
@@ -64,6 +64,7 @@ cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \
          -DBUILD_SHARED_LIBS:BOOL=${SHARED} \
          -DBUILD_TESTING:BOOL=OFF \
          -DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} \
+	 -DCMAKE_INSTALL_RPATH=${INSTALL_PATH}/lib \
          -DCMAKE_INSTALL_LIBDIR:PATH=lib \
 	 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
 	 -DCMAKE_PREFIX_PATH=${INSTALL_PATH} \

diff --git a/cmake/modules/FindMatio.cmake b/cmake/modules/FindMatio.cmake
@@ -178,7 +178,8 @@ else(Matio_LIBRARIES AND Matio_INCLUDE_DIRS)
      file(STRINGS "${inc_path}/matio_pubconf.h" matio_default_version REGEX " MAT_FT_DEFAULT ")
      string(REGEX MATCH "4|73" default_version "${matio_default_version}")
      if (default_version EQUAL 73)
-        add_package_dependency(Matio DEPENDS_ON HDF5)
+        add_library(MATIO::HDF5 INTERFACE IMPORTED)
+
      endif()
     endif()