Update visit-install-closed to match visit-install-open. (#19107) (#1…

…9108) Co-authored-by: Cyrus Harrison <cyrush@llnl.gov>
visit-dav · Jan 17, 2024 · ccc57a7 · ccc57a7
1 parent 6d12671
commit ccc57a7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 114 deletions.
diff --git a/src/config-site/kickit.mesagl.cmake b/src/config-site/kickit.mesagl.cmake
@@ -1,14 +1,14 @@
-#/usr/gapps/visit/thirdparty_shared/3.3.0/mesagl/cmake/3.18.2/linux-x86_64_gcc-9.1/bin/cmake
+#/usr/gapps/visit/thirdparty_shared/3.4.0/mesagl/cmake/3.24.3/linux-x86_64_gcc-9.1/bin/cmake
 ##
-## ./build_visit3_3_3 generated host.cmake
-## created: Wed Mar 29 11:29:47 PDT 2023
-## system: Linux kickit.llnl.gov 3.10.0-1160.88.1.el7.x86_64 #1 SMP Sat Feb 18 13:27:00 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
+## ./build_visit3_4_0 generated host.cmake
+## created: Wed Nov 29 13:31:28 PST 2023
+## system: Linux kickit.llnl.gov 3.10.0-1160.102.1.el7.x86_64 #1 SMP Mon Sep 25 05:00:52 EDT 2023 x86_64 x86_64 x86_64 GNU/Linux
 ## by: brugger1
 
 ##
 ## Setup VISITHOME & VISITARCH variables.
 ##
-SET(VISITHOME /usr/gapps/visit/thirdparty_shared/3.3.0/mesagl)
+SET(VISITHOME /usr/gapps/visit/thirdparty_shared/3.4.0/mesagl)
 SET(VISITARCH linux-x86_64_gcc-9.1)
 VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)
 
@@ -26,7 +26,7 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRI
 ##
 VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
 ## (configured w/ mpi compiler wrapper)
-VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /usr/gapps/visit/thirdparty_shared/3.3.0/mesagl/mpich/3.3.1/linux-x86_64_gcc-9.1/bin/mpicc TYPE FILEPATH)
+VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /usr/gapps/visit/thirdparty_shared/3.4.0/mesagl/mpich/3.3.1/linux-x86_64_gcc-9.1/bin/mpicc TYPE FILEPATH)
 
 ##
 ## VisIt Thread Option
@@ -79,35 +79,16 @@ VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/qt/${QT_VERSION}/${VISITARCH})
 SETUP_APP_VERSION(QWT 6.1.2)
 VISIT_OPTION_DEFAULT(VISIT_QWT_DIR ${VISITHOME}/qwt/${QWT_VERSION}/${VISITARCH})
 
-##
-## ISPC
-##
-SETUP_APP_VERSION(ISPC 1.9.2)
-VISIT_OPTION_DEFAULT(VISIT_ISPC_DIR ${VISITHOME}/ispc/${ISPC_VERSION}/${VISITARCH})
-
-##
-## TBB
-##
-VISIT_OPTION_DEFAULT(TBB_ROOT ${VISITHOME}/tbb/tbb2018_20171205oss/${VISITARCH})
-VISIT_OPTION_DEFAULT(VISIT_TBB_DIR ${VISITHOME}/tbb/tbb2018_20171205oss/${VISITARCH})
-
-##
-## EMBREE
-##
-SETUP_APP_VERSION(EMBREE 3.2.0)
-VISIT_OPTION_DEFAULT(VISIT_EMBREE_DIR ${VISITHOME}/embree/${EMBREE_VERSION}/${VISITARCH})
-
 ##
 ## OSPRay
 ##
-VISIT_OPTION_DEFAULT(VISIT_OSPRAY ON TYPE BOOL)
-SETUP_APP_VERSION(OSPRAY 1.6.1)
-VISIT_OPTION_DEFAULT(VISIT_OSPRAY_DIR ${VISITHOME}/ospray/${OSPRAY_VERSION}/${VISITARCH})
+SETUP_APP_VERSION(OSPRAY 3.0.0)
+VISIT_OPTION_DEFAULT(VISIT_OSPRAY_DIR ${VISITHOME}/ospray/${OSPRAY_VERSION}/${VISITARCH}/ospray)
 
 ##
 ## VTK
 ##
