diff --git a/src/config-site/kickit.mesagl.cmake b/src/config-site/kickit.mesagl.cmake index 16644d28c71..be241dfb3af 100644 --- a/src/config-site/kickit.mesagl.cmake +++ b/src/config-site/kickit.mesagl.cmake @@ -1,15 +1,15 @@ -#/usr/gapps/visit/thirdparty_shared/3.1.1/mesagl/cmake/3.9.3/linux-x86_64_gcc-4.8/bin/cmake +#/usr/gapps/visit/thirdparty_shared/3.2.0/mesagl/cmake/3.14.7/linux-x86_64_gcc-9.1/bin/cmake ## -## ./build_visit3_1_3 generated host.cmake -## created: Thu Sep 24 08:28:12 PDT 2020 -## system: Linux kickit 3.10.0-1127.19.1.el7.x86_64 #1 SMP Tue Aug 11 19:12:04 EDT 2020 x86_64 x86_64 x86_64 GNU/Linux +## ./build_visit3_2_0 generated host.cmake +## created: Fri Apr 2 07:05:49 PDT 2021 +## system: Linux kickit 3.10.0-1160.15.2.el7.x86_64 #1 SMP Thu Jan 21 16:15:07 EST 2021 x86_64 x86_64 x86_64 GNU/Linux ## by: brugger1 ## ## Setup VISITHOME & VISITARCH variables. ## -SET(VISITHOME /usr/gapps/visit/thirdparty_shared/3.1.1/mesagl) -SET(VISITARCH linux-x86_64_gcc-4.8) +SET(VISITHOME /usr/gapps/visit/thirdparty_shared/3.2.0/mesagl) +SET(VISITARCH linux-x86_64_gcc-9.1) VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL) ## Compiler flags. @@ -25,7 +25,7 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS "-std=c++11 -m64 -fPIC -fvisibility=hidden ## VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL) ## (configured w/ mpi compiler wrapper) -VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /usr/gapps/visit/thirdparty_shared/3.1.1/mesagl/mpich/3.3.1/linux-x86_64_gcc-4.8/bin/mpicc TYPE FILEPATH) +VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /usr/gapps/visit/thirdparty_shared/3.2.0/mesagl/mpich/3.3.1/linux-x86_64_gcc-9.1/bin/mpicc TYPE FILEPATH) ## ## VisIt Thread Option @@ -59,23 +59,22 @@ VISIT_OPTION_DEFAULT(VISIT_OPENSSL_DIR ${VISITHOME}/openssl/1.0.2j/${VISITARCH}) ## ## Python ## -VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.14/${VISITARCH}) -VISIT_OPTION_DEFAULT(VISIT_PYTHON3_DIR ${VISITHOME}/python/3.7.5/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/3.7.7/${VISITARCH}) ## ## LLVM ## -VISIT_OPTION_DEFAULT(VISIT_LLVM_DIR ${VISITHOME}/llvm/5.0.0/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_LLVM_DIR ${VISITHOME}/llvm/6.0.1/${VISITARCH}) ## ## MesaGL ## -VISIT_OPTION_DEFAULT(VISIT_MESAGL_DIR ${VISITHOME}/mesagl/17.2.8/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_MESAGL_DIR ${VISITHOME}/mesagl/17.3.9/${VISITARCH}) ## ## Qt ## -SETUP_APP_VERSION(QT 5.10.1) +SETUP_APP_VERSION(QT 5.14.2) VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/qt/${QT_VERSION}/${VISITARCH}) ## @@ -93,9 +92,8 @@ VISIT_OPTION_DEFAULT(VISIT_ISPC_DIR ${VISITHOME}/ispc/${ISPC_VERSION}/${VISITARC ## ## TBB ## -set(TBB_VERSION tbb2018_20171205oss) -VISIT_OPTION_DEFAULT(TBB_ROOT ${VISITHOME}/tbb/${TBB_VERSION}/${VISITARCH}) -VISIT_OPTION_DEFAULT(VISIT_TBB_DIR ${VISITHOME}/tbb/${TBB_VERSION}/${VISITARCH}) +VISIT_OPTION_DEFAULT(TBB_ROOT ${VISITHOME}/tbb/tbb2018_20171205oss/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_TBB_DIR ${VISITHOME}/tbb/tbb2018_20171205oss/${VISITARCH}) ## ## EMBREE @@ -149,14 +147,6 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_MPI_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/li SETUP_APP_VERSION(ADIOS 1.13.1) VISIT_OPTION_DEFAULT(VISIT_ADIOS_DIR ${VISITHOME}/adios/${ADIOS_VERSION}/${VISITARCH}) -## -## ADIOS2 -## -SETUP_APP_VERSION(ADIOS2 2.5.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}) - ## ## AdvIO ## @@ -181,15 +171,21 @@ VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio/3006/${VISITARCH}) ## ## CGNS ## -VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/3.2.1/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/4.1.0/${VISITARCH}) VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING) ## ## Conduit ## -VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.4.0/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.7.1/${VISITARCH}) VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING) +## +## FMS +## +VISIT_OPTION_DEFAULT(VISIT_FMS_DIR ${VISITHOME}/fms/100/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_FMS_LIBDEP CONDUIT_LIBRARY_DIR conduit CONDUIT_LIBRARY_DIR conduit_blueprint CONDUIT_LIBRARY_DIR conduit_relay ${VISIT_CONDUIT_LIBDEP} TYPE STRING) + ## ## GDAL ## @@ -209,15 +205,15 @@ VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.5/${VISITARCH}) VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH}/lib vtkjpeg-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} TYPE STRING) ## -## Ice-T +## IceT ## VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/77c708f9090236b576669b74c53e9f105eedbd7e/${VISITARCH}) ## ## MFEM ## -VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/4.0/${VISITARCH}) -VISIT_OPTION_DEFAULT(VISIT_MFEM_INCDEP CONDUIT_INCLUDE_DIR TYPE STRING) +VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/Add_FMS_support/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_MFEM_INCDEP CONDUIT_INCLUDE_DIR FMS_INCLUDE_DIR TYPE STRING) VISIT_OPTION_DEFAULT(VISIT_MFEM_LIBDEP ${VISIT_CONDUIT_LIBDEP} ${VISITHOME}/zlib/${ZLIB_VERSION}/${VISITARCH}/lib z TYPE STRING) ## @@ -256,6 +252,13 @@ VISIT_OPTION_DEFAULT(VISIT_SEVEN_ZIP_DIR ${VISITHOME}/p7zip/16.02/${VISITARCH}) SETUP_APP_VERSION(PIDX 0.9.3) VISIT_OPTION_DEFAULT(VISIT_PIDX_DIR ${VISITHOME}/pidx/${PIDX_VERSION}/${VISITARCH}) +## +## PySide +## +# version is needed by VisIt's Find module. +set(PYSIDE_VERSION 5.14.2) +VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/${PYSIDE_VERSION}/${VISITARCH}) + ## ## Silo ## @@ -271,12 +274,12 @@ VISIT_OPTION_DEFAULT(VISIT_UINTAH_DIR ${VISITHOME}/uintah/${UINTAH_VERSION}/${VI ## ## VTKM ## -VISIT_OPTION_DEFAULT(VISIT_VTKM_DIR ${VISITHOME}/vtkm/0d141c/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_VTKM_DIR ${VISITHOME}/vtkm/a3b852/${VISITARCH}) ## ## VTKH ## -VISIT_OPTION_DEFAULT(VISIT_VTKH_DIR ${VISITHOME}/vtkh/2ce3fa/${VISITARCH}) +VISIT_OPTION_DEFAULT(VISIT_VTKH_DIR ${VISITHOME}/vtkh/v0.6.6/${VISITARCH}) ## ## Xdmf diff --git a/src/tools/dev/scripts/bv_support/bv_qt.sh b/src/tools/dev/scripts/bv_support/bv_qt.sh index b19c8200738..b26f16fc8b2 100644 --- a/src/tools/dev/scripts/bv_support/bv_qt.sh +++ b/src/tools/dev/scripts/bv_support/bv_qt.sh @@ -206,13 +206,18 @@ function qt_license_prompt function apply_qt_patch { - if [[ "$DO_MESAGL" == "yes" ]] ; then - if [[ ${QT_VERSION} == 5.14.2 ]] ; then - if [[ "$OPSYS" == "Linux" ]]; then + if [[ ${QT_VERSION} == 5.14.2 ]] ; then + if [[ "$OPSYS" == "Linux" ]]; then + if [[ "$DO_MESAGL" == "yes" ]] ; then apply_qt_5142_linux_mesagl_patch if [[ $? != 0 ]] ; then return 1 fi + else + apply_qt_5142_linux_opengl_patch + if [[ $? != 0 ]] ; then + return 1 + fi fi fi fi @@ -272,9 +277,10 @@ diff -c qtbase/mkspecs/linux-icc-64/qmake.conf.orig qtbase/mkspecs/linux-icc-64/ ! EOF if [[ $? != 0 ]] ; then - warn "qt 5.14.2 linux mesagl patch 2failed." + warn "qt 5.14.2 linux mesagl patch 2 failed." return 1 fi + patch -p0 < kickit #!/bin/sh ./visit-install -private -c llnl_open -g visit -b wbronze -gw -l $ver linux-x86_64-rhel7 /usr/gapps/visit > installlog 2>&1 +cp /usr/gapps/gcc/gcc-9.1/lib64/libstdc++.so.6.0.26 /usr/gapps/visit/$ver+/linux-x86_64/lib +ln -s libstdc++.so.6.0.26 /usr/gapps/visit/$ver+/linux-x86_64/lib/libstdc++.so +ln -s libstdc++.so.6.0.26 /usr/gapps/visit/$ver+/linux-x86_64/lib/libstdc++.so.6 +chgrp visit /usr/gapps/visit/$ver+/linux-x86_64/lib/libstdc++.so.6.0.26 +chmod 664 /usr/gapps/visit/$ver+/linux-x86_64/lib/libstdc++.so.6.0.26 rm -f resultlog echo " install of visit on kickit" > resultlog 2>&1 echo " ----------------------------" >> resultlog 2>&1 @@ -296,12 +301,12 @@ if [ $kickit = true ] then if [ $test = no ] then - scp kickit:/home/$user/kickit/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-rhel7.tar.gz - scp kickit:/home/$user/kickit/visitbuild/visit$ver2.linux-x86_64-wmesa.tar.gz visit$ver2.linux-x86_64-rhel7-wmesa.tar.gz - scp visit$ver2.linux-x86_64-rhel7.tar.gz kickit:visit$ver2.linux-x86_64-rhel7.tar.gz - scp visit-install kickit: - scp kickit kickit:kickit_install - ssh kickit "chmod 750 kickit_install;./kickit_install" + cp /home/$user/kickit/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-rhel7.tar.gz + cp /home/$user/kickit/visitbuild/visit$ver2.linux-x86_64-wmesa.tar.gz visit$ver2.linux-x86_64-rhel7-wmesa.tar.gz + cp visit$ver2.linux-x86_64-rhel7.tar.gz ~/visit$ver2.linux-x86_64-rhel7.tar.gz + cp visit-install ~ + cp kickit ~/kickit_install + echo "cd;chmod 750 kickit_install;./kickit_install" | bash & fi fi