build_visit update to use conduit 0.9.1 release (develop merge of #19297

 and #19300) (#19298)

* 3.4RC build_visit update to use conduit 0.9.1 release (#19297)

* updates to use conduit 0.9.1

* use updated container (#19300)

azure-pipelines.yml

@@ -12,7 +12,7 @@
 # TO USE A NEW CONTAINER, UPDATE TAG NAME HERE AS PART OF YOUR PR!
 #####
 variables:
-  container_tag: visitdav/visit-ci-develop:2024-01-31-shabc48c9
+  container_tag: visitdav/visit-ci-develop:2024-02-10-sha117ab0
 
 # only build merge target pr to develop
 trigger: none

src/tools/dev/scripts/bv_support/bv_conduit.sh

@@ -21,6 +21,10 @@ function bv_conduit_depends_on
         depends_on="hdf5"
     fi
 
+    if [[ "$DO_SILO" == "yes" ]] ; then
+        depends_on="silo"
+    fi
+
     if [[ "$DO_ZLIB" == "yes" ]] ; then
         depends_on="$depends_on zlib"
     fi
@@ -38,11 +42,11 @@ function bv_conduit_depends_on
 
 function bv_conduit_info
 {
-    export CONDUIT_VERSION=${CONDUIT_VERSION:-"v0.8.8"}
+    export CONDUIT_VERSION=${CONDUIT_VERSION:-"v0.9.1"}
     export CONDUIT_FILE=${CONDUIT_FILE:-"conduit-${CONDUIT_VERSION}-src-with-blt.tar.gz"}
-    export CONDUIT_COMPATIBILITY_VERSION=${CONDUIT_COMPATIBILITY_VERSION:-"v0.8.0"}
+    export CONDUIT_COMPATIBILITY_VERSION=${CONDUIT_COMPATIBILITY_VERSION:-"v0.9.1"}
     export CONDUIT_BUILD_DIR=${CONDUIT_BUILD_DIR:-"conduit-${CONDUIT_VERSION}"}
-    export CONDUIT_SHA256_CHECKSUM="99811e9c464b6f841f52fcd47e982ae47cbb01cba334cff43eabe13eea58c0df"
+    export CONDUIT_SHA256_CHECKSUM="a3f1168738dcf72f8ebf83299850301aaf56e803f40618fc1230a755d0d05363"
 }
 
 function bv_conduit_print
@@ -70,9 +74,19 @@ function bv_conduit_host_profile
         echo \
             "VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR \${VISITHOME}/conduit/$CONDUIT_VERSION/\${VISITARCH})" \
             >> $HOSTCONF
+
+        CONDUIT_HC_LIBDEPS=""
         if [[ "$DO_HDF5" == "yes" ]] ; then
+            CONDUIT_HC_LIBDEPS="HDF5_LIBRARY_DIR hdf5 \${VISIT_HDF5_LIBDEP}"
+        fi
+
+        if [[ "$DO_SILO" == "yes" ]] ; then
+            CONDUIT_HC_LIBDEPS="${CONDUIT_HC_LIBDEPS} \${VISIT_SILO_LIBDEP}"
+        fi
+
+        if [[ "$CONDUIT_HC_LIBDEPS" != "" ]] ; then
             echo \
-                "VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP HDF5_LIBRARY_DIR hdf5 \${VISIT_HDF5_LIBDEP} TYPE STRING)" \
+                "VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP ${CONDUIT_HC_LIBDEPS} TYPE STRING)" \
                 >> $HOSTCONF
         fi
     fi
@@ -201,6 +215,10 @@ function build_conduit
         fi
     fi
 
+    if [[ "$DO_SILO" == "yes" ]] ; then
+        cfg_opts="${cfg_opts} -DSILO_DIR:STRING=$VISITDIR/silo/$SILO_VERSION/$VISITARCH/"
+    fi
+
     if [[ "$DO_HDF5" == "yes" ]] ; then
         cfg_opts="${cfg_opts} -DHDF5_DIR:STRING=$VISITDIR/hdf5/$HDF5_VERSION/$VISITARCH/"
     fi

src/tools/dev/scripts/bv_support/bv_hdf5.sh

@@ -567,6 +567,13 @@ function build_hdf5
         cf_zlib="--with-zlib=\"${VISITDIR}/zlib/${ZLIB_VERSION}/${VISITARCH}\""
     fi
 
+    cf_extra_flags=""
+    if [[ "$OPSYS" == "Darwin" ]]; then
+        if [[ "$(uname -m)" == "arm64" ]]; then
+            cf_extra_flags="-Wno-error=implicit-function-declaration"
+        fi
+    fi
+
     # Disable Fortran on Darwin since it causes HDF5 builds to fail.
     if [[ "$OPSYS" == "Darwin" ]]; then
         cf_fortranargs=""
@@ -627,7 +634,7 @@ function build_hdf5
         info "Invoking command to configure $bt HDF5"
         set -x
         sh -c "../configure CC=\"$cf_c_compiler\" \
-            CFLAGS=\"$CFLAGS $C_OPT_FLAGS\" $cf_fortranargs \
+            CFLAGS=\"$CFLAGS $C_OPT_FLAGS $cf_extra_flags\" $cf_fortranargs \
             --prefix=\"$VISITDIR/hdf5${cf_par_suffix}/$HDF5_VERSION/$VISITARCH\" \
             ${cf_szip} ${cf_zlib} ${cf_build_type} ${cf_build_thread} \
             ${cf_build_parallel} ${extra_ac_flags} $build_mode"

src/tools/dev/scripts/bv_support/bv_mfem.sh

@@ -176,15 +176,27 @@ function build_mfem
     vopts="-DCMAKE_C_COMPILER:STRING=${C_COMPILER}"
     vopts="${vopts} -DCMAKE_C_FLAGS:STRING=\"${C_OPT_FLAGS} $CFLAGS\""
     vopts="${vopts} -DCMAKE_CXX_COMPILER:STRING=${CXX_COMPILER}"
-    # Version 4.0 now requires c++11
-    vopts="${vopts} -DCMAKE_CXX_FLAGS:STRING=\"${CXX_OPT_FLAGS} $CXXFLAGS -std=c++11\""
+    vopts="${vopts} -DCMAKE_CXX_FLAGS:STRING=\"${CXX_OPT_FLAGS} $CXXFLAGS\""
+    vopts="${vopts} -DMFEM_ENABLE_MINIAPPS:BOOL=OFF"
+    # MFEM 4.6 is hard coded to use C++11
+    #  In the future, we want to change this to C++14
+    vopts="${vopts} -DCMAKE_CXX_STANDARD=11"
+    vopts="${vopts} -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON"
     vopts="${vopts} -DCMAKE_INSTALL_PREFIX:PATH=${VISITDIR}/mfem/${MFEM_VERSION}/${VISITARCH}"
     if test "x${DO_STATIC_BUILD}" = "xyes" ; then
         vopts="${vopts} -DBUILD_SHARED_LIBS:BOOL=OFF"
     else
         vopts="${vopts} -DBUILD_SHARED_LIBS:BOOL=ON"
     fi
     vopts="${vopts} -DMFEM_USE_EXCEPTIONS:BOOL=ON"
+
+    if [[ "$DO_ZLIB" == "yes" ]] ; then
+        vopts="${vopts} -DMFEM_USE_ZLIB=ON"
+        vopts="${vopts} -DCMAKE_PREFIX_PATH:PATH=${VISITDIR}/zlib/${ZLIB_VERSION}/${VISITARCH}"
+    else
+        vopts="${vopts} -DMFEM_USE_ZLIB=OFF"
+    fi
+
     if [[ "$DO_CONDUIT" == "yes" ]] ; then
         vopts="${vopts} -DMFEM_USE_CONDUIT=ON -DCONDUIT_DIR=${VISITDIR}/conduit/${CONDUIT_VERSION}/${VISITARCH}"
     fi
@@ -200,8 +212,6 @@ function build_mfem
     else
         vopts="${vopts} -DMFEM_USE_FMS=OFF"
     fi
-    vopts="${vopts} -DMFEM_USE_ZLIB=ON"
-
     #
     # Call configure
     #
@@ -212,12 +222,6 @@ function build_mfem
     fi
     CMS=bv_run_cmake.sh
     echo "#!/bin/bash" > $CMS
-    echo "# Find the right ZLIB" >> $CMS
-    echo "export CMAKE_PREFIX_PATH=${VISITDIR}/zlib/${ZLIB_VERSION}/${VISITARCH}" >> $CMS
-    if [[ "$DO_HDF5" == "yes" ]] ; then
-        echo "# Find the right HDF5" >> $CMS
-        echo "export HDF5_ROOT=${VISITDIR}/hdf5/${HDF5_VERSION}/${VISITARCH}" >> $CMS
-    fi
     echo "\"${CMAKE_BIN}\" ${vopts} .." >> $CMS
     cat $CMS
     issue_command bash $CMS || error "MFEM configuration failed."