visit-build-closed 3.4.1 changes (#19389) (#19431)

visit-dav · Mar 27, 2024 · b7c004a · b7c004a
1 parent 803c72d
commit b7c004a
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 290 deletions.
diff --git a/src/resources/hosts/llnl_closed/host_llnl_closed_sierra.xml b/src/resources/hosts/llnl_closed/host_llnl_closed_sierra.xml
@@ -67,7 +67,7 @@
         <Field name="partitionSet" type="bool">true</Field>
         <Field name="partition" type="string">pdebug</Field>
         <Field name="bankSet" type="bool">true</Field>
-        <Field name="bank" type="string">guests</Field>
+        <Field name="bank" type="string">llnlexec</Field>
         <Field name="timeLimitSet" type="bool">true</Field>
         <Field name="timeLimit" type="string">30</Field>
         <Field name="launchMethodSet" type="bool">true</Field>
@@ -107,7 +107,7 @@
         <Field name="partitionSet" type="bool">true</Field>
         <Field name="partition" type="string">pbatch</Field>
         <Field name="bankSet" type="bool">true</Field>
-        <Field name="bank" type="string">guests</Field>
+        <Field name="bank" type="string">llnlexec</Field>
         <Field name="timeLimitSet" type="bool">true</Field>
         <Field name="timeLimit" type="string">30</Field>
         <Field name="launchMethodSet" type="bool">true</Field>

diff --git a/src/tools/dev/scripts/visit-build-closed b/src/tools/dev/scripts/visit-build-closed
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 #-----------------------------------------------------------------------
 #
 # VISIT-BUILD-CLOSED - Build the visit distributions on the closed
@@ -113,20 +114,24 @@
 #
 #   Eric Brugger, Thu Jul 27 16:51:41 PDT 2023
 #   I added magma.
+# 
+#   Justin Privitera, Thu Mar 14 10:58:55 PDT 2024
+#   Removed jade. Bye bye toss3.
+#   Updated magma and sierra.
+#   Removed trinity.
 #
 #-----------------------------------------------------------------------
 
 test=no
 
 user=`whoami`
+result_dir=/usr/workspace/visit/visit/_release_builds/
 
 #
 # Parse the execute line, providing default values for error checking.
 #
-magma=true
-jade=true
-sierra=true
-trinity=true
+magma="true"
+sierra="true"
 
 dist=undefined
 
@@ -139,42 +144,24 @@ for abc
 do
    case $1 in
       -none)
-         magma=false
-         jade=false
-         sierra=false
-         trinity=false
+         magma="false"
+         sierra="false"
          shift
          ;;
       -magma)
-         magma=false
+         magma="false"
          shift
          ;;
       +magma)
-         magma=true
-         shift
-         ;;
-      -jade)
-         jade=false
-         shift
-         ;;
-      +jade)
-         jade=true
+         magma="true"
          shift
          ;;
       -sierra)
-         sierra=false
+         sierra="false"
          shift
          ;;
       +sierra)
-         sierra=true
-         shift
-         ;;
-      -trinity)
-         trinity=false
-         shift
-         ;;
-      +trinity)
-         trinity=true
+         sierra="true"
          shift
          ;;
       -d)
@@ -187,14 +174,12 @@ done
 #
 # Check that the distribution name was provided.
 #
-if [ $dist = undefined ]
+if [ "$dist" = "undefined" ]
 then
    echo "Usage: [-none] [-<machine name>] -d <distribution>"
    echo "Valid machine names:"
    echo "    magma (LC, x86_64)"
-   echo "    jade (LC, x86_64)"
    echo "    sierra (LC, ppc)"
-   echo "    trinity (LANL, x86_64)"
    exit
 fi
 
@@ -208,108 +193,65 @@ then
    exit
 fi
 
