Skip to content

Commit 2a3b44e

Browse files
JustinPriviteraJustinPrivitera
authored
3.5.0 Release TPL Builds (#20859)
1 parent a5fa153 commit 2a3b44e

File tree

7 files changed

+239
-225
lines changed

7 files changed

+239
-225
lines changed

‎scripts/run-build-visit‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Valid machine names:
1212
# dane (LC, Linux, x86_64, toss4),
1313
# rzwhippet (LC, Linux, x86_64, toss4),
14+
# magma (LC, Linux, x86_64, toss4),
1415
# rzvernal (LC, Linux, x86_64, toss4-cray),
1516
# crossroads (LANL, x86_64),
1617
# tuolumne (LC, Linux, x86_64, toss4-cray),
@@ -115,6 +116,10 @@
115116
#
116117
# Cyrus Harrison, Mon Dec 1 14:40:14 PST 2025
117118
# Added support for building on dane.
119+
#
120+
# Justin Privitera, Thu Mar 19 13:51:40 PDT 2026
121+
# Re-added magma case (secretly dane case). Combined rzwhippet and
122+
# dane case.
118123
#
119124
#-----------------------------------------------------------------------
120125

@@ -123,7 +128,6 @@
123128
#
124129

125130
dane=false
126-
rzwhippet=false
127131
rzvernal=false
128132
crossroads=false
129133
tuolumne=false
@@ -149,10 +153,15 @@ do
149153
shift
150154
;;
151155
-rzwhippet)
152-
rzwhippet=true
156+
dane=true
153157
machine_name="rzwhippet"
154158
shift
155159
;;
160+
-magma)
161+
dane=true
162+
machine_name="magma"
163+
shift
164+
;;
156165
-rzvernal)
157166
rzvernal=true
158167
machine_name="rzvernal"
@@ -196,13 +205,14 @@ if [ "$build_visit_script" = "undefined" ] || [ "$version" = "undefined" ]
196205
then
197206
echo "Usage: -<machine name> -v <version> -s <build_visit_script>"
198207
echo "Valid machine names:"
199-
echo " dane (LC, Linux, x86_64, toss4),"
200-
echo " rzwhippet (LC, Linux, x86_64, toss4),"
201-
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
208+
echo " dane (LC, Linux, x86_64, toss4),"
209+
echo " rzwhippet (LC, Linux, x86_64, toss4),"
210+
echo " magma (LC, Linux, x86_64, toss4),"
211+
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
212+
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
213+
echo " rzadams (LC, Linux, x86_64, toss4-cray),"
214+
echo " elcap (LC, Linux, x86_64, toss4-cray)"
202215
echo " crossroads (LANL, Linux, x86_64),"
203-
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
204-
echo " rzadams (LC, Linux, x86_64, toss4-cray),"
205-
echo " elcap (LC, Linux, x86_64, toss4-cray)"
206216
exit
207217
fi
208218

