Skip to content

Commit

Permalink
More build visit updates for 3.4 (#19262) (#19274)
Browse files Browse the repository at this point in the history
* blosc2 and adios2 var fix

* move to only use sha256 checksums

* more md5 removals

* restore bv_silo

* combine docker steps

* update container

* fix ospray runtime path

* fetch all blueprint test data

* remove bv silo md5 with out other white space consequences

* fix tarballs

* bv_fix blosc2 install path

* fix adios2 wiring that i broke

* update ci container

* cmake, use blosc2 instead of libblos2 setup blosc2
  • Loading branch information
cyrush committed Feb 1, 2024
1 parent a14400c commit 20b72c0
Show file tree
Hide file tree
Showing 55 changed files with 42 additions and 165 deletions.
13 changes: 11 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-24-sha0d1435
container_tag: visitdav/visit-ci-develop:2024-01-31-shabc48c9

# only build merge target pr to develop
trigger: none
Expand Down Expand Up @@ -97,10 +97,14 @@ stages:
git lfs pull --include blueprint_v0.7.0_venn_test_data.tar.xz
git lfs pull --include blueprint_v0.8.2_braid_examples_test_data.tar.xz
git lfs pull --include blueprint_v0.8.2_polytess_test_data.tar.xz
git lfs pull --include blueprint_v0.8.3_devilray_mfem_test_data
git lfs pull --include blueprint_v0.8.4_part_map_examples.tar.xz
git lfs pull --include blueprint_v0.8.4_strided_structured_examples.tar.xz
git lfs pull --include blueprint_v0.8.4_strided_structured_examples.tar.xz
git lfs pull --include blueprint_v0.8.6_rz_examples.tar.xz
git lfs pull --include blueprint_v0.8.6_1d_curve_examples.tar.xz
git lfs pull --include blueprint_v0.8.7_venn_modded_matnos_example.tar.xz
git lfs pull --include blueprint_v0.8.7_polytopal_mesh_no_offsets.tar.xz
cd ../
git lfs pull --include test/baseline/databases/silo
git lfs pull --include test/baseline/databases/blueprint
Expand All @@ -115,9 +119,14 @@ stages:
tar xvf ../../data/blueprint_v0.7.0_venn_test_data.tar.xz
tar xvf ../../data/blueprint_v0.8.2_braid_examples_test_data.tar.xz
tar xvf ../../data/blueprint_v0.8.2_polytess_test_data.tar.xz
tar xvf ../../data/blueprint_v0.8.3_devilray_mfem_test_data
tar xvf ../../data/blueprint_v0.8.4_part_map_examples.tar.xz
tar xvf ../../data/blueprint_v0.8.4_strided_structured_examples.tar.xz
tar xvf ../../data/blueprint_v0.8.4_strided_structured_examples.tar.xz
tar xvf ../../data/blueprint_v0.8.6_rz_examples.tar.xz
tar xvf ../../data/blueprint_v0.8.6_1d_curve_examples.tar.xz
tar xvf ../../data/blueprint_v0.8.7_venn_modded_matnos_example.tar.xz
tar xvf ../../data/blueprint_v0.8.7_polytopal_mesh_no_offsets.tar.xz
displayName: 'Prep Test Data'
- script: |
Expand All @@ -129,7 +138,7 @@ stages:
# find qt, vtk, and ospray
export QT_LIB_DIR=`ls -d ${TPLS_PATH}/qt/*/ci/lib/`
export VTK_LIB_DIR=`ls -d ${TPLS_PATH}/vtk/*/ci/lib/`
export OSPRAY_LIB_DIR=`ls -d ${TPLS_PATH}/ospray/*/ci/lib/`
export OSPRAY_LIB_DIR=`ls -d ${TPLS_PATH}/ospray/*/ci/ospray/lib/`
# add to ld_lib path (rpaths are missing?)
export LD_LIBRARY_PATH=${VTK_LIB_DIR}:${OSPRAY_LIB_DIR}:${QT_LIB_DIR}
# run test suite on silo + blueprint tests
Expand Down
11 changes: 5 additions & 6 deletions scripts/ci/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,15 @@ RUN cd /scripts/ && tar -xf visit.build_visit.docker.src.tar
# ensure build_visit script is executable
RUN cd /scripts/ && chmod u+x build_visit

# call masonry to build tpls
RUN cd masonry && python3 bootstrap_visit.py opts/mb-develop-ci-smoke.json

# copy cleanup helper
COPY masonry_docker_ci_cleanup.py /
# cleanup extract build dirs and obtain the config site file
RUN python masonry_docker_ci_cleanup.py

# call masonry to build tpls
# cleanup extract build dirs and obtain the config site file
# change perms
RUN chmod -R a+rX /masonry
RUN cd masonry && python3 bootstrap_visit.py opts/mb-develop-ci-smoke.json && \
cd / && python3 masonry_docker_ci_cleanup.py && \
chmod -R a+rX /masonry

# add helper script to clone visit
RUN echo "git clone https://github.com/visit-dav/visit.git" > /clone.sh
Expand Down
2 changes: 1 addition & 1 deletion src/CMake/FindBlosc2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

# Use the BLOSC_DIR hint from the config-site .cmake file

SET_UP_THIRD_PARTY(BLOSC2 LIBS libblosc2)
SET_UP_THIRD_PARTY(BLOSC2 LIBS blosc2)

2 changes: 1 addition & 1 deletion src/tools/dev/scripts/build_visit
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ function bv_write_unified_file
cat $bv_PREFIX/bv_main.sh >> $OUTPUT_bv_FILE
cat $bv_PREFIX/helper_funcs.sh >> $OUTPUT_bv_FILE
cat ${bv_PREFIX}/bv_xml_parser.sh >> $OUTPUT_bv_FILE
cat ${bv_PREFIX}/bv_visit.sh | sed "s/VISIT_MD5_CHECKSUM=\"\"/VISIT_MD5_CHECKSUM=\"$md5sum\"/" | sed "s/VISIT_SHA256_CHECKSUM=\"\"/VISIT_SHA256_CHECKSUM=\"$sha256sum\"/" >> $OUTPUT_bv_FILE
cat ${bv_PREFIX}/bv_visit.sh | sed "s/VISIT_SHA256_CHECKSUM=\"\"/VISIT_SHA256_CHECKSUM=\"$sha256sum\"/" >> $OUTPUT_bv_FILE

for (( i = 0; i < ${#xmlp_alllibs[*]}; ++i ))
do
Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_adios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ function bv_adios_info
export ADIOS_COMPATIBILITY_VERSION=${ADIOS_COMPATIBILITY_VERSION:-"${ADIOS_VERSION}"}
export ADIOS_URL=${ADIOS_URL:-"http://users.nccs.gov/~pnorbert"}
export ADIOS_BUILD_DIR=${ADIOS_BUILD_DIR:-"adios-${ADIOS_VERSION}"}
export ADIOS_MD5_CHECKSUM="6e9eb73953231aebbbc8788f39f08618"
export ADIOS_SHA256_CHECKSUM="684096cd7e5a7f6b8859601d4daeb1dfaa416dfc2d9d529158a62df6c5bcd7a0"
}

Expand Down
16 changes: 7 additions & 9 deletions src/tools/dev/scripts/bv_support/bv_adios2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ function bv_adios2_info
export ADIOS2_COMPATIBILITY_VERSION=${ADIOS2_COMPATIBILITY_VERSION:-"${ADIOS2_VERSION}"}
export ADIOS2_URL=${ADIOS2_URL:-"https://github.com/ornladios/ADIOS2/archive/refs/tags/v${ADIOS2_VERSION}"}
export ADIOS2_BUILD_DIR=${ADIOS2_BUILD_DIR:-"ADIOS2-"${ADIOS2_VERSION}}
export ADIOS2_MD5_CHECKSUM="99e55ad8346551c632515905379c3cc1"
export ADIOS2_SHA256_CHECKSUM="8b72142bd5aabfb80c7963f524df11b8721c09ef20caea6df5fb00c31a7747c0"
}

Expand Down Expand Up @@ -203,20 +202,19 @@ function build_adios2

# Use Blosc2
if [[ "$DO_BLOSC2" == "yes" ]] ; then
# find blosc2
BLOSC2_DIR="${VISITDIR}/blosc2/${BLOSC2_VERSION}/${VISITARCH}"
BLOSC2_INCLUDE_DIR="${BLOSC2_DIR}/include"
BLOSC2_INSTALL_DIR="${VISITDIR}/blosc2/${BLOSC2_VERSION}/${VISITARCH}"
BLOSC2_INCLUDE_DIR="${BLOSC2_INSTALL_DIR}/include"
# note: lib dir can be `lib``, or `lib64` depending on the platform
if [[ -d "${BLOSC2_DIR}/lib64/" ]] ; then
BLOSC2_LIBRARY="${BLOSC2_DIR}/lib64/libblosc2.so"
if [[ -d "${BLOSC2_INSTALL_DIR}/lib64/" ]] ; then
BLOSC2_LIBRARY="${BLOSC2_INSTALL_DIR}/lib64/libblosc2.so"
fi

if [[ -d "${BLOSC2_DIR}/lib/" ]] ; then
BLOSC2_LIBRARY="${BLOSC2_DIR}/lib/libblosc2.so"
if [[ -d "${BLOSC2_INSTALL_DIR}/lib/" ]] ; then
BLOSC2_LIBRARY="${BLOSC2_INSTALL_DIR}/lib/libblosc2.so"
fi

cfg_opts="${cfg_opts} -DADIOS2_USE_Blosc2:BOOL=ON"
cfg_opts="${cfg_opts} -DBlosc2_DIR=${BLOSC2_DIR}"
cfg_opts="${cfg_opts} -DBlosc2_DIR=${BLOSC2_INSTALL_DIR}"
cfg_opts="${cfg_opts} -DBLOSC2_INCLUDE_DIR=${BLOSC2_INCLUDE_DIR}"
cfg_opts="${cfg_opts} -DBLOSC2_LIBRARY=${BLOSC2_LIBRARY}"
fi
Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_advio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ function bv_advio_info
export ADVIO_VERSION=${ADVIO_VERSION:-"1.2"}
export ADVIO_COMPATIBILITY_VERSION=${ADVIO_COMPATIBILITY_VERSION:-"1.2"}
export ADVIO_BUILD_DIR=${ADVIO_BUILD_DIR:-AdvIO-1.2}
export ADVIO_MD5_CHECKSUM="db6def939a2d5dd4d3d6203ba5d3ec7e"
export ADVIO_SHA256_CHECKSUM="cd89d8a7f1fe94c1bd2d04888028d8b2b98a37853c4a8d5b2b7417b83ea1e803"
}

Expand Down
4 changes: 2 additions & 2 deletions src/tools/dev/scripts/bv_support/bv_blosc2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ function bv_blosc2_disable
# Where to get the module, the version, etc...
function bv_blosc2_info
{
BLOSC2_DIR="${VISITDIR}/blosc2/${BLOSC2_VERSION}/${VISITARCH}"
# note this is c-blosc2, NOT c-blosc
export BLOSC2_VERSION=${BLOSC2_VERSION:-"2.11.3"}
export BLOSC2_FILE=${BLOSC2_FILE:-"c-blosc2-${BLOSC2_VERSION}.tar.gz"}
Expand All @@ -27,7 +28,6 @@ function bv_blosc2_info
# export BLOSC2_URL=${BLOSC2_URL:-"https://github.com/Blosc/c-blosc2/releases/tag"}
# to use that download you'd need to rename the file once downloaded.
export BLOSC2_BUILD_DIR=${BLOSC2_BUILD_DIR:-"c-blosc2-${BLOSC2_VERSION}"}
export BLOSC2_MD5_CHECKSUM="129756ae2d833b1bc2c5cac46f03c75d"
export BLOSC2_SHA256_CHECKSUM="7273ec3ab42adc247425ab34b0601db86a6e2a6aa1a97a11e29df02e078f5037"
}

Expand Down Expand Up @@ -78,7 +78,7 @@ function build_blosc2

cd $BLOSC2_BUILD_DIR || error "Can't cd to BLOSC2 source dir."

cfg_opts="-DCMAKE_INSTALL_PREFIX:PATH=${BLOSC2_DIR}"
cfg_opts="-DCMAKE_INSTALL_PREFIX:PATH=${VISITDIR}/blosc2/${BLOSC2_VERSION}/${VISITARCH}"

CMAKE_BIN="${CMAKE_INSTALL}/cmake"
if test -e bv_run_cmake.sh ; then
Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ function bv_boost_info
export BOOST_COMPATIBILITY_VERSION=${BOOST_COMPATIBILITY_VERSION:-"1_67"}
export BOOST_URL=${BOOST_URL:-"http://sourceforge.net/projects/boost/files/boost/1.67.0"}
export BOOST_BUILD_DIR=${BOOST_BUILD_DIR:-"boost_${BOOST_VERSION}"}
export BOOST_MD5_CHECKSUM="4850fceb3f2222ee011d4f3ea304d2cb"
export BOOST_SHA256_CHECKSUM="8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_boxlib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ function bv_boxlib_info
export BOXLIB_COMPATIBILITY_VERSION=${BOXLIB_COMPATIBILITY_VERSION:-"1.3.5"}
export BOXLIB_URL=${BOXLIB_URL:-"https://ccse.lbl.gov/Software/tarfiles/"}
export BOXLIB_BUILD_DIR=${BOXLIB_BUILD_DIR:-"ccse-${BOXLIB_VERSION}/Src/C_BaseLib"}
export BOXLIB_MD5_CHECKSUM="263214a8b7f6046f99186601afc90144"
export BOXLIB_SHA256_CHECKSUM="2dd2496d27dc84d9171be06b44e3968fa481867d936174e7d49a547da5f6f755"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_cfitsio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ function bv_cfitsio_info
export CFITSIO_VERSION=${CFITSIO_VERSION:-"3006"}
export CFITSIO_COMPATIBILITY_VERSION=${CFITSIO_COMPATIBILITY_VERSION:-"3.0"}
export CFITSIO_BUILD_DIR=${CFITSIO_BUILD_DIR:-"cfitsio"}
export CFITSIO_MD5_CHECKSUM="4aacb54dcf833c8075d1f6515ba069ca"
export CFITSIO_SHA256_CHECKSUM="c156ee0becee8987a14229e705f0f9f39dd2b73bbc9e73bc5d69f43896cb9a63"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_cgns.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ function bv_cgns_info
export CGNS_VERSION=${CGNS_VERSION:-"4.1.0"}
export CGNS_COMPATIBILITY_VERSION=${CGNS_COMPATIBILITY_VERSION:-"4.1"}
export CGNS_BUILD_DIR=${CGNS_BUILD_DIR:-"CGNS-4.1.0/src"}
export CGNS_MD5_CHECKSUM="f90b85ae10693d4db0825c7ce61c6f73"
export CGNS_SHA256_CHECKSUM="b4584e4d0fa52c737a0fb4738157a88581df251c8c5886175ee287e1777e99fd"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ function bv_cmake_info
export CMAKE_VERSION=${CMAKE_VERSION:-"3.24.3"}
export CMAKE_FILE=${CMAKE_FILE:-"cmake-${CMAKE_VERSION}.tar.gz"}
export CMAKE_BUILD_DIR=${CMAKE_BUILD_DIR:-"cmake-${CMAKE_VERSION}"}
export CMAKE_MD5_CHECKSUM="226dd564164372f9f7d1e21e38e6e8c5"
export CMAKE_SHA256_CHECKSUM="b53aa10fa82bff84ccdb59065927b72d3bee49f4d86261249fc0984b3b367291"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_conduit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ function bv_conduit_info
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_BUILD_DIR=${CONDUIT_BUILD_DIR:-"conduit-${CONDUIT_VERSION}"}
export CONDUIT_MD5_CHECKSUM="9a22a25b8d8a58d8c48982675b4ffc3e"
export CONDUIT_SHA256_CHECKSUM="99811e9c464b6f841f52fcd47e982ae47cbb01cba334cff43eabe13eea58c0df"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_damaris.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ function bv_damaris_info
export DAMARIS_COMPATIBILITY_VERSION=${DAMARIS_COMPATIBILITY_VERSION:-"1.0"}
export DAMARIS_URL=${DAMARIS_URL:-"https://gforge.inria.fr/frs/download.php/file/35204"}
export DAMARIS_BUILD_DIR=${DAMARIS_BUILD_DIR:-"damaris-${DAMARIS_VERSION}"}
export DAMARIS_MD5_CHECKSUM=""
export DAMARIS_SHA256_CHECKSUM=""
}

