Commit 6187fc86 authored by bonnell's avatar bonnell

Updated config-site files for llnl's bg/q system. Changed build_visit_BGQ to...

Updated config-site files for llnl's bg/q system.  Changed build_visit_BGQ to build Release mode by default. Don't attempt to create a python symlink to VISIT_PYTHON_DIR if it is not defined (prevents cmake error), add TYPE BOOL to some options in host-conf files that build visit creates for BG/Q.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27654 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3a4eefc8
#/usr/gapps/visit/thirdparty_static/2.7.0/cmake/2.8.10.2/linux-ppc64_gcc-4.4_BGQ/bin/cmake
#/usr/gapps/visit/thirdparty_static/2.10.0/cmake/3.0.2/linux-ppc64_gcc-4.4_BGQ/bin/cmake
##
## ./build_visit generated host.cmake
## created: Fri May 31 14:41:03 PDT 2013
## system: Linux rzuseqlac2 2.6.32-358.6chaos.bgq62.ppc64 #1 SMP Thu Apr 4 11:21:55 PDT 2013 ppc64 ppc64 ppc64 GNU/Linux
## by: whitlocb
## created: Thu Oct 29 18:38:39 PDT 2015
## system: Linux rzuseqlac2 2.6.32-504.16.2.1chaos.1blueos_small_pages.bl2.2.ppc64 #1 SMP Thu Jul 16 10:43:19 PDT 2015 ppc64 ppc64 ppc64 GNU/Linux
## by: kbonnell
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.9.0)
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.10.0)
SET(VISITARCH linux-ppc64_gcc-4.4_BGQ)
MESSAGE(status "************* compute node build")
## Compiler flags.
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER bgxlc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER bgxlC TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER bgxlc_r TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER bgxlC_r TYPE FILEPATH)
##
## BG/Q-specific settings
##
SET(CMAKE_CROSSCOMPILING ON)
VISIT_OPTION_DEFAULT(VISIT_USE_X OFF)
VISIT_OPTION_DEFAULT(VISIT_USE_GLEW OFF)
VISIT_OPTION_DEFAULT(VISIT_SLIVR OFF)
VISIT_OPTION_DEFAULT(VISIT_USE_BOOST OFF)
VISIT_OPTION_DEFAULT(VISIT_DISABLE_SELECT ON)
VISIT_OPTION_DEFAULT(VISIT_USE_NOSPIN_BCAST OFF)
VISIT_OPTION_DEFAULT(VISIT_USE_X OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_USE_GLEW OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_SLIVR OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_DISABLE_SELECT ON TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_USE_NOSPIN_BCAST OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_OPENGL_DIR ${VISITHOME}/mesa/7.8.2/${VISITARCH})
ADD_DEFINITIONS(-DVISIT_BLUE_GENE_Q)
##
## BG/Q compute-node -specific settings
##
VISIT_OPTION_DEFAULT(VISIT_ENGINE_ONLY ON TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_FILTERS OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_SCRIPTING OFF TYPE BOOL)
SET(VISIT_SELECTED_DATABASE_PLUGINS "BOV;Cale;CaleHDF5;Curve2D;EnSight;Miranda;PDB;PlainText;SAMRAI;Silo;VTK")
## engine only
VISIT_OPTION_DEFAULT(VISIT_ENGINE_ONLY ON TYPE BOOL)
##
## Parallel Build Setup.
##
VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
## (inserted by build_visit for BG/Q. Some adjustment may be needed)
SET(BLUEGENEQ /bgsys/drivers/V1R2M0/ppc64)
VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_MPI_CXX_FLAGS "-I${BLUEGENEQ} -I${BLUEGENEQ}/comm/sys/include -I${BLUEGENEQ}/spi/include -I${BLUEGENEQ}/spi/include/kernel/cnk -I${BLUEGENEQ}/comm/xl/include" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_C_FLAGS "-I${BLUEGENEQ} -I${BLUEGENEQ}/comm/sys/include -I${BLUEGENEQ}/spi/include -I${BLUEGENEQ}/spi/include/kernel/cnk -I${BLUEGENEQ}/comm/xl/include" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LD_FLAGS "-L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/sys/lib -L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/sys/lib -L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/xl/lib -R/opt/ibmcmp/lib64/bg" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LD_FLAGS "-L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/sys/lib -L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/xl/lib -R/opt/ibmcmp/lib64/bg/bglib64" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LIBS mpich opa mpl pami SPI SPI_cnk rt pthread stdc++ pthread TYPE STRING)
##
......@@ -49,6 +52,11 @@ VISIT_OPTION_DEFAULT(VISIT_MPI_LIBS mpich opa mpl pami SPI SPI_cnk rt pthrea
##
VISIT_OPTION_DEFAULT(VISIT_STATIC ON TYPE BOOL)
##
## VisIt Thread Option
##
VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
##############################################################
##
## Database reader plugin support libraries
......@@ -62,16 +70,12 @@ VISIT_OPTION_DEFAULT(VISIT_STATIC ON TYPE BOOL)
##############################################################
##
##
## Mesa
##
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/7.8.2/${VISITARCH})
##
## VTK
##
SETUP_APP_VERSION(VTK 6.1.0)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/6.1.0/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH})
##
##
## SZIP
......@@ -86,7 +90,7 @@ VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/1.2.8/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.14/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/zlib/1.2.8/${VISITARCH}/lib z TYPE STRING)
##
......@@ -94,11 +98,6 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz
##
VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/1.0.0/${VISITARCH})
##
## Mili
##
#VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/1.11.1/${VISITARCH})
##
## Silo
##
......
#/usr/gapps/visit/thirdparty_static/2.9.0/cmake/3.0.2/linux-ppc64_gcc-4.4/bin/cmake
#/usr/gapps/visit/thirdparty_static/2.10.0-new/cmake/3.0.2/linux-ppc64_gcc-4.4/bin/cmake
##
## ./build_visit generated host.cmake
## created: Fri May 31 12:16:29 PDT 2013
## system: Linux rzuseqlac2 2.6.32-358.6chaos.bgq62.ppc64 #1 SMP Thu Apr 4 11:21:55 PDT 2013 ppc64 ppc64 ppc64 GNU/Linux
## by: whitlocb
## created: Wed Nov 4 18:42:39 PST 2015
## system: Linux rzuseqlac2 2.6.32-504.16.2.1chaos.1blueos_small_pages.bl2.2.ppc64 #1 SMP Thu Jul 16 10:43:19 PDT 2015 ppc64 ppc64 ppc64 GNU/Linux
## by: kbonnell
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.9.0)
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.10.0)
SET(VISITARCH linux-ppc64_gcc-4.4)
MESSAGE(status "************* login node build")
## Compiler flags.
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER /usr/bin/gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER /usr/bin/g++ TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
##
## BG/Q login-node specific settings
##
VISIT_OPTION_DEFAULT(VISIT_SERVER_COMPONENTS_ONLY ON TYPE BOOL)
##
## Static build
##
VISIT_OPTION_DEFAULT(VISIT_STATIC ON TYPE BOOL)
## server components only
VISIT_OPTION_DEFAULT(VISIT_SERVER_COMPONENTS_ONLY ON TYPE BOOL)
##
## VisIt Thread Option
##
VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
##############################################################
##
......@@ -40,7 +48,7 @@ VISIT_OPTION_DEFAULT(VISIT_SERVER_COMPONENTS_ONLY ON TYPE BOOL)
##
## Python
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.6/linux-ppc64_gcc-4.4)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.6/${VISITARCH})
##
## VTK
......@@ -57,14 +65,9 @@ VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.14/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib z TYPE STRING)
##
## Mili
##
#VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/1.11.1/${VISITARCH})
##
## Silo
##
......
#/g/g17/whitlocb/Development/thirdparty_static/V1R2M0/cmake/3.0.2/linux-ppc64_gcc-4.4_BGQ/bin/cmake
#/usr/gapps/visit/thirdparty_static/2.10.0/cmake/3.0.2/linux-ppc64_gcc-4.4_BGQ/bin/cmake
##
## ./build_visit generated host.cmake
## created: Fri Oct 17 20:22:06 PDT 2014
## system: Linux vulcanlac4 2.6.32-431.23.3.1chaos.1blueos_small_pages.bl2.2.ppc64 #1 SMP Tue Aug 5 13:03:22 PDT 2014 ppc64 ppc64 ppc64 GNU/Linux
## by: whitlocb
## created: Tue Oct 27 15:52:20 PDT 2015
## system: Linux vulcanlac4 2.6.32-504.16.2.1chaos.1blueos_small_pages.bl2.2.ppc64 #1 SMP Thu Jul 16 10:43:19 PDT 2015 ppc64 ppc64 ppc64 GNU/Linux
## by: kbonnell
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.9.0)
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.10.0)
SET(VISITARCH linux-ppc64_gcc-4.4_BGQ)
## Compiler flags.
......@@ -20,35 +20,28 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER bgxlC_r TYPE FILEPATH)
## BG/Q-specific settings
##
SET(CMAKE_CROSSCOMPILING ON)
VISIT_OPTION_DEFAULT(VISIT_USE_X OFF)
VISIT_OPTION_DEFAULT(VISIT_USE_GLEW OFF)
VISIT_OPTION_DEFAULT(VISIT_SLIVR OFF)
VISIT_OPTION_DEFAULT(VISIT_DISABLE_SELECT ON)
VISIT_OPTION_DEFAULT(VISIT_USE_NOSPIN_BCAST OFF)
VISIT_OPTION_DEFAULT(VISIT_ENGINE_ONLY ON TYPE BOOL)
SET(VISIT_SELECTED_DATABASE_PLUGINS "BOV;Cale;CaleHDF5;Curve2D;EnSight;Miranda;PDB;PlainText;SAMRAI;Silo;VTK")
VISIT_OPTION_DEFAULT(VISIT_USE_X OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_USE_GLEW OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_SLIVR OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_DISABLE_SELECT ON TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_USE_NOSPIN_BCAST OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_FILTERS OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_SCRIPTING OFF TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_OPENGL_DIR ${VISITHOME}/mesa/7.8.2/${VISITARCH})
ADD_DEFINITIONS(-DVISIT_BLUE_GENE_Q)
## Still need boost headers, point to third_party_builtin for now:
SET(BOOST_INCLUDE_DIR ${VISIT_SOURCE_DIR}/third_party_builtin/bilib/boost_1_42_0)
##
## Parallel Build Setup.
##
VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
## (inserted by build_visit for BG/Q. Configuration as of 10/8/2014.)
## (LC rolled back this ppcfloor configuration from V1R2M2 to V1R2M0 10/16/2014.)
#SET(BLUEGENEQ /bgsys/drivers/ppcfloor)
#VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
#VISIT_OPTION_DEFAULT(VISIT_MPI_CXX_FLAGS "-I${BLUEGENEQ} -I${BLUEGENEQ}/comm/include -I${BLUEGENEQ}/spi/include -I${BLUEGENEQ}/spi/include/kernel/cnk" TYPE STRING)
#VISIT_OPTION_DEFAULT(VISIT_MPI_C_FLAGS "-I${BLUEGENEQ} -I${BLUEGENEQ}/comm/include -I${BLUEGENEQ}/spi/include -I${BLUEGENEQ}/spi/include/kernel/cnk" TYPE STRING)
#VISIT_OPTION_DEFAULT(VISIT_MPI_LD_FLAGS "-L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/lib -R/opt/ibmcmp/lib64/bg" TYPE STRING)
#VISIT_OPTION_DEFAULT(VISIT_MPI_LIBS mpich-xl opa-xl mpl-xl pami-gcc SPI SPI_cnk rt pthread stdc++ pthread TYPE STRING)
## (inserted by build_visit for BG/Q. Configuration as of 10/15/2014.)
SET(BLUEGENEQ /bgsys/drivers/V1R2M0/ppc64)
VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_MPI_CXX_FLAGS "-I${BLUEGENEQ} -I${BLUEGENEQ}/comm/sys/include -I${BLUEGENEQ}/spi/include -I${BLUEGENEQ}/spi/include/kernel/cnk -I${BLUEGENEQ}/comm/xl/include" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_C_FLAGS "-I${BLUEGENEQ} -I${BLUEGENEQ}/comm/sys/include -I${BLUEGENEQ}/spi/include -I${BLUEGENEQ}/spi/include/kernel/cnk -I${BLUEGENEQ}/comm/xl/include" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LD_FLAGS "-L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/sys/lib -L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/xl/lib -R/opt/ibmcmp/lib64/bg" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LD_FLAGS "-L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/sys/lib -L${BLUEGENEQ}/spi/lib -L${BLUEGENEQ}/comm/xl/lib -R/opt/ibmcmp/lib64/bg/bglib64" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MPI_LIBS mpich opa mpl pami SPI SPI_cnk rt pthread stdc++ pthread TYPE STRING)
##
......@@ -61,11 +54,6 @@ VISIT_OPTION_DEFAULT(VISIT_STATIC ON TYPE BOOL)
##
VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
##
## VisIt Boost Option.
##
VISIT_OPTION_DEFAULT(VISIT_USE_BOOST OFF TYPE BOOL)
##############################################################
##
## Database reader plugin support libraries
......@@ -79,6 +67,7 @@ VISIT_OPTION_DEFAULT(VISIT_USE_BOOST OFF TYPE BOOL)
##############################################################
##
##
## VTK
##
......@@ -99,7 +88,7 @@ VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/1.2.8/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.14/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/zlib/1.2.8/${VISITARCH}/lib z TYPE STRING)
##
......
#/g/g17/whitlocb/Development/thirdparty_static/2.9.0/cmake/3.0.2/linux-ppc64_gcc-4.4/bin/cmake
#/usr/gapps/visit/thirdparty_static/2.10.0/cmake/3.0.2/linux-ppc64_gcc-4.4/bin/cmake
##
## ./build_visit generated host.cmake
## created: Thu Oct 9 15:51:19 PDT 2014
## system: Linux vulcanlac4 2.6.32-431.23.3.1chaos.1blueos_small_pages.bl2.2.ppc64 #1 SMP Tue Aug 5 13:03:22 PDT 2014 ppc64 ppc64 ppc64 GNU/Linux
## by: whitlocb
## created: Tue Oct 27 16:06:51 PDT 2015
## system: Linux vulcanlac4 2.6.32-504.16.2.1chaos.1blueos_small_pages.bl2.2.ppc64 #1 SMP Thu Jul 16 10:43:19 PDT 2015 ppc64 ppc64 ppc64 GNU/Linux
## by: kbonnell
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.9.0)
SET(VISITHOME /usr/gapps/visit/thirdparty_static/2.10.0)
SET(VISITARCH linux-ppc64_gcc-4.4)
## Compiler flags.
......@@ -16,6 +16,11 @@ SET(VISITARCH linux-ppc64_gcc-4.4)
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
##
## login-node specific settings
##
VISIT_OPTION_DEFAULT(VISIT_SERVER_COMPONENTS_ONLY ON TYPE BOOL)
##
## Static build
##
......@@ -26,14 +31,6 @@ VISIT_OPTION_DEFAULT(VISIT_STATIC ON TYPE BOOL)
##
VISIT_OPTION_DEFAULT(VISIT_THREAD OFF TYPE BOOL)
##
## VisIt Boost Option.
##
VISIT_OPTION_DEFAULT(VISIT_USE_BOOST OFF TYPE BOOL)
## Still need boost headers, point to third_party_builtin for now:
SET(BOOST_INCLUDE_DIR ${VISIT_SOURCE_DIR}/third_party_builtin/bilib/boost_1_42_0)
##############################################################
##
## Database reader plugin support libraries
......@@ -67,7 +64,7 @@ VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.14/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib z TYPE STRING)
##
......
......@@ -147,13 +147,14 @@ FOREACH(LIB ${R_LIB})
ENDFOREACH(LIB in ${MESA_LIB})
IF (NOT WIN32)
IF(VISIT_PYTHON_DIR)
IF (NOT WIN32)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/python)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
${VISIT_PYTHON_DIR}
${CMAKE_CURRENT_BINARY_DIR}/python)
ELSE (NOT WIN32)
ELSE (NOT WIN32)
# because you don't need to choose your configuration up-front
# on windows, make this a custom target so they are copied to the
......@@ -165,7 +166,8 @@ ELSE (NOT WIN32)
${VISIT_LIBRARY_DIR}/python/Lib
COMMENT "Copying ${VISIT_PYTHON_DIR}/Lib/ ${VISIT_LIBRARY_DIR}/python/Lib"
)
ENDIF (NOT WIN32)
ENDIF (NOT WIN32)
ENDIF()
# prepare site-packages
IF(VISIT_PYTHON_FILTERS OR (VISIT_PYTHON_SCRIPTING AND HAVE_PYSIDE))
......
......@@ -28,7 +28,7 @@ BG_MPI_C_OPT_FLAGS=""
BG_MPI_CXX_OPT_FLAGS=""
BG_MPI_CXX=mpixlC
BUILD_MODE="Debug"
BUILD_MODE="Release"
CC=gcc
C_OPT_FLAGS=""
CXX=g++
......
......@@ -1358,11 +1358,11 @@ function build_hostconf
echo "## BG/Q-specific settings" >> $HOSTCONF
echo "##" >> $HOSTCONF
echo "SET(CMAKE_CROSSCOMPILING ON)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_USE_X OFF)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_USE_GLEW OFF)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_SLIVR OFF)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_DISABLE_SELECT ON)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_USE_NOSPIN_BCAST OFF)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_USE_X OFF TYPE BOOL)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_USE_GLEW OFF TYPE BOOL)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_SLIVR OFF TYPE BOOL)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_DISABLE_SELECT ON TYPE BOOL)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_USE_NOSPIN_BCAST OFF TYPE BOOL)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_OPENGL_DIR \${VISITHOME}/mesa/$MESA_VERSION/\${VISITARCH})" >> $HOSTCONF
echo "ADD_DEFINITIONS(-DVISIT_BLUE_GENE_Q)" >> $HOSTCONF
echo >> $HOSTCONF
......@@ -1388,7 +1388,6 @@ function build_hostconf
echo "" >> $HOSTCONF
echo "## (inserted by build_visit for BG/Q. Configuration as of 10/15/2014.)" >> $HOSTCONF
echo "SET(BLUEGENEQ /bgsys/drivers/V1R2M0/ppc64)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_MPI_CXX_FLAGS \"-I\${BLUEGENEQ} -I\${BLUEGENEQ}/comm/sys/include -I\${BLUEGENEQ}/spi/include -I\${BLUEGENEQ}/spi/include/kernel/cnk -I\${BLUEGENEQ}/comm/xl/include\" TYPE STRING)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_MPI_C_FLAGS \"-I\${BLUEGENEQ} -I\${BLUEGENEQ}/comm/sys/include -I\${BLUEGENEQ}/spi/include -I\${BLUEGENEQ}/spi/include/kernel/cnk -I\${BLUEGENEQ}/comm/xl/include\" TYPE STRING)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_MPI_LD_FLAGS \"-L\${BLUEGENEQ}/spi/lib -L\${BLUEGENEQ}/comm/sys/lib -L\${BLUEGENEQ}/spi/lib -L\${BLUEGENEQ}/comm/xl/lib -R/opt/ibmcmp/lib64/bg/bglib64\" TYPE STRING)" >> $HOSTCONF
......
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