@@ -222,7 +232,7 @@ fi
222232
#
223233
# Info and set ran_build_visit
224234
#
225-
if [ "$dane" = true ] || [ "$rzwhippet" = true ] || \
235+
if [ "$dane" = true ] || \
226236
[ "$rzvernal" = true ] || [ "$crossroads" = true ] || \
227237
[ "$tuolumne" = true ]; then
228238
echo "Building on $machine_name"
@@ -235,7 +245,7 @@ fi
235245
#
236246
# Set destination directory
237247
#
238-
if [ "$dane" = true ] || [ "$rzwhippet" = true ]; then
248+
if [ "$dane" = true ]; then
239249
dest_dir=/usr/workspace/visit/visit/thirdparty_shared/$version/toss4
240250
elif [ "$rzvernal" = true ]; then
241251
dest_dir=/usr/workspace/visit/visit/thirdparty_shared/$version/toss4-cray-gfx90a
@@ -251,7 +261,7 @@ fi
251261
#
252262
# Set destination group
253263
#
254-
if [ "$dane" = true ] || [ "$rzwhippet" = true ] || \
264+
if [ "$dane" = true ] || \
255265
[ "$rzvernal" = true ] || [ "$tuolumne" = true ]; then
256266
dest_group=visit
257267
elif [ "$crossroads" = true ]; then
@@ -264,7 +274,7 @@ fi
264274
#
265275
# housekeeping
266276
#
267-
if [ "$dane" = true ] || [ "$rzwhippet" = true ] || \
277+
if [ "$dane" = true ] || \
268278
[ "$rzvernal" = true ] || [ "$crossroads" = true ] || \
269279
[ "$tuolumne" = true ]; then
270280
if [ -f ${build_visit_script}_log.${machine_name} ]; then
@@ -281,7 +291,8 @@ fi
281291
#
282292
# Call build_visit
283293
#
284-
if [ "$dane" = true ] || [ "$rzwhippet" = true ]; then
294+
if [ "$dane" = true ]; then
295+
ml gcc
285296
env PAR_COMPILER=/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1/bin/mpicc \
286297
PAR_COMPILER_CXX=/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1/bin/mpicxx \
287298
PAR_INCLUDE=-I/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1/include \
@@ -305,11 +316,11 @@ elif [ "$crossroads" = true ]; then
305316
--meson --ninja --xcb --xkbcommon --qwt --parallel \
306317
--no-visit --makeflags -j16 --thirdparty-path ${dest_dir}
307318
elif [ "$tuolumne" = true ]; then
308-
export LD_LIBRARY_PATH="/opt/cray/pe/lib64:/opt/cray/lib64:/opt/cray/pe/papi/7.2.0.2/lib64:/opt/cray/libfabric/2.1/lib64:${LD_LIBRARY_PATH}"
309-
env CC=gcc \
310-
CXX=g++ \
311-
PAR_COMPILER=cc \
312-
PAR_COMPILER_CXX=CC \
319+
env CC=/usr/tce/packages/gcc/gcc-10.3.1-magic/bin/gcc \
320+
CXX=/usr/tce/packages/gcc/gcc-10.3.1-magic/bin/g++ \
321+
PAR_COMPILER=/usr/tce/packages/cray-mpich/cray-mpich-9.0.1-gcc-10.3.1-magic/bin/mpicc \
322+
PAR_COMPILER_CXX=/usr/tce/packages/cray-mpich/cray-mpich-9.0.1-gcc-10.3.1-magic/bin/mpic++ \
323+
PKG_CONFIG_PATH=/opt/cray/libfabric/2.1/lib64/pkgconfig:$PKG_CONFIG_PATH \
313324
./$build_visit_script --group ${dest_group} --required --optional --anari --osmesa --parallel \
314325
--qwt --no-uintah --no-visit --makeflags -j24 --thirdparty-path ${dest_dir}
315326
else
@@ -320,7 +331,7 @@ fi
320331
#
321332
# Final housekeeping and permissions
322333
#
323-
if [ "$dane" = true ] || [ "$rzwhippet" = true ] || \
334+
if [ "$dane" = true ] || \
324335
[ "$rzvernal" = true ] || [ "$crossroads" = true ] || \
325336
[ "$tuolumne" = true ]; then
326337
mv ${build_visit_script}_log ${build_visit_script}_log.${machine_name}
@@ -341,12 +352,13 @@ then
341352
echo "Invalid or missing machine name."
342353
echo "Usage: -<machine name> -v <version> -s <build_visit_script>"
343354
echo "Valid machine names:"
344-
echo " dane (LC, Linux, x86_64, toss4),"
345-
echo " rzwhippet (LC, Linux, x86_64, toss4),"
346-
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
355+
echo " dane (LC, Linux, x86_64, toss4),"
356+
echo " rzwhippet (LC, Linux, x86_64, toss4),"
357+
echo " magma (LC, Linux, x86_64, toss4),"
358+
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
359+
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
360+
echo " rzadams (LC, Linux, x86_64, toss4-cray),"
361+
echo " elcap (LC, Linux, x86_64, toss4-cray)"
347362
echo " crossroads (LANL, Linux, x86_64),"
348-
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
349-
echo " rzadams (LC, Linux, x86_64, toss4-cray),"
350-
echo " elcap (LC, Linux, x86_64, toss4-cray)"
351363
exit
352364
fi

‎src/config-site/dane1.cmake‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
#/usr/workspace/visit/visit/thirdparty_shared/3.5.0/toss4/cmake/3.31.8/linux-x86_64_gcc-10.3/bin/cmake
22
##
3-
## ./build_visit3_4_9 generated host.cmake
4-
## created: Fri Sep 5 11:11:56 PDT 2025
5-
## system: Linux poodle17 4.18.0-553.69.1.1toss.t4.x86_64 #1 SMP Mon Aug 11 16:36:31 PDT 2025 x86_64 x86_64 x86_64 GNU/Linux
6-
## by: brugger
3+
## ./build_visit generated host.cmake
4+
## created: Wed Mar 11 17:47:09 PDT 2026
5+
## system: Linux dane5 4.18.0-553.104.1.1toss.t4.x86_64 #1 SMP Thu Feb 12 09:50:47 PST 2026 x86_64 x86_64 x86_64 GNU/Linux
6+
## by: justin
77