-SETUP_APP_VERSION(VTK 8.1.0)
+SETUP_APP_VERSION(VTK 9.2.6)
 VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH})
 VISIT_OPTION_DEFAULT(VISIT_VTK_INCDEP ZLIB_INCLUDE_DIR)
 VISIT_OPTION_DEFAULT(VISIT_VTK_LIBDEP ZLIB_LIBRARY)
@@ -132,9 +113,7 @@ VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
 ## HDF5
 ##
 VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.14/${VISITARCH})
-VISIT_OPTION_DEFAULT(VISIT_HDF5_MPI_DIR ${VISITHOME}/hdf5_mpi/1.8.14/${VISITARCH})
 VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/zlib/${ZLIB_VERSION}/${VISITARCH}/lib z TYPE STRING)
-VISIT_OPTION_DEFAULT(VISIT_HDF5_MPI_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/zlib/${ZLIB_VERSION}/${VISITARCH}/lib z TYPE STRING)
 
 ##
 ## BLOSC
@@ -215,15 +194,7 @@ VISIT_OPTION_DEFAULT(VISIT_MFEM_LIBDEP ${VISIT_CONDUIT_LIBDEP} ${VISITHOME}/zlib
 ##
 ## Mili
 ##
-VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/22.1/${VISITARCH})
-
-##
-## MOAB 
-##
-VISIT_OPTION_DEFAULT(VISIT_MOAB_DIR ${VISITHOME}/moab/4.9.2-RC0/${VISITARCH})
-VISIT_OPTION_DEFAULT(VISIT_MOAB_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
-VISIT_OPTION_DEFAULT(VISIT_MOAB_MPI_DIR ${VISITHOME}/moab_mpi/4.9.2-RC0/${VISITARCH})
-VISIT_OPTION_DEFAULT(VISIT_MOAB_MPI_LIBDEP HDF5_MPI_LIBRARY_DIR hdf5_mpi ${VISIT_HDF5_MPI_LIBDEP} TYPE STRING)
+VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/23.02/${VISITARCH})
 
 ##
 ## NetCDF
@@ -258,7 +229,7 @@ VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP
 ##
 ## Uintah
 ##
-SETUP_APP_VERSION(UINTAH 2.6.1)
+SETUP_APP_VERSION(UINTAH 2.6.2)
 VISIT_OPTION_DEFAULT(VISIT_UINTAH_DIR ${VISITHOME}/uintah/${UINTAH_VERSION}/${VISITARCH})
 
 ##
@@ -270,5 +241,5 @@ VISIT_OPTION_DEFAULT(VISIT_VTKM_DIR ${VISITHOME}/vtkm/v1.9.0/${VISITARCH})
 ## Xdmf
 ##
 VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1/${VISITARCH})
-VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP HDF5_LIBRARY_DIR hdf5  VTK_LIBRARY_DIRS vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}  TYPE STRING)
+VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP HDF5_LIBRARY_DIR hdf5  ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH}/lib64 vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} TYPE STRING)
 
diff --git a/src/resources/help/en_US/relnotes3.4.0.html b/src/resources/help/en_US/relnotes3.4.0.html
@@ -10,7 +10,7 @@
 <body>
 
 <center><b><font size="6">VisIt 3.4 Release Notes</font></b></center>
-<center><b><font size="4">Month, Year</font></b></center>
+<center><b><font size="4">November, 2023</font></b></center>
 
 <p>Welcome to VisIt's release notes page. This page describes the important
 enhancements and bug-fixes that were added to this release.</p>

