Commit 89d21c42 authored by ghweber's avatar ghweber
Browse files

Merged 2.3RC into trunk: Use NERC_HOST and support installation of global host...

Merged 2.3RC into trunk: Use NERC_HOST and support installation of global host profiles on 'make install'.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16217 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4466e61c
......@@ -252,6 +252,10 @@
# Kathleen Biagas, Wed Aug 17 12:31:50 PDT 2011
# Make use of NSIS to create an installer an option.
#
# Gunther H. Weber, Tue Sep 20 17:15:48 PDT 2011
# Use NERSC_HOST environment variable instead of hostname to determine if
# we are running on Franklin or Hopper.
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
......@@ -279,6 +283,14 @@ SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
SITE_NAME(HOSTNAME)
# Use NERSC_HOST environment variable to determine if we are running on Franklin
# or Hopper. If so, use that hostname instead of the result of SITE_NAME which is
# only the name of the login node we are running on.
IF (($ENV{NERSC_HOST} STREQUAL "franklin") OR ($ENV{NERSC_HOST} STREQUAL "hopper"))
SET(HOSTNAME "$ENV{NERSC_HOST}.nersc.gov")
ENDIF (($ENV{NERSC_HOST} STREQUAL "franklin") OR ($ENV{NERSC_HOST} STREQUAL "hopper"))
#-----------------------------------------------------------------------------
# Helper function for setting build options via config-site file.
# Supports optional argument pair: TYPE [CMAKE_TYPE], default type = PATH
......
......@@ -11,6 +11,7 @@
SET(VISITHOME /project/projectdirs/visit/visit_3rdparty_euclid_opt)
SET(VISITHOME2 /project/projectdirs/visit/visit_3rdparty_euclid)
SET(VISITARCH linux-x86_64_gcc-4.1)
SET(VISIT_INSTALL_PROFILES_TO_HOSTS "nersc")
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/common/graphics/visit)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_THIRD_PARTY ON)
VISIT_OPTION_DEFAULT(VISIT_VERBOSE_MAKEFILE TRUE)
......
......@@ -41,6 +41,12 @@
# Use glob to find all host profiles & ini files we want to install
# from svn_bin.
#
# Gunther H. Weber, Tue Sep 20 13:11:08 PDT 2011
# Support installation of global host profiles on "make install". Set
# VISIT_INSTALL_PROFILES_TO_HOSTS to "nersc", "ornl" etc. to create
# a global "hosts" directory in the VisIt install and copy over the
# corresponding host profiles.
## find all host profiles to install using a glob
FILE(GLOB HPROF_FILES "${CMAKE_CURRENT_SOURCE_DIR}/host_*.xml")
......@@ -56,9 +62,11 @@ ENDIF (APPLE)
IF(WIN32)
SET(INI_DEST ${VISIT_INSTALLED_VERSION_BIN})
SET(HPROF_DEST ${VISIT_INSTALLED_VERSION_BIN}/allhosts)
SET(LPROF_DEST ${VISIT_INSTALLED_VERSION_BIN}/hosts)
ELSE(WIN32)
SET(INI_DEST ${VISIT_VERSION}/.visit)
SET(HPROF_DEST ${VISIT_VERSION}/.visit/allhosts)
SET(LPROF_DEST ${VISIT_VERSION}/.visit/hosts)
ENDIF(WIN32)
# Install the visit config files
......@@ -72,3 +80,13 @@ INSTALL(FILES ${HPROF_FILES}
DESTINATION ${HPROF_DEST}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ
)
# Infall local host profiles if specified
IF (VISIT_INSTALL_PROFILES_TO_HOSTS)
FILE(GLOB LPROF_FILES
"${CMAKE_CURRENT_SOURCE_DIR}/host_${VISIT_INSTALL_PROFILES_TO_HOSTS}_*.xml")
INSTALL(FILES ${LPROF_FILES}
DESTINATION ${LPROF_DEST}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ
)
ENDIF (VISIT_INSTALL_PROFILES_TO_HOSTS)
......@@ -45,6 +45,8 @@ lustrePrefix = "/usr/common"
# Find MPI path
hostname = os.uname()[1]
if os.environ.has_key('NERSC_HOST'):
hostname = (os.environ['NERSC_HOST']) + ".nersc.gov"
configFilename = os.path.abspath(os.path.dirname(sys.argv[0]) + "/../config-site/" + hostname + ".cmake")
(status, MPIRPathLine) = commands.getstatusoutput("grep VISIT_PARALLEL_RPATH " + configFilename + " | egrep -v ^#")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment