Merge branch 'develop' into task-mcm86-19nov24-expand-azure-tests

visit-dav · Nov 21, 2024 · 337f833 · 337f833
2 parents 23255fe + 8e403eb
commit 337f833
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 1 deletion.
diff --git a/src/resources/help/en_US/relnotes3.4.2.html b/src/resources/help/en_US/relnotes3.4.2.html
@@ -83,6 +83,7 @@
   <li>Added support for MFEM Wedge (aka Prism) Meshes.</li>
   <li>Added new global mesh expressions: global_avg(), global_max(), global_min(), global_rms(), global_std_dev(), global_sum(), and global_variance(). These are expressions that calculate statistics across the mesh and the result is a constant variable that contains the result. So, global_max(d) produces a new variable that is the maximum of d at every zone or node across the mesh.</li>
   <li>The maximum image size that can be saved has been increased to a maximum of 32,768 for either the width or height with a total pixel count not to exceed 536,756,224 pixels. For a square image that corresponds to an image size of 23,170 by 23,168 or less. For a rectangular image that corresponds to an image size of 32,768 by 16,380 or less.</li>
+  <li>Added host profiles for Crossroads.</li>
 </ul>
 
 <a name="Dev_changes"></a>
@@ -100,6 +101,7 @@
   <li>Added support for GPU architectures in <code>CMake</code> and the <code>internallauncher</code>. When a <code>make package</code> comnand is executed, the GPU architecture will be added to the operating system and CPU identifier in the tar file name. For example, on a Linux system with an x86_64 CPU and an AMD MI250X GPU the tar file name will be <code>visit3_4_2.linux-x86_64-gfx90a.tar.gz</code>. Likewise, the operating system and CPU identiefier identifier in a VisIt installation will include the GPU architecture in the same manner. As part of this change, the CPU identifier for a 64 bit, little endian, PowerPC processor will now be <code>ppc64le</code> instead of <code>intel</code>. The default CPU identifier for an unidentified CPU will now be <code>x86_64</code> instead of <code>intel</code>. Currently, only relatively new AMD GPUs are supported.</li>
   <li>When CMakeing VisIt, if <code>-C <cachefile></code> is used or a slew of <code>-DVISIT_CMAKE_VARIABLE=VALUE</code> options are specified in lieu of a config-site file, the option <code>-DVISIT_CONFIG_SITE=NONE</code> is also required.</li>
   <li>The regression suite has been modified to copy current text results for failed tests to the dashboard repository. This allows the <code>test/baseline/rebase.py</code> script to rebaseline text results as well as image results.</li>
+  <li>Enhanced <code>build_visit</code> so that it pre-installs the OSPRay third party dependenices so that it can build OSPRay on a system without an internet connnection if the tar file with the OSPRay third party libraries is present.</li>
 </ul>
 
 <p>Click the following link to view the release notes for the previous version

