From 2f38385bb57b01a5250cc1f42b06cec9fb5ba0e8 Mon Sep 17 00:00:00 2001 From: Eric Brugger Date: Thu, 11 Jul 2019 12:01:44 -0700 Subject: [PATCH] Update several config site files for 3.0.1. (#3673) --- src/config-site/cooleylogin2.cmake | 42 +++++++++++++++--------------- src/config-site/cori08.cmake | 12 ++++----- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/config-site/cooleylogin2.cmake b/src/config-site/cooleylogin2.cmake index 6db7a5a534f..d9150288340 100644 --- a/src/config-site/cooleylogin2.cmake +++ b/src/config-site/cooleylogin2.cmake @@ -1,14 +1,14 @@ -#/home/ebrugger/buildvisit/third_party/cmake/3.9.3/linux-rhel_7-x86_64_gcc-4.8/bin/cmake +#/home/ebrugger/buildvisit/third_party/3.0.1/cmake/3.9.3/linux-rhel_7-x86_64_gcc-4.8/bin/cmake ## -## ./build_visit3_0_0b generated host.cmake -## created: Tue Feb 26 21:07:23 UTC 2019 -## system: Linux cooleylogin2 3.10.0-957.1.3.el7.x86_64 #1 SMP Thu Nov 15 17:36:42 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux +## ./build_visit3_0_1 generated host.cmake +## created: Thu Jul 11 18:38:46 UTC 2019 +## system: Linux cooleylogin2 3.10.0-957.12.2.el7.x86_64 #1 SMP Fri Apr 19 21:09:07 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ## by: ebrugger ## ## Setup VISITHOME & VISITARCH variables. ## -SET(VISITHOME /home/ebrugger/buildvisit/third_party) +SET(VISITHOME /home/ebrugger/buildvisit/third_party/3.0.1) SET(VISITARCH linux-rhel_7-x86_64_gcc-4.8) VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL) @@ -24,7 +24,6 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRI ## Parallel Build Setup. ## VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL) -## (configured w/ mpi compiler wrapper) ## VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /soft/libraries/mpi/mvapich2/gcc/bin/mpicc TYPE FILEPATH) VISIT_OPTION_DEFAULT(VISIT_MPI_CXX_FLAGS -I/soft/libraries/mpi/mvapich2/gcc/include TYPE STRING) VISIT_OPTION_DEFAULT(VISIT_MPI_C_FLAGS -I/soft/libraries/mpi/mvapich2/gcc/include TYPE STRING) @@ -66,26 +65,26 @@ VISIT_OPTION_DEFAULT(VISIT_OPENSSL_DIR ${VISITHOME}/openssl/1.0.2j/${VISITARCH}) VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.14/${VISITARCH}) ## -## Qt +## LLVM ## -SETUP_APP_VERSION(QT 5.10.1) -VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/qt/${QT_VERSION}/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_LLVM_DIR ${VISITHOME}/llvm/5.0.0/${VISITARCH}) ## -## QWT +## MesaGL ## -SETUP_APP_VERSION(QWT 6.1.2) -VISIT_OPTION_DEFAULT(VISIT_QWT_DIR ${VISITHOME}/qwt/${QWT_VERSION}/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_MESAGL_DIR ${VISITHOME}/mesagl/17.2.8/${VISITARCH}) ## -## LLVM +## Qt ## -VISIT_OPTION_DEFAULT(VISIT_LLVM_DIR ${VISITHOME}/llvm/5.0.0/${VISITARCH}) +SETUP_APP_VERSION(QT 5.10.1) +VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/qt/${QT_VERSION}/${VISITARCH}) ## -## MesaGL +## QWT ## -VISIT_OPTION_DEFAULT(VISIT_MESAGL_DIR ${VISITHOME}/mesagl/17.2.8/${VISITARCH}) +SETUP_APP_VERSION(QWT 6.1.2) +VISIT_OPTION_DEFAULT(VISIT_QWT_DIR ${VISITHOME}/qwt/${QWT_VERSION}/${VISITARCH}) ## ## ISPC @@ -139,7 +138,7 @@ VISIT_OPTION_DEFAULT(VISIT_ADIOS_DIR ${VISITHOME}/adios/${ADIOS_VERSION}/${VISIT ## ## ADIOS2 ## -SETUP_APP_VERSION(ADIOS2 2.3.0) +SETUP_APP_VERSION(ADIOS2 2.4.0) VISIT_OPTION_DEFAULT(VISIT_ADIOS2_DIR ${VISITHOME}/adios2-ser/${ADIOS2_VERSION}/${VISITARCH}) ## (configured w/ mpi compiler wrapper) VISIT_OPTION_DEFAULT(VISIT_ADIOS2_PAR_DIR ${VISITHOME}/adios2-par/${ADIOS2_VERSION}/${VISITARCH}) @@ -174,7 +173,7 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP ## ## Conduit ## -VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.3.1/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.4.0/${VISITARCH}) VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING) ## @@ -203,8 +202,9 @@ VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/77c708f9090236b576669b74c5 ## ## MFEM ## -VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/3.3/${VISITARCH}) -VISIT_OPTION_DEFAULT(VISIT_MFEM_LIBDEP ${VISITHOME}/zlib/1.2.8/${VISITARCH}/lib z TYPE STRING) +VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/3.4/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_MFEM_INCDEP CONDUIT_INCLUDE_DIR TYPE STRING) +VISIT_OPTION_DEFAULT(VISIT_MFEM_LIBDEP ${VISIT_CONDUIT_LIBDEP} ${VISITHOME}/zlib/1.2.8/${VISITARCH}/lib z TYPE STRING) ## ## Mili @@ -239,7 +239,7 @@ VISIT_OPTION_DEFAULT(VISIT_SEVEN_ZIP_DIR ${VISITHOME}/p7zip/16.02/${VISITARCH}) ## ## PIDX ## -SETUP_APP_VERSION(PIDX 0.9.2) +SETUP_APP_VERSION(PIDX 0.9.3) VISIT_OPTION_DEFAULT(VISIT_PIDX_DIR ${VISITHOME}/pidx/${PIDX_VERSION}/${VISITARCH}) ## diff --git a/src/config-site/cori08.cmake b/src/config-site/cori08.cmake index 7118de725d0..2dffd7c8223 100644 --- a/src/config-site/cori08.cmake +++ b/src/config-site/cori08.cmake @@ -1,14 +1,14 @@ -#/project/projectdirs/visit/thirdparty_shared/3.0.0/cmake/3.9.3/linux-x86_64_gcc-7.3/bin/cmake +#/project/projectdirs/visit/thirdparty_shared/3.0.1/cmake/3.9.3/linux-x86_64_gcc-7.3/bin/cmake ## ## ./build_visit3_0_1 generated host.cmake -## created: Thu Jun 20 10:29:00 PDT 2019 -## system: Linux cori08 4.4.178-94.91-default #1 SMP Thu May 2 20:14:31 UTC 2019 (d683ca1) x86_64 x86_64 x86_64 GNU/Linux +## created: Thu Jul 11 11:03:01 PDT 2019 +## system: Linux cori11 4.4.178-94.91-default #1 SMP Thu May 2 20:14:31 UTC 2019 (d683ca1) x86_64 x86_64 x86_64 GNU/Linux ## by: brugger ## ## Setup VISITHOME & VISITARCH variables. ## -SET(VISITHOME /project/projectdirs/visit/thirdparty_shared/3.0.0) +SET(VISITHOME /project/projectdirs/visit/thirdparty_shared/3.0.1) SET(VISITARCH linux-x86_64_gcc-7.3) VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL) @@ -17,8 +17,8 @@ VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL) VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH) VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH) VISIT_OPTION_DEFAULT(VISIT_FORTRAN_COMPILER no TYPE FILEPATH) -VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden -B/project/projectdirs/visit/thirdparty_shared/3.0.0/binutils/bin" TYPE STRING) -VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden -B/project/projectdirs/visit/thirdparty_shared/3.0.0/binutils/bin" TYPE STRING) +VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden -B/project/projectdirs/visit/thirdparty_shared/3.0.1/binutils/bin" TYPE STRING) +VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden -B/project/projectdirs/visit/thirdparty_shared/3.0.1/binutils/bin" TYPE STRING) ## ## Parallel Build Setup.