Expand Down
2 changes: 0 additions & 2 deletions src/tools/dev/scripts/bv_support/bv_embree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,12 @@ function bv_embree_info
export EMBREE_INSTALL_DIR_NAME=embree-$EMBREE_VERSION.x86_64.macosx
# these are binary builds, not source tarballs so the mdf5s and shas differ
# between platforms
export EMBREE_MD5_CHECKSUM="8a3874975f1883d8df1714b3ba3eacba"
export EMBREE_SHA256_CHECKSUM="31cbbe96c6f19bb9c5463e181070bd667d3dbb93e702671e8406ce26be259109"
else
export EMBREE_FILE=${EMBREE_FILE:-"embree-${EMBREE_VERSION}.x86_64.linux.tar.gz"}
export EMBREE_INSTALL_DIR_NAME=embree-$EMBREE_VERSION.x86_64.linux
# these are binary builds, not source tarballs so the mdf5s and shas differ
# between platforms
export EMBREE_MD5_CHECKSUM="7a1c3d12e8732cfee7d389f81d008798"
export EMBREE_SHA256_CHECKSUM="7671cc37c4dc4e3da00b2b299b906b35816f058efea92701e7b89574b15e652d"
fi
export EMBREE_COMPATIBILITY_VERSION=${EMBREE_COMPATIBILITY_VERSION:-"${EMBREE_VERSION}"}
Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_fms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ function bv_fms_info
export FMS_FILE=${FMS_FILE:-"FMS-${FMS_VERSION}.tar.gz"}
export FMS_BUILD_DIR=${FMS_BUILD_DIR:-"FMS-${FMS_VERSION}"}
export FMS_URL=${FMS_URL:-"https://github.com/CEED/FMS/archive/refs/tags/v0.2.tar.gz"}
export FMS_MD5_CHECKSUM="5d2f8a154cee67ff1fb61bfebfa9f60c"
export FMS_SHA256_CHECKSUM="872489a1325b247968dbb7265b8736660af94121a86c93f7938441ce7478183e"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_gdal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ function bv_gdal_info
export GDAL_COMPATIBILITY_VERSION=${GDAL_COMPATIBILITY_VERSION:-"2.2"}
export GDAL_URL=${GDAL_URL:-"http://download.osgeo.org/gdal/${GDAL_VERSION}"}
export GDAL_BUILD_DIR=${GDAL_BUILD_DIR:-"gdal-2.2.4"}
export GDAL_MD5_CHECKSUM="798c66cc8df26f204f6248358fe4fceb"
export GDAL_SHA256_CHECKSUM="b9d5a723787f3006a82cb276db171c721187b048b866c0e20e6df464d671a1a4"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_glu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ function bv_glu_info
export GLU_FILE=${GLU_FILE:-"glu-9.0.0.tar.gz"}
export GLU_VERSION=${GLU_VERSION:-"9.0.0"}
export GLU_BUILD_DIR=${GLU_BUILD_DIR:-"glu-9.0.0"}
export GLU_MD5_CHECKSUM="bbc57d4fe3bd3fb095bdbef6fcb977c4"
export GLU_SHA256_CHECKSUM="4387476a1933f36fec1531178ea204057bbeb04cc2d8396c9ea32720a1f7e264"
export GLU_URL=${GLU_URL:-"ftp://ftp.freedesktop.org/pub/mesa/glu"}
}
Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_h5part.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ function bv_h5part_info
export H5PART_COMPATIBILITY_VERSION=${H5PART_COMPATIBILITY_VERSION:-"1.6"}
export H5PART_URL=${H5PART_URL:-"https://codeforge.lbl.gov/frs/download.php/387"}
export H5PART_BUILD_DIR=${H5PART_BUILD_DIR:-"H5Part-${H5PART_VERSION}"}
export H5PART_MD5_CHECKSUM="327c63d198e38a12565b74cffdf1f9d7"
export H5PART_SHA256_CHECKSUM="10347e7535d1afbb08d51be5feb0ae008f73caf889df08e3f7dde717a99c7571"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_hdf5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ function bv_hdf5_info
export HDF5_BUILD_DIR=${HDF5_BUILD_DIR:-"hdf5-${HDF5_VERSION}"}
# Note: Versions of HDF5 1.6.5 and earlier DO NOT have last path component
export HDF5_URL=${HDF5_URL:-"http://www.hdfgroup.org/ftp/HDF5/prev-releases/hdf5-${HDF5_VERSION}/src"}
export HDF5_MD5_CHECKSUM="a482686e733514a51cde12d6fe5c5d95"
export HDF5_SHA256_CHECKSUM="1dbefeeef7f591897c632b2b090db96bb8d35ad035beaa36bc39cb2bc67e0639"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_icet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ function bv_icet_info
export ICET_VERSION=${ICET_VERSION:-"77c708f9090236b576669b74c53e9f105eedbd7e"}
export ICET_COMPATIBILITY_VERSION=${ICET_COMPATIBILITY_VERSION:-"77c708f9090236b576669b74c53e9f105eedbd7e"}
export ICET_BUILD_DIR=${ICET_BUILD_DIR:-"icet-master-77c708f9090236b576669b74c53e9f105eedbd7e"}
export ICET_MD5_CHECKSUM="c2e185e7d624b1f1bf0efd41bc83c83c"
export ICET_SHA256_CHECKSUM="38ed9599b4815b376444223435905b66763912cb66749d90d377ef41d430ba77"
}