diff --git a/src/tools/dev/scripts/run-build-visit b/src/tools/dev/scripts/run-build-visit
@@ -156,7 +156,7 @@ then
    export LD_LIBRARY_PATH=/usr/gapps/gcc/gcc-9.1/lib64:/usr/gapps/gcc/gcc-9.1/lib
    export PATH=/usr/gapps/gcc/gcc-9.1/bin:$PATH
    env CC=/usr/gapps/gcc/gcc-9.1/bin/gcc CXX=/usr/gapps/gcc/gcc-9.1/bin/g++ \
-   ./$build_visit_script --required --optional --parallel --mpich --mesagl --uintah --no-adios2 --no-visit --thirdparty-path /usr/gapps/visit/thirdparty_shared/$version/mesagl --makeflags -j4
+   ./$build_visit_script --required --optional --parallel --mpich --mesagl --uintah --vtk9 --no-adios2 --no-moab --no-visit --thirdparty-path /usr/gapps/visit/thirdparty_shared/$version/mesagl --makeflags -j4
    mv ${build_visit_script}_log ${build_visit_script}_log.mesagl
 fi
 
@@ -184,7 +184,7 @@ then
    export LD_LIBRARY_PATH=/usr/gapps/gcc/gcc-9.1/lib64:/usr/gapps/gcc/gcc-9.1/lib
    export PATH=/usr/gapps/gcc/gcc-9.1/bin:$PATH
    env CC=/usr/gapps/gcc/gcc-9.1/bin/gcc CXX=/usr/gapps/gcc/gcc-9.1/bin/g++ \
-   ./$build_visit_script --skip-opengl-context-check --required --optional --parallel --mpich --osmesa --uintah --no-adios2 --no-visit --thirdparty-path /usr/gapps/visit/thirdparty_shared/$version/opengl --makeflags -j4
+   ./$build_visit_script --skip-opengl-context-check --required --optional --parallel --mpich --osmesa --uintah --vtk9 --no-adios2 --no-moab --no-visit --thirdparty-path /usr/gapps/visit/thirdparty_shared/$version/opengl --makeflags -j4
    mv ${build_visit_script}_log ${build_visit_script}_log.opengl
 fi
 

diff --git a/src/tools/dev/scripts/visit-install-closed b/src/tools/dev/scripts/visit-install-closed
@@ -82,6 +82,11 @@
 #   I removed the logic on the jade install that copies the libraries
 #   needed by Qt, since those now get included by default.
 #
+#   Eric Brugger, Wed Nov 29 11:16:25 PST 2023
+#   I removed the "-none" option since all the machines are now off by
+#   default. Turning on a machine is now done with -<machine_name>
+#   instead of +<machine_name>.
+#
 #-----------------------------------------------------------------------
 
 test=no
@@ -91,10 +96,10 @@ user=`whoami`
 #
 # Parse the execute line, providing default values for error checking.
 #
-winnipeg=true
-jade=true
-sierra=true
-trinity=true
+winnipeg=false
+jade=false
+sierra=false
+trinity=false
 
 ver=undefined
 
@@ -106,42 +111,19 @@ ver=undefined
 for abc
 do
    case $1 in
-      -none)
-         winnipeg=false
-         jade=false
-         sierra=false
-         trinity=false
-         shift
-         ;;
       -winnipeg)
-         winnipeg=false
-         shift
-         ;;
-      +winnipeg)
          winnipeg=true
          shift
          ;;
       -jade)
-         jade=false
-         shift
-         ;;
-      +jade)
          jade=true
          shift
          ;;
       -sierra)
-         sierra=false
-         shift
-         ;;
-      +sierra)
          sierra=true
          shift
          ;;
       -trinity)
-         trinity=false
-         shift
-         ;;
-      +trinity)
          trinity=true
          shift
          ;;
@@ -157,7 +139,7 @@ done
 #
 if [ $ver = undefined ]
 then
-   echo "Usage: [-none] [-<machine name>] -v <version>"
+   echo "Usage: [-<machine name>] -v <version>"
    exit
 fi
 
@@ -176,10 +158,10 @@ ver=`echo $ver2 | tr "_" "."`
 #
 # Install on winnipeg.
 #
