Skip to content

Commit

Permalink
Merge branch 'develop' into feat-mcm86-17dec24-suspnd-gui-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@markcmiller86
markcmiller86 authored Dec 17, 2024
2 parents 0184903 + 02347a2 commit 0b04953
Show file tree
Hide file tree
Showing 30 changed files with 836 additions and 144 deletions.
83 changes: 41 additions & 42 deletions scripts/run-build-visit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
# Usage:
# run-build-visit -<machine name> -v <version> -s <build_visit_script>
# Valid machine names:
# poodle (LC, Linux, x86_64, toss4),
# lassen (LC, Linux, power9),
# rzwhippet (LC, Linux, x86_64, toss4),
# rzvernal (LC, Linux, x86_64, toss4-cray),
# trinity (LANL, x86_64)
# tuolumne (LC, Linux, x86_64, toss4-cray),
# rzadams (LC, Linux, x86_64, toss4-cray)
# poodle (LC, Linux, x86_64, toss4),
# lassen (LC, Linux, power9),
# rzwhippet (LC, Linux, x86_64, toss4),
# rzvernal (LC, Linux, x86_64, toss4-cray),
# crossroads (LANL, x86_64)
# tuolumne (LC, Linux, x86_64, toss4-cray),
# rzadams (LC, Linux, x86_64, toss4-cray)
#
# Modifications:
# Eric Brugger, Fri Feb 17 09:36:29 PST 2023
Expand Down Expand Up @@ -71,6 +71,9 @@
# Justin Privitera, Fri Nov 22 16:40:46 PST 2024
# Removed kickit with extreme prejudice.
#
# Eric Brugger, Wed Dec 4 16:00:35 PST 2024
# Removed trinity and added crossroads.
#
#-----------------------------------------------------------------------

#
Expand All @@ -80,7 +83,7 @@ poodle=false
lassen=false
rzgenie=false
rzvernal=false
trinity=false
crossroads=false
tuolumne=false

machine_name="unknown"
Expand Down Expand Up @@ -118,9 +121,9 @@ do
machine_name="rzvernal"
shift
;;
-trinity)
trinity=true
machine_name="trinity"
-crossroads)
crossroads=true
machine_name="crossroads"
shift
;;
-tuolumne)
Expand Down Expand Up @@ -151,13 +154,13 @@ if [ "$build_visit_script" = "undefined" ] || [ "$version" = "undefined" ]
then
echo "Usage: -<machine name> -v <version> -s <build_visit_script>"
echo "Valid machine names:"
echo " poodle (LC, Linux, x86_64, toss4),"
echo " lassen (LC, Linux, power9),"
echo " rzwhippet (LC, Linux, x86_64, toss4),"
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
echo " trinity (LANL, Linux, x86_64)"
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
echo " rzadams (LC, Linux, x86_64, toss4-cray)"
echo " poodle (LC, Linux, x86_64, toss4),"
echo " lassen (LC, Linux, power9),"
echo " rzwhippet (LC, Linux, x86_64, toss4),"
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
echo " crossroads (LANL, Linux, x86_64)"
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
echo " rzadams (LC, Linux, x86_64, toss4-cray)"
exit
fi