88
##
99
## Setup VISITHOME & VISITARCH variables.
1010
##
11-
SET(VISITHOME /usr/WS1/visit/visit/thirdparty_shared/3.5.0-python3.13/toss4)
11+
SET(VISITHOME /usr/workspace/visit/visit/thirdparty_shared/3.5.0/toss4)
1212
SET(VISITARCH linux-x86_64_gcc-10.3)
1313

14-
# Temporary install of these libs...
15-
# qt szip vtk zlib
16-
SET(HDF52O_BUILD_TMP /g/g11/miller86/visit/visit/build-Xdmf/my_install)
17-
1814
### NOTE: Modified from build_visit output
1915
#-------
2016
VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)
@@ -25,7 +21,7 @@ VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)
2521
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
2622
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
2723
VISIT_OPTION_DEFAULT(VISIT_FORTRAN_COMPILER no TYPE FILEPATH)
28-
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
24+
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -I/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1/include -fvisibility=hidden" TYPE STRING)
2925
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
3026

3127
##
@@ -35,11 +31,6 @@ VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
3531
## (configured w/ mpi compiler wrapper)
3632
VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1/bin/mpicc TYPE FILEPATH)
3733

38-
##
39-
## VisIt Thread Option
40-
##
41-
VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
42-
4334
### NOTE: Modified from build_visit output
4435
#-------
4536
##
@@ -48,6 +39,11 @@ VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
4839
VISIT_OPTION_DEFAULT(VISIT_DDT ON TYPE BOOL)
4940
#-------
5041

42+
##
43+
## VisIt Thread Option
44+
##
45+
VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
46+
5147
##############################################################
5248
##
5349
## Database reader plugin support libraries
@@ -65,7 +61,7 @@ VISIT_OPTION_DEFAULT(VISIT_DDT ON TYPE BOOL)
6561
## ZLIB
6662
##
6763
SETUP_APP_VERSION(ZLIB 1.3.1)
68-
VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${HDF52O_BUILD_TMP}/zlib/${ZLIB_VERSION}/${VISITARCH})
64+
VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/${ZLIB_VERSION}/${VISITARCH})
6965

7066
##
7167
## Python
@@ -109,7 +105,7 @@ VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH})
109105
##
110106
## HDF5
111107
##
112-
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${HDF52O_BUILD_TMP}/hdf5/2.0.0/${VISITARCH})
108+
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/2.0.0/${VISITARCH})
113109

114110
##
115111
## ADIOS
@@ -121,13 +117,13 @@ VISIT_OPTION_DEFAULT(VISIT_ADIOS_DIR ${VISITHOME}/adios/${ADIOS_VERSION}/${VISIT
121117
##
122118
## BLOSC2
123119
##
124-
VISIT_OPTION_DEFAULT(VISIT_BLOSC2_DIR ${HDF52O_BUILD_TMP}/blosc2/2.11.3/${VISITARCH})
120+
VISIT_OPTION_DEFAULT(VISIT_BLOSC2_DIR ${VISITHOME}/blosc2/2.11.3/${VISITARCH})
125121

126122
##
127123
## ADIOS2
128124
##
129125
SETUP_APP_VERSION(ADIOS2 2.10.0-rc1)
130-
VISIT_OPTION_DEFAULT(VISIT_ADIOS2_DIR ${HDF52O_BUILD_TMP}/adios2/${ADIOS2_VERSION}/${VISITARCH})
126+
VISIT_OPTION_DEFAULT(VISIT_ADIOS2_DIR ${VISITHOME}/adios2/${ADIOS2_VERSION}/${VISITARCH})
131127

132128
##
133129
## AdvIO
@@ -148,33 +144,33 @@ VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/boxlib/1.3.5/${VISITARCH})
148144
##
149145
## CFITSIO
150146
##
151-
VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio/3006/${VISITARCH})
147+
VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio/4.6.3/${VISITARCH})
152148

153149
##
154150
## CGNS
155151
##
156-
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${HDF52O_BUILD_TMP}/cgns/4.1.0/${VISITARCH})
152+
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/4.1.0/${VISITARCH})
157153
VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIB TYPE STRING)
158154

159155
##
160156
## Silo
161157
##
162-
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${HDF52O_BUILD_TMP}/silo/4.12.0/${VISITARCH})
158+
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.12.0/${VISITARCH})
163159
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIB ZLIB_LIB TYPE STRING)
164160