-rm -f winnipeg
-cat <<EOF > winnipeg
+rm -f winnipeg_install
+cat <<EOF > winnipeg_install
 #!/bin/sh
-./visit-install -private -c llnl_closed -g visit -b wbronze -gw -l $ver linux-x86_64-winnipeg /misc/gapps/visit > installlog 2>&1
+./visit-install -private -c llnl_closed -g visit -b wbronze -gw -l $ver linux-x86_64-kickit_opengl /misc/gapps/visit > installlog 2>&1
 rm -f resultlog
 echo ""                                          > resultlog 2>&1
 echo "        install of visit on winnipeg"      >> resultlog 2>&1
@@ -195,74 +177,60 @@ echo "number of plot plugins = "\`ls /misc/gapps/visit/$ver+/linux-x86_64/plugin
 echo ""                                          >> resultlog 2>&1
 echo "The database plugins:"                     >> resultlog 2>&1
 ls /misc/gapps/visit/$ver+/linux-x86_64/plugins/databases/libI* | sed "s/\/misc\/gapps\/visit\/$ver+\/linux-x86_64\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+rm -f resultlog.winnipeg
 mv resultlog resultlog.winnipeg
 EOF
 
 if [ $winnipeg = true ]
 then
    if [ $test = no ]
    then
-      scp -P 22 winnipeg:winnipeg/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-winnipeg.tar.gz
-      scp -P 22 visit$ver2.linux-x86_64-winnipeg.tar.gz winnipeg:
-      scp -P 22 visit-install winnipeg:
-      scp -P 22 winnipeg winnipeg:winnipeg_install
-      ssh -p 22 winnipeg "chmod 750 winnipeg_install;./winnipeg_install"
+      chmod 750 winnipeg_install;./winnipeg_install
    fi
 fi
 
 #
 # Install on jade.
 #
-rm -f jade
-cat <<EOF > jade
+rm -f jade_install
+cat <<EOF > jade_install
 #!/bin/sh
-./visit-install -private -c llnl_closed -g visit -b wbronze -gw -l $ver linux-x86_64-jade /usr/gapps/visit > installlog 2>&1
-# Copy libraries needed for fortran for toss4 systems.
-cd /usr/tce/packages/gcc/gcc-7.1.0/lib64
-cp libgfortran.so.4.0.0 /usr/gapps/visit/$ver+/linux-x86_64/lib
-cd /usr/gapps/visit/$ver+/linux-x86_64/lib
-chgrp visit libgfortran.so.4.0.0
-chmod g+rwX,o+rX libgfortran.so.4.0.0
-ln -s libgfortran.so.4.0.0 libgfortran.so
-ln -s libgfortran.so.4.0.0 libgfortran.so.4
-cd
+./visit-install -private -c llnl_closed -g visit -b wbronze -gw -l $ver linux-x86_64-poodle /usr/gapps/visit > installlog 2>&1
+mv /usr/gapps/visit/$ver+/linux-x86_64 /usr/gapps/visit/$ver+/linux-x86_64-toss4
 rm -f resultlog
 echo ""                                              > resultlog 2>&1
 echo "        install of visit on jade"              >> resultlog 2>&1
 echo "       --------------------------"             >> resultlog 2>&1
 echo ""                                              >> resultlog 2>&1
 df -k /usr/gapps/visit                               >> resultlog 2>&1
 echo ""                                              >> resultlog 2>&1
-ls -l /usr/gapps/visit/$ver+/linux-x86_64/bin        >> resultlog 2>&1
+ls -l /usr/gapps/visit/$ver+/linux-x86_64-toss4/bin  >> resultlog 2>&1
 echo ""                                              >> resultlog 2>&1
-echo "number of database plugins = "\`ls /usr/gapps/visit/$ver+/linux-x86_64/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
-echo "number of operator plugins = "\`ls /usr/gapps/visit/$ver+/linux-x86_64/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
-echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver+/linux-x86_64/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
+echo "number of database plugins = "\`ls /usr/gapps/visit/$ver+/linux-x86_64-toss4/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
+echo "number of operator plugins = "\`ls /usr/gapps/visit/$ver+/linux-x86_64-toss4/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
+echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver+/linux-x86_64-toss4/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
 echo ""                                              >> resultlog 2>&1
 echo "The database plugins:"                         >> resultlog 2>&1
-ls /usr/gapps/visit/$ver+/linux-x86_64/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver+\/linux-x86_64\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+ls /usr/gapps/visit/$ver+/linux-x86_64-toss4/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver+\/linux-x86_64-toss4\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+rm -f resultlog.jade
 mv resultlog resultlog.jade
 EOF
 
 if [ $jade = true ]
 then
    if [ $test = no ]
    then
-      scp jade962:/usr/tmp/$user/jade/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-jade.tar.gz
-      scp visit$ver2.linux-x86_64-jade.tar.gz jade:
-      scp visit-install jade:
-      scp jade jade:jade_install
-      ssh jade "chmod 750 jade_install;./jade_install"
+      chmod 750 jade_install;./jade_install
    fi
 fi
 
 #
 # Install on sierra
 #
-rm -f sierra
-cat <<EOF > sierra
+rm -f sierra_install
+cat <<EOF > sierra_install
 #!/bin/sh
-./visit-install -private -c llnl_closed -g visit -b wbronze -gw -l $ver linux-intel-sierra /usr/gapps/visit > installlog 2>&1
+./visit-install -private -c llnl_closed -g visit -b wbronze -gw -l $ver linux-intel-lassen /usr/gapps/visit > installlog 2>&1
 rm -f resultlog
 echo ""                                              > resultlog 2>&1
 echo "        install of visit on sierra"            >> resultlog 2>&1
@@ -278,26 +246,23 @@ echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver+/linux-intel/plugins/
 echo ""                                              >> resultlog 2>&1
 echo "The database plugins:"                         >> resultlog 2>&1
 ls /usr/gapps/visit/$ver+/linux-intel/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver+\/linux-intel\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+rm -f resultlog.sierra
 mv resultlog resultlog.sierra
 EOF
 
 if [ $sierra = true ]
 then
    if [ $test = no ]
    then
-      scp sierra4358:/usr/tmp/$user/sierra/visitbuild/visit$ver2.linux-intel.tar.gz visit$ver2.linux-intel-sierra.tar.gz
-      scp visit$ver2.linux-intel-sierra.tar.gz sierra:
-      scp visit-install sierra:
-      scp sierra sierra:sierra_install
-      ssh sierra "chmod 750 sierra_install;./sierra_install"
+      chmod 750 sierra_install;./sierra_install
    fi
 fi
 
 #
 # Install on trinity.
 #
-rm -f trinity
-cat <<EOF > trinity
+rm -f trinity_install
+cat <<EOF > trinity_install
 #!/bin/sh
 ./visit-install -private -c llnl_closed -l $ver linux-x86_64-trinity /usr/projects/views/visit > installlog 2>&1
 rm -f resultlog
@@ -315,6 +280,7 @@ echo "number of plot plugins = "\`ls /usr/projects/views/visit/$ver+/linux-x86_6
 echo ""                                                >> resultlog 2>&1
 echo "The database plugins:"                           >> resultlog 2>&1
 ls /usr/projects/views/visit/$ver+/linux-x86_64/plugins/databases/libI* | sed "s/\/usr\/projects\/views\/visit\/$ver+\/linux-x86_64\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+rm -f resultlog.trinity
 mv resultlog resultlog.trinity
 EOF
 
@@ -323,7 +289,6 @@ then
    if [ $test = no ]
    then
       cp /tmp/$user/trinity/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-trinity.tar.gz
-      cp trinity trinity_install
       chmod 750 trinity_install;./trinity_install
    fi
 fi
@@ -333,5 +298,5 @@ fi
 #
 if [ $test = no ]
 then
-   rm -f winnipeg jade sierra trinity
+   rm -f winnipeg_install jade_install sierra_install trinity_install
 fi