Expand All @@ -178,7 +181,7 @@ fi
# Info and set ran_build_visit
#
if [ "$poodle" = true ] || [ "$lassen" = true ] || [ "$rzwhippet" = true ] || \
[ "$rzvernal" = true ] || [ "$trinity" = true ] || \
[ "$rzvernal" = true ] || [ "$crossroads" = true ] || \
[ "$tuolumne" = true ]; then
echo "Building on $machine_name"
ran_build_visit=true
Expand All @@ -198,7 +201,7 @@ elif [ "$rzvernal" = true ]; then
dest_dir=/usr/workspace/visit/visit/thirdparty_shared/$version/toss4-cray-gfx90a
elif [ "$tuolumne" = true ]; then
dest_dir=/usr/workspace/visit/visit/thirdparty_shared/$version/toss4-cray-gfx942
elif [ "$trinity" = true ]; then
elif [ "$crossroads" = true ]; then
dest_dir=/usr/projects/views/visit/thirdparty_shared/$version
else
echo "case for $machine_name not implemented. Bailing out."
Expand All @@ -211,7 +214,7 @@ fi
if [ "$poodle" = true ] || [ "$lassen" = true ] || [ "$rzwhippet" = true ] || \
[ "$rzvernal" = true ] || [ "$tuolumne" = true ]; then
dest_group=visit
elif [ "$trinity" = true ]; then
elif [ "$crossroads" = true ]; then
dest_group=viz
else
echo "case for $machine_name not implemented. Bailing out."
Expand All @@ -222,7 +225,7 @@ fi
# housekeeping
#
if [ "$poodle" = true ] || [ "$lassen" = true ] || [ "$rzwhippet" = true ] || \
[ "$rzvernal" = true ] || [ "$trinity" = true ] || \
[ "$rzvernal" = true ] || [ "$crossroads" = true ] || \
[ "$tuolumne" = true ]; then
if [ -f ${build_visit_script}_log.${machine_name} ]; then
mv ${build_visit_script}_log.${machine_name} ${build_visit_script}_log
Expand Down Expand Up @@ -266,19 +269,15 @@ elif [ "$rzvernal" = true ]; then
PAR_INCLUDE=-I/usr/tce/packages/cray-mpich/cray-mpich-8.1.28-gcc-12.2.1-magic/include \
./$build_visit_script --group ${dest_group} --required --optional --mesagl --uintah --parallel \
--qt6 --qwt --no-pyside --no-gdal --no-uintah --no-visit --makeflags -j24 --thirdparty-path ${dest_dir}
elif [ "$trinity" = true ]; then
module swap PrgEnv-intel/6.0.10 PrgEnv-gnu/6.0.10
module swap gcc/11.2.0 gcc/8.2.0
export XTPE_LINK_TYPE=dynamic
export CRAYPE_LINK_TYPE=dynamic
env C_COMPILER=/opt/cray/pe/craype/2.7.15/bin/cc \
CXX_COMPILER=/opt/cray/pe/craype/2.7.15/bin/CC \
PAR_COMPILER=/opt/cray/pe/craype/2.7.15/bin/cc \
PAR_COMPILER_CXX=/opt/cray/pe/craype/2.7.15/bin/CC \
PAR_INCLUDE=-I/opt/cray/pe/mpt/7.7.20/gni/mpich-gnu/8.2/include \
PAR_LIBS="-L/opt/cray/pe/mpt/7.7.20/gni/mpich-gnu/8.2/lib -Wl,-rpath=/opt/cray/pe/mpt/7.7.20/gni/mpich-gnu/8.2/lib -lmpich" \
elif [ "$crossroads" = true ]; then
env C_COMPILER=gcc \
CXX_COMPILER=g++ \
PAR_COMPILER=mpicc \
PAR_COMPILER_CXX=mpic++ \
PAR_INCLUDE=-I/opt/cray/pe/mpich/8.1.28/ofi/intel/2022.1/include \
PAR_LIBS="-L/opt/cray/pe/mpich/8.1.28/ofi/intel/2022.1/lib -Wl,-rpath=/opt/cray/pe/mpich/8.1.28/ofi/intel/intel/lib" \
./$build_visit_script --group ${dest_group} --required --optional --mesagl --parallel \
--no-adios --no-adios2 --no-mili --no-pyside --qt510 --qwt --no-visit \
--qt6 --qwt --no-adios --no-gdal --no-pyside --no-visit \
--makeflags -j16 --thirdparty-path ${dest_dir}
elif [ "$tuolumne" = true ]; then
env CC=gcc \
Expand All @@ -296,7 +295,7 @@ fi
# Final housekeeping and permissions
#
if [ "$poodle" = true ] || [ "$lassen" = true ] || [ "$rzwhippet" = true ] || \
[ "$rzvernal" = true ] || [ "$trinity" = true ] || \
[ "$rzvernal" = true ] || [ "$crossroads" = true ] || \
[ "$tuolumne" = true ]; then
mv ${build_visit_script}_log ${build_visit_script}_log.${machine_name}
# just in case perms
Expand All @@ -316,12 +315,12 @@ then
echo "Invalid or missing machine name."
echo "Usage: -<machine name> -v <version> -s <build_visit_script>"
echo "Valid machine names:"
echo " poodle (LC, Linux, x86_64, toss4),"
echo " lassen (LC, Linux, power9),"
echo " rzgenie (LC, Linux, x86_64, toss3),"
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
echo " trinity (LANL, Linux, x86_64)"
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
echo " rzadams (LC, Linux, x86_64, toss4-cray),"
echo " poodle (LC, Linux, x86_64, toss4),"
echo " lassen (LC, Linux, power9),"
echo " rzgenie (LC, Linux, x86_64, toss3),"
echo " rzvernal (LC, Linux, x86_64, toss4-cray),"
echo " crossroads (LANL, Linux, x86_64)"
echo " tuolumne (LC, Linux, x86_64, toss4-cray),"
echo " rzadams (LC, Linux, x86_64, toss4-cray),"
exit
fi
2 changes: 2 additions & 0 deletions src/CMake/DetermineVisItArchitecture.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ MACRO(DETERMINE_VISIT_ARCHITECTURE ARCH)
ENDIF(${_OSX_MAJOR_VERSION} STREQUAL "1")
ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
SET(${ARCH} darwin-x86_64)
ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64")
SET(${ARCH} darwin-arm64)
ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
SET(${ARCH} darwin-ppc)
ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
Expand Down
7 changes: 6 additions & 1 deletion src/bin/frontendlauncher
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ if test "$osname" = "Linux"; then
platform="linux-intel"
fi
elif test "$osname" = "Darwin"; then
platform="darwin-x86_64"
proc=$(uname -m)
if test "$proc" = "x86_64"; then
platform="darwin-x86_64"
elif test "$proc" = "arm64"; then
platform="darwin-arm64"
fi
elif test "$osname" = "AIX"; then
if test "$OBJECT_MODE" = "32"; then
platform="ibm-aix-pwr"
Expand Down
10 changes: 10 additions & 0 deletions src/bin/internallauncher
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2800,6 +2800,8 @@ class MainLauncher(object):
if mach == "x86_64":
supportedarches.append("darwin-x86_64")
supportedarches.append("darwin-i386")
elif mach == "arm64":
supportedarches.append("darwin-arm64")
else:
supportedarches.append("darwin-i386")
else:
Expand Down Expand Up @@ -2832,6 +2834,14 @@ class MainLauncher(object):
supportedarches.append("darwin-x86_64")
supportedarches.append("darwin-i386")
break
procname = line.find("Chip:")
if procname != -1:
if "Apple M" in line:
supportedarches.append("darwin-arm64")
else:
supportedarches.append("darwin-x86_64")
supportedarches.append("darwin-i386")
break
elif self.os == "freebsd":
mach = uname("-m")
version = uname("-r")
Expand Down
15 changes: 10 additions & 5 deletions src/common/misc/InstallationFunctions.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,7 @@ ReadInstallationInfo(std::string &distName, std::string &configName, std::string

"darwin-i386",
"darwin-x86_64",
"darwin-arm64",

// Deprecated
"darwin-ppc",
Expand Down Expand Up @@ -977,6 +978,7 @@ ReadInstallationInfo(std::string &distName, std::string &configName, std::string

"darwin-i386",
"darwin-x86_64",
"darwin-arm64",

// Deprecated
"darwin-ppc",
Expand Down Expand Up @@ -1068,13 +1070,16 @@ ReadInstallationInfo(std::string &distName, std::string &configName, std::string
}
}

#ifdef __APPLE__
#if defined(__APPLE__)
if(!platformDetermined)
{
if(sizeof(long) == 8)
distName = "darwin-x86_64";
else
distName = "darwin-i386";
# if defined(__arm64__)
distName = "darwin-arm64";
# elif defined(__x86_64__)
distName = "darwin-x86_64";
# else
distName = "darwin-i386";
# endif
platformDetermined = true;
}
#endif
Expand Down
Loading

0 comments on commit 0b04953

Please sign in to comment.