165-
##
166-
## FMS
167-
##
168-
VISIT_OPTION_DEFAULT(VISIT_FMS_DIR ${HDF52O_BUILD_TMP}/fms/0.2/${VISITARCH})
169-
VISIT_OPTION_DEFAULT(VISIT_FMS_LIBDEP CONDUIT_LIBRARY_DIR conduit CONDUIT_LIBRARY_DIR conduit_blueprint CONDUIT_LIBRARY_DIR conduit_relay ${VISIT_CONDUIT_LIBDEP} TYPE STRING)
170-
171161
##
172162
## Conduit
173163
##
174164
SETUP_APP_VERSION(CONDUIT 0.9.4)
175-
VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${HDF52O_BUILD_TMP}/conduit/v0.9.4/${VISITARCH})
165+
VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.9.4/${VISITARCH})
176166
VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP HDF5_LIB SILO_LIB TYPE STRING)
177167

168+
##
169+
## FMS
170+
##
171+
VISIT_OPTION_DEFAULT(VISIT_FMS_DIR ${VISITHOME}/fms/0.2/${VISITARCH})
172+
VISIT_OPTION_DEFAULT(VISIT_FMS_LIBDEP CONDUIT_LIBRARY_DIR conduit CONDUIT_LIBRARY_DIR conduit_blueprint CONDUIT_LIBRARY_DIR conduit_relay ${VISIT_CONDUIT_LIBDEP} TYPE STRING)
173+
178174
##
179175
## GDAL
180176
##
@@ -184,7 +180,7 @@ VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/2.2.4/${VISITARCH})
184180
## H5Part
185181
##
186182
SETUP_APP_VERSION(H5PART 1.6.6)
187-
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${HDF52O_BUILD_TMP}/h5part/${H5PART_VERSION}/${VISITARCH})
183+
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/${H5PART_VERSION}/${VISITARCH})
188184
VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP HDF5_LIB TYPE STRING)
189185

190186
##
@@ -195,9 +191,9 @@ VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/77c708f9090236b576669b74c5
195191
##
196192
## MFEM
197193
##
198-
VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${HDF52O_BUILD_TMP}/mfem/4.8/${VISITARCH})
194+
VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/4.8/${VISITARCH})
199195
VISIT_OPTION_DEFAULT(VISIT_MFEM_INCDEP CONDUIT_INCLUDE_DIR FMS_INCLUDE_DIR TYPE STRING)
200-
VISIT_OPTION_DEFAULT(VISIT_MFEM_LIBDEP ${VISIT_CONDUIT_LIBDEP} TYPE STRING)
196+
VISIT_OPTION_DEFAULT(VISIT_MFEM_LIBDEP ${VISIT_CONDUIT_LIBDEP} TYPE STRING)
201197

202198
##
203199
## Mili
@@ -207,13 +203,13 @@ VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/23.02/${VISITARCH})
207203
##
208204
## MOAB
209205
##
210-
VISIT_OPTION_DEFAULT(VISIT_MOAB_DIR ${HDF52O_BUILD_TMP}/moab/5.5.0/${VISITARCH})
206+
VISIT_OPTION_DEFAULT(VISIT_MOAB_DIR ${VISITHOME}/moab/5.5.0/${VISITARCH})
211207
VISIT_OPTION_DEFAULT(VISIT_MOAB_LIBDEP HDF5_LIB TYPE STRING)
212208

213209
##
214210
## NetCDF
215211
##
216-
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${HDF52O_BUILD_TMP}/netcdf/4.9.3/${VISITARCH})
212+
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/4.9.3/${VISITARCH})
217213
VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP HDF5_HL_LIB TYPE STRING)
218214

219215
##
@@ -248,6 +244,6 @@ VISIT_OPTION_DEFAULT(VISIT_VTKM_DIR ${VISITHOME}/vtkm/v2.3.0/${VISITARCH})
248244
##
249245
## Xdmf
250246
##
251-
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${HDF52O_BUILD_TMP}/Xdmf/2.1.1/${VISITARCH})
252-
VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP ${VISITHOME}/vtk/9.5.0/linux-x86_64_gcc-10.3/lib64 vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} HDF5_LIB TYPE STRING)
247+
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1/${VISITARCH})
248+
VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP ${VISIT_VTK_DIR}/lib64 vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} HDF5_LIB TYPE STRING)
253249

0 commit comments

Comments
 (0)