+#
+# make sure landing place for results exist
+#
+if test ! -d $result_dir ; then
+   mkdir -p $result_dir
+fi
+
 #
 # Build on magma
 #
 rm -f magma
 cat <<EOF > magma
 #!/bin/sh
+set -e
 XLOCALEDIR=/usr/lib/X11/locale
 PATH=/usr/bin/X11:\$PATH
-if test ! -d /usr/tmp/$user ; then
-   mkdir /usr/tmp/$user
-fi
+export PATH=/usr/workspace/visit/visit/thirdparty_shared/3.4.1/toss4/cmake/3.24.3/linux-x86_64_gcc-10.3/bin/:\$PATH
 if test ! -d /usr/tmp/$user/magma ; then
-   mkdir /usr/tmp/$user/magma
+   mkdir -p /usr/tmp/$user/magma
 fi
 rm -rf /usr/tmp/$user/magma/visitbuild
 mkdir /usr/tmp/$user/magma/visitbuild
-mv magma_$dist.tar.gz /usr/tmp/$user/magma/visitbuild/$dist.tar.gz
+cp magma_$dist.tar.gz /usr/tmp/$user/magma/visitbuild/$dist.tar.gz
 cd /usr/tmp/$user/magma/visitbuild
-gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
-cd $dist/src
-ver=\`cat VERSION\`
+tar -xzvf $dist.tar.gz > buildlog 2>&1
+ver=\`cat $dist/src/VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
-/usr/workspace/visit/visit/thirdparty_shared/3.3.0/toss4/cmake/3.18.2/linux-x86_64_gcc-10.3/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
-make manuals >> ../../buildlog 2>&1
-make -j 24 package >> ../../buildlog 2>&1
-mv visit\$ver2.linux-x86_64.tar.gz ../..
-cd ../..
+echo "Version: \$ver"
+export CONFIG_SITE=\`readlink -f $dist/src/config-site/magma190.cmake\`
+echo "CONFIG_SITE=\${CONFIG_SITE}"
+cmake -S $dist/src -B build -DVISIT_CONFIG_SITE=\$CONFIG_SITE -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> buildlog 2>&1
+cmake --build build --target manuals >> buildlog 2>&1
+cmake --build build --target package -j 24 >> buildlog 2>&1
+cp buildlog $result_dir/buildlog.magma
+cp build/visit\$ver2.linux-x86_64.tar.gz $result_dir/visit\$ver2.linux-x86_64-magma.tar.gz
 rm -f resultlog
 echo "        build of visit on magma"        > resultlog 2>&1
 echo "       -------------------------"       >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 ls -l                                         >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
-echo "number of database plugins = "\`ls $dist/src/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
-echo "number of operator plugins = "\`ls $dist/src/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
-echo "number of plot plugins = "\`ls $dist/src/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
+echo "number of database plugins = "\`ls build/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
+echo "number of operator plugins = "\`ls build/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
+echo "number of plot plugins = "\`ls build/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 echo "The database plugins:"                  >> resultlog 2>&1
-ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+ls build/plugins/databases/libI* | sed "s/build\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+cp resultlog $result_dir/resultlog.magma
 EOF
 
-if [ $magma = true ]
+if [ "$magma" = "true" ]
 then
-   if [ $test = no ]
+   if [ "$test" = "no" ]
    then
       echo "Building on magma"
-      scp magma magma:magma_buildit
-      scp $dist.tar.gz magma:magma_$dist.tar.gz
-      ssh magma190 "chmod 750 magma_buildit;./magma_buildit" &
-   fi
-fi
-
-
-#
-# Build on jade.
-#
-rm -f jade
-cat <<EOF > jade
-#!/bin/sh
-XLOCALEDIR=/usr/lib/X11/locale
-PATH=/usr/bin/X11:\$PATH
-if test ! -d /usr/tmp/$user ; then
-   mkdir /usr/tmp/$user
-fi
-if test ! -d /usr/tmp/$user/jade ; then
-   mkdir /usr/tmp/$user/jade
-fi
-rm -rf /usr/tmp/$user/jade/visitbuild
-mkdir /usr/tmp/$user/jade/visitbuild
-mv jade_$dist.tar.gz /usr/tmp/$user/jade/visitbuild/$dist.tar.gz
-cd /usr/tmp/$user/jade/visitbuild
-gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
-cd $dist/src
-ver=\`cat VERSION\`
-ver2=\`echo \$ver | tr "." "_"\`
-/usr/workspace/visit/visit/thirdparty_shared/3.3.0/toss3/cmake/3.18.2/linux-x86_64_gcc-7.3/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
-make manuals >> ../../buildlog 2>&1
-make -j 8 package >> ../../buildlog 2>&1
-mv visit\$ver2.linux-x86_64.tar.gz ../..
-cd ../..
-rm -f resultlog
-echo "        build of visit on jade"         > resultlog 2>&1
-echo "       ------------------------"        >> resultlog 2>&1
-echo ""                                       >> resultlog 2>&1
-ls -l                                         >> resultlog 2>&1
-echo ""                                       >> resultlog 2>&1
-echo "number of database plugins = "\`ls $dist/src/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
-echo "number of operator plugins = "\`ls $dist/src/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
-echo "number of plot plugins = "\`ls $dist/src/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
-echo ""                                       >> resultlog 2>&1
-echo "The database plugins:"                  >> resultlog 2>&1
-ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
-EOF
-
-if [ $jade = true ]
-then
-   if [ $test = no ]
-   then
-      echo "Building on jade"
-      scp jade jade962:jade_buildit
-      scp $dist.tar.gz jade962:jade_$dist.tar.gz
-      ssh jade962 "chmod 750 jade_buildit;./jade_buildit" &
+      cp magma magma_buildit
+      cp $dist.tar.gz magma_$dist.tar.gz
+      chmod 750 magma_buildit
+      ./magma_buildit
    fi
 fi
 
@@ -319,104 +261,58 @@ fi
 rm -f sierra
 cat <<EOF > sierra
 #!/bin/sh
-if test ! -d /usr/tmp/$user ; then
-   mkdir /usr/tmp/$user
-fi
+set -e
+export PATH=/usr/workspace/visit/visit/thirdparty_shared/3.4.1/blueos/cmake/3.24.3/linux-ppc64le_gcc-8.3/bin/:\$PATH
 if test ! -d /usr/tmp/$user/sierra ; then
-   mkdir /usr/tmp/$user/sierra
+   mkdir -p /usr/tmp/$user/sierra
 fi
 rm -rf /usr/tmp/$user/sierra/visitbuild
 mkdir /usr/tmp/$user/sierra/visitbuild
-mv sierra_$dist.tar.gz /usr/tmp/$user/sierra/visitbuild/$dist.tar.gz
+cp sierra_$dist.tar.gz /usr/tmp/$user/sierra/visitbuild/$dist.tar.gz
 cd /usr/tmp/$user/sierra/visitbuild
-gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
-cd $dist/src
-ver=\`cat VERSION\`
+tar -xzvf $dist.tar.gz > buildlog 2>&1
+ver=\`cat $dist/src/VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
-/usr/workspace/visit/visit/thirdparty_shared/3.3.0/blueos/cmake/3.18.2/linux-ppc64le_gcc-7.3/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1
-make manuals >> ../../buildlog 2>&1
-make -j 12 package >> ../../buildlog 2>&1
-mv visit\$ver2.linux-intel.tar.gz ../..
-cd ../..
+echo "Version: \$ver"
+export CONFIG_SITE=\`readlink -f $dist/src/config-site/sierra4358.cmake\`
+echo "CONFIG_SITE=\${CONFIG_SITE}"
+# skip manuals, old openssl on lassen undermines us
+cmake -S $dist/src -B build -DVISIT_CONFIG_SITE=\$CONFIG_SITE -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_ENABLE_MANUALS=OFF -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> buildlog 2>&1
+# cmake --build build --target manuals >> buildlog 2>&1
+cmake --build build --target package -j 24 >> buildlog 2>&1
+cp buildlog $result_dir/buildlog.sierra
+cp build/visit\$ver2.linux-intel.tar.gz $result_dir/visit\$ver2.linux-intel-sierra.tar.gz
 rm -f resultlog
 echo "        build of visit on sierra"       > resultlog 2>&1
 echo "       --------------------------"      >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 ls -l                                         >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
-echo "number of database plugins = "\`ls $dist/src/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
-echo "number of operator plugins = "\`ls $dist/src/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
-echo "number of plot plugins = "\`ls $dist/src/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
+echo "number of database plugins = "\`ls build/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
+echo "number of operator plugins = "\`ls build/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
+echo "number of plot plugins = "\`ls build/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 echo "The database plugins:"                  >> resultlog 2>&1
-ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+ls build/plugins/databases/libI* | sed "s/build\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+cp resultlog $result_dir/resultlog.sierra
 EOF
 
-if [ $sierra = true ]
+if [ "$sierra" = "true" ]
 then
-   if [ $test = no ]
+   if [ "$test" = "no" ]
    then
       echo "Building on sierra"
-      scp sierra sierra4358:sierra_buildit
-      scp $dist.tar.gz sierra4358:sierra_$dist.tar.gz
-      ssh sierra4358 "chmod 750 sierra_buildit;./sierra_buildit" &
-   fi
-fi
-
-#
-# Build on trinity.
-#
-rm -f trinity
-cat <<EOF > trinity
-#!/bin/sh
-if test ! -d /tmp/$user ; then
-   mkdir /tmp/$user
-fi
-if test ! -d /tmp/$user/trinity ; then
-   mkdir /tmp/$user/trinity
-fi
-rm -rf /tmp/$user/trinity/visitbuild
-mkdir /tmp/$user/trinity/visitbuild
-mv trinity_$dist.tar.gz /tmp/$user/trinity/visitbuild/$dist.tar.gz
-cd /tmp/$user/trinity/visitbuild
-gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
-cd $dist/src
-ver=\`cat VERSION\`
-ver2=\`echo \$ver | tr "." "_"\`
-/usr/projects/views/visit/thirdparty_shared/3.3.1/cmake/3.18.2/linux-x86_64_cc/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1
-make manuals >> ../../buildlog 2>&1
-make -j 6 package >> ../../buildlog 2>&1
-mv visit\$ver2.linux-x86_64.tar.gz ../..
-cd ../..
-rm -f resultlog
-echo "        build of visit on trinity"      > resultlog 2>&1
-echo "       ---------------------------"     >> resultlog 2>&1
-echo ""                                       >> resultlog 2>&1
-ls -l                                         >> resultlog 2>&1
-echo ""                                       >> resultlog 2>&1
-echo "number of database plugins = "\`ls $dist/src/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
-echo "number of operator plugins = "\`ls $dist/src/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
-echo "number of plot plugins = "\`ls $dist/src/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
-echo ""                                       >> resultlog 2>&1
-echo "The database plugins:"                  >> resultlog 2>&1
-ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
-EOF
-
-if [ $trinity = true ]
-then
-   if [ $test = no ]
-   then
-      echo "Building on trinity"
-      cp trinity trinity_buildit
-      cp $dist.tar.gz trinity_$dist.tar.gz
-      chmod 750 trinity_buildit;./trinity_buildit &
+      cp sierra sierra_buildit
+      cp $dist.tar.gz sierra_$dist.tar.gz
+      chmod 750 sierra_buildit
+      ./sierra_buildit
    fi
 fi
 
 #
 # Clean up.
 #
-if [ $test = no ]
+if [ "$test" = "no" ]
 then
-   rm -f magma jade sierra trinity
+   rm -f magma sierra
 fi