Expand Down
2 changes: 0 additions & 2 deletions src/tools/dev/scripts/bv_support/bv_ispc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ function bv_ispc_info
export ISPC_URL=${ISPC_URL:-"http://sdvis.org/ospray/download/dependencies/osx/"}
# these are binary builds, not source tarballs so the mdf5s and shas differ
# between platforms
export ISPC_MD5_CHECKSUM="387cce62a6c63def5e6eb1c0a468a3db"
export ISPC_SHA256_CHECKSUM="aa307b97bea67d71aff046e3f69c0412cc950eda668a225e6b909dba752ef281"
export ISPC_INSTALL_DIR_NAME=ispc-v$ISPC_VERSION-osx
else
export ISPC_FILE=${ISPC_FILE:-"ispc-v${ISPC_VERSION}-linux.tar.gz"}
export ISPC_URL=${ISPC_URL:-"http://sdvis.org/ospray/download/dependencies/linux/"}
# these are binary builds, not source tarballs so the mdf5s and shas differ
# between platforms
export ISPC_MD5_CHECKSUM="0178a33a065ae65d0be00be23871cf9f"
export ISPC_SHA256_CHECKSUM="5513fbf8a2f6e889232ec1e7aa42f6f0b47954dcb9797e1e3d5e8d6f59301e40"
export ISPC_INSTALL_DIR_NAME=ispc-v$ISPC_VERSION-linux
fi
Expand Down
2 changes: 0 additions & 2 deletions src/tools/dev/scripts/bv_support/bv_llvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@ function bv_llvm_info
export BV_LLVM_FILE=${BV_LLVM_FILE:-"llvm-${BV_LLVM_VERSION}.src.tar.xz"}
export BV_LLVM_URL=${BV_LLVM_URL:-"http://releases.llvm.org/${BV_LLVM_VERSION}/"}
export BV_LLVM_BUILD_DIR=${BV_LLVM_BUILD_DIR:-"llvm-${BV_LLVM_VERSION}.src"}
export BV_LLVM_MD5_CHECKSUM="c88c98709300ce2c285391f387fecce0"
export BV_LLVM_SHA256_CHECKSUM="b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2"