diff --git a/src/resources/hosts/llnl_closed/host_lanl_closed_crossroads.xml b/src/resources/hosts/llnl_closed/host_lanl_closed_crossroads.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<Object name="MachineProfile">
+    <Field name="hostNickname" type="string">"LANL Crossroads"</Field>
+    <Field name="host" type="string">xr-fe.lanl.gov</Field>
+    <Field name="userName" type="string">notset</Field>
+    <Field name="hostAliases" type="string">"xr-fe#.lanl.gov xr-fe#"</Field>
+    <Field name="directory" type="string">/usr/projects/views/visit</Field>
+    <Field name="shareOneBatchJob" type="bool">false</Field>
+    <Field name="sshPortSpecified" type="bool">false</Field>
+    <Field name="sshPort" type="int">22</Field>
+    <Field name="sshCommandSpecified" type="bool">false</Field>
+    <Field name="sshCommand" type="stringVector">"ssh" </Field>
+    <Field name="useGateway" type="bool">false</Field>
+    <Field name="gatewayHost" type="string"></Field>
+    <Field name="clientHostDetermination" type="string">MachineName</Field>
+    <Field name="manualClientHostName" type="string"></Field>
+    <Field name="tunnelSSH" type="bool">true</Field>
+    <Field name="maximumNodesValid" type="bool">false</Field>
+    <Field name="maximumNodes" type="int">1</Field>
+    <Field name="maximumProcessorsValid" type="bool">false</Field>
+    <Field name="maximumProcessors" type="int">1</Field>
+    <Object name="LaunchProfile">
+        <Field name="timeout" type="int">480</Field>
+        <Field name="numProcessors" type="int">1</Field>
+        <Field name="numNodesSet" type="bool">false</Field>
+        <Field name="numNodes" type="int">0</Field>
+        <Field name="partitionSet" type="bool">false</Field>
+        <Field name="partition" type="string"></Field>
+        <Field name="bankSet" type="bool">false</Field>
+        <Field name="bank" type="string"></Field>
+        <Field name="timeLimitSet" type="bool">false</Field>
+        <Field name="timeLimit" type="string"></Field>
+        <Field name="launchMethodSet" type="bool">false</Field>
+        <Field name="launchMethod" type="string"></Field>
+        <Field name="forceStatic" type="bool">true</Field>
+        <Field name="forceDynamic" type="bool">false</Field>
+        <Field name="active" type="bool">false</Field>
+        <Field name="arguments" type="stringVector"></Field>
+        <Field name="parallel" type="bool">false</Field>
+        <Field name="launchArgsSet" type="bool">false</Field>
+        <Field name="launchArgs" type="string"></Field>
+        <Field name="sublaunchArgsSet" type="bool">false</Field>
+        <Field name="sublaunchArgs" type="string"></Field>
+        <Field name="sublaunchPreCmdSet" type="bool">false</Field>
+        <Field name="sublaunchPreCmd" type="string"></Field>
+        <Field name="sublaunchPostCmdSet" type="bool">false</Field>
+        <Field name="sublaunchPostCmd" type="string"></Field>
+        <Field name="machinefileSet" type="bool">false</Field>
+        <Field name="machinefile" type="string"></Field>
+        <Field name="visitSetsUpEnv" type="bool">false</Field>
+        <Field name="canDoHWAccel" type="bool">false</Field>
+        <Field name="GPUsPerNode" type="int">1</Field>
+        <Field name="XArguments" type="string"></Field>
+        <Field name="launchXServers" type="bool">false</Field>
+        <Field name="XDisplay" type="string">:%l</Field>
+        <Field name="numThreads" type="int">0</Field>
+        <Field name="constrainNodeProcs" type="bool">false</Field>
+        <Field name="allowableNodes" type="intVector"></Field>
+        <Field name="allowableProcs" type="intVector"></Field>
+        <Field name="profileName" type="string">serial</Field>
+    </Object>
+    <Object name="LaunchProfile">
+        <Field name="timeout" type="int">480</Field>
+        <Field name="numProcessors" type="int">64</Field>
+        <Field name="numNodesSet" type="bool">true</Field>
+        <Field name="numNodes" type="int">4</Field>
+        <Field name="partitionSet" type="bool">true</Field>
+        <Field name="partition" type="string">standard</Field>
+        <Field name="bankSet" type="bool">false</Field>
+        <Field name="bank" type="string"></Field>
+        <Field name="timeLimitSet" type="bool">true</Field>
+        <Field name="timeLimit" type="string">4:00:00</Field>
+        <Field name="launchMethodSet" type="bool">true</Field>
+        <Field name="launchMethod" type="string">sbatch/srun</Field>
+        <Field name="forceStatic" type="bool">true</Field>
+        <Field name="forceDynamic" type="bool">false</Field>
+        <Field name="active" type="bool">true</Field>
+        <Field name="arguments" type="stringVector"></Field>
+        <Field name="parallel" type="bool">true</Field>
+        <Field name="launchArgsSet" type="bool">true</Field>
+        <Field name="launchArgs" type="string">--exclusive --qos=viz</Field>
+        <Field name="sublaunchArgsSet" type="bool">false</Field>
+        <Field name="sublaunchArgs" type="string"></Field>
+        <Field name="sublaunchPreCmdSet" type="bool">false</Field>
+        <Field name="sublaunchPreCmd" type="string"></Field>
+        <Field name="sublaunchPostCmdSet" type="bool">false</Field>
+        <Field name="sublaunchPostCmd" type="string"></Field>
+        <Field name="machinefileSet" type="bool">false</Field>
+        <Field name="machinefile" type="string"></Field>
+        <Field name="visitSetsUpEnv" type="bool">false</Field>
+        <Field name="canDoHWAccel" type="bool">false</Field>
+        <Field name="GPUsPerNode" type="int">1</Field>
+        <Field name="XArguments" type="string"></Field>
+        <Field name="launchXServers" type="bool">false</Field>
+        <Field name="XDisplay" type="string">:%l</Field>
+        <Field name="numThreads" type="int">0</Field>
+        <Field name="constrainNodeProcs" type="bool">false</Field>
+        <Field name="allowableNodes" type="intVector"></Field>
+        <Field name="allowableProcs" type="intVector"></Field>
+        <Field name="profileName" type="string">parallel batch standard viz</Field>
+    </Object>
+    <Field name="activeProfile" type="int">1</Field>
+</Object>
diff --git a/src/resources/hosts/networks.json b/src/resources/hosts/networks.json
@@ -199,6 +199,9 @@
     {
       "network": "llnl_closed",
       "files": [
+        {
+          "name": "host_lanl_closed_crossroads.xml"
+        },
         {
           "name": "host_llnl_closed_agate.xml"
         },

diff --git a/src/tools/dev/scripts/bv_support/bv_ospray.sh b/src/tools/dev/scripts/bv_support/bv_ospray.sh
@@ -58,6 +58,9 @@ function bv_ospray_info
     export OSPRAY_SRC_DIR=${OSPRAY_SRC_DIR:-"${OSPRAY_FILE%.tar*}"}
     export OSPRAY_BUILD_DIR=${OSPRAY_BUILD_DIR:-"${OSPRAY_SRC_DIR}-build"}
     export OSPRAY_SHA256_CHECKSUM="d8d8e632d77171c810c0f38f8d5c8387470ca19b75f5b80ad4d3d12007280288"
+    export OSPRAY_LIBS_FILE=${OSPRAY_LIBS_FILE:-"ospray-libs-${OSPRAY_VERSION}.tar.gz"}
+    export OSPRAY_LIBS_DIR=${OSPRAY_LIBS_DIR:-"${OSPRAY_LIBS_FILE%.tar*}"}
+    export OSPRAY_LIBS_SHA256_CHECKSUM="8ab33df7ea88d7eb3b9170fc3b6342e77cd105d9549db8bce31cddd5a0336f2f"
 }
 
 function bv_ospray_print
@@ -106,6 +109,7 @@ function bv_ospray_is_enabled
 function bv_ospray_ensure
 {
     if [[ "$DO_OSPRAY" == "yes" && "$USE_SYSTEM_OSPRAY" == "no" ]]; then
+        download_file ${OSPRAY_LIBS_FILE}
         ensure_built_or_ready "ospray" $OSPRAY_VERSION $OSPRAY_BUILD_DIR $OSPRAY_FILE $OSPRAY_URL
         if [[ $? != 0 ]] ; then
             ANY_ERRORS="yes"
@@ -212,6 +216,21 @@ function build_ospray
     if [[ ! -d $OSPRAY_BUILD_DIR ]] ; then
         echo "Making build directory $OSPRAY_BUILD_DIR"
         mkdir $OSPRAY_BUILD_DIR
+        if [[ -f $OSPRAY_LIBS_FILE ]] ; then
+            tar zxf $OSPRAY_LIBS_FILE
+            mkdir -p $OSPRAY_BUILD_DIR/ispc/src
+            cp $OSPRAY_LIBS_DIR/ispc-v1.21.1-linux-oneapi.tar.gz $OSPRAY_BUILD_DIR/ispc/src
+            mkdir $OSPRAY_BUILD_DIR/tbb
+            cp $OSPRAY_LIBS_DIR/oneapi-tbb-2021.10.0-lin.tgz $OSPRAY_BUILD_DIR/tbb
+            mkdir $OSPRAY_BUILD_DIR/rkcommon
+            cp $OSPRAY_LIBS_DIR/v1.12.0.zip $OSPRAY_BUILD_DIR/rkcommon
+            mkdir $OSPRAY_BUILD_DIR/embree
+            cp $OSPRAY_LIBS_DIR/embree-4.3.0.x86_64.linux.tar.gz $OSPRAY_BUILD_DIR/embree
+            mkdir $OSPRAY_BUILD_DIR/glm
+            cp $OSPRAY_LIBS_DIR/glm-0.9.9.8.zip $OSPRAY_BUILD_DIR/glm
+            mkdir $OSPRAY_BUILD_DIR/openvkl
+            cp $OSPRAY_LIBS_DIR/v2.0.0.zip $OSPRAY_BUILD_DIR/openvkl
+        fi
     else
         #
         # Remove the CMakeCache.txt files ... existing files sometimes

diff --git a/src/tools/dev/scripts/lastpass_poodle b/src/tools/dev/scripts/lastpass_poodle
@@ -1 +1 @@
-1645a82f40bda19bdf24d687d5fe227e2090644d
+7dbc185cbd28fb9a8a7937156b00a306ee225e53