export BV_CLANG_URL=${BV_LLVM_URL}
export BV_CLANG_FILE="cfe-${BV_LLVM_VERSION}.src.tar.xz"
export BV_CLANG_BUILD_DIR="cfe-${BV_LLVM_VERSION}.src"
export BV_CLANG_MD5_CHECKSUM="4e419bd4e3b55aa06d872320f754bd85"
export BV_CLANG_SHA256_CHECKSUM="7c243f1485bddfdfedada3cd402ff4792ea82362ff91fbdac2dae67c6026b667"
}

Expand Down
2 changes: 0 additions & 2 deletions src/tools/dev/scripts/bv_support/bv_mdsplus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ function bv_mdsplus_info
export MDSPLUS_FILE=${MDSPLUS_FILE:-"mdsplus-${MDSPLUS_VERSION}.tar.gz"}
export MDSPLUS_COMPATIBILITY_VERSION=${MDSPLUS_COMPATIBILITY_VERSION:-"5.0"}
export MDSPLUS_BUILD_DIR=${MDSPLUS_BUILD_DIR:-"mdsplus-${MDSPLUS_VERSION}"}
#export MDSPLUS_BUILD_DIR=${MDSPLUS_BUILD_DIR:-"mdsplus"}
export MDSPLUS_MD5_CHECKSUM=""
export MDSPLUS_SHA256_CHECKSUM=""
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_mesagl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ function bv_mesagl_info
export MESAGL_FILE=${MESAGL_FILE:-"mesa-$MESAGL_VERSION.tar.xz"}
export MESAGL_URL=${MESAGL_URL:-"https://archive.mesa3d.org/older-versions/17.x/"}
export MESAGL_BUILD_DIR=${MESAGL_BUILD_DIR:-"mesa-$MESAGL_VERSION"}
export MESAGL_MD5_CHECKSUM="b8042f9970ea70a36da1ee1fae27c448"
export MESAGL_SHA256_CHECKSUM="c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_mfem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function bv_mfem_info
export MFEM_FILE=${MFEM_FILE:-"mfem-${MFEM_VERSION}.tgz"}
export MFEM_BUILD_DIR=${MFEM_BUILD_DIR:-"mfem-${MFEM_VERSION}"}
export MFEM_URL=${MFEM_URL:-"https://bit.ly/mfem-4-6"}
export MFEM_MD5_CHECKSUM="467f246903078e10cf52242ecf3ed1e9"
export MFEM_SHA256_CHECKSUM="5fa9465b5bec56bfb777a4d2826fba48d85fbace4aed8b64a2fd4059bf075b15"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_mili.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ function bv_mili_info
export MILI_VERSION=${MILI_VERSION:-"23.02"}
export MILI_COMPATIBILITY_VERSION=${MILI_COMPATIBILITY_VERSION:-"23.02"}
export MILI_BUILD_DIR=${MILI_BUILD_DIR:-"mili-${MILI_VERSION}"}
export MILI_MD5_CHECKSUM="28745dbcfed1daf1d6c920f6ac22de4f"
export MILI_SHA256_CHECKSUM="4973680e377f400a9fac12740b77c2297a4fcbcea7d6a4317d72b08dcffd4def"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_moab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ function bv_moab_info
export MOAB_FILE=${MOAB_FILE:-"moab-${MOAB_VERSION}.tar.gz"}
export MOAB_URL=${MOAB_URL:-"https://web.cels.anl.gov/projects/sigma/downloads/moab"}
export MOAB_BUILD_DIR=${MOAB_BUILD_DIR:-"moab-5.5.0"}
export MOAB_MD5_CHECKSUM="c8043113d6e8ac584fb27fc9bda93dc6"
export MOAB_SHA256_CHECKSUM="58969f8a1b209ec9036c08c53a6b7078b368eb3bf99d0368a4de5a2f2a8db678"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_mpich.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ function bv_mpich_info
export MPICH_COMPATIBILITY_VERSION=${MPICH_COMPATIBILITY_VERSION:-"3.3"}
export MPICH_BUILD_DIR=${MPICH_BUILD_DIR:-"mpich-${MPICH_VERSION}"}
export MPICH_URL=${MPICH_URL:-http://www.mpich.org/static/tarballs/${MPICH_VERSION}}
export MPICH_MD5_CHECKSUM="9ed4cabd3fb86525427454381b25f6af"
export MPICH_SHA256_CHECKSUM="fe551ef29c8eea8978f679484441ed8bb1d943f6ad25b63c235d4b9243d551e5"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_nektarpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ function bv_nektarpp_info
export NEKTAR_PLUS_PLUS_COMPATIBILITY_VERSION=${NEKTAR_PLUS_PLUS_COMPATIBILITY_VERSION:-"5.0"}
export NEKTAR_PLUS_PLUS_URL=${NEKTAR_PLUS_PLUS_URL:-"https://www.nektar.info/wp-content/uploads/2019/12/"}
export NEKTAR_PLUS_PLUS_BUILD_DIR=${NEKTAR_PLUS_PLUS_BUILD_DIR:-"nektar++-${NEKTAR_PLUS_PLUS_VERSION}"}
export NEKTAR_PLUS_PLUS_MD5_CHECKSUM="59d2c84368269016081bb19c640fb98e"
export NEKTAR_PLUS_PLUS_SHA256_CHECKSUM="6e759541ecba1e814856b89ae1e788c2d266f757f5149b13d7dd1d71ed1215b2"
}

Expand Down
1 change: 0 additions & 1 deletion src/tools/dev/scripts/bv_support/bv_netcdf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ function bv_netcdf_info
export NETCDF_FILE=${NETCDF_FILE-"netcdf-${NETCDF_VERSION}.tar.gz"}
export NETCDF_COMPATIBILITY_VERSION=${NETCDF_COMPATIBILITY_VERSION-"4.1"}
export NETCDF_BUILD_DIR=${NETCDF_BUILD_DIR-"netcdf-4.1.1"}
export NETCDF_MD5_CHECKSUM="79c5ff14c80d5e18dd8f1fceeae1c8e1"
export NETCDF_SHA256_CHECKSUM="7933d69d378c57f038375bae4dd78c52442a06e2647fce4b75c13a225e342fb0"
}

Expand Down

0 comments on commit 20b72c0

Please sign in to comment.