diff --git a/cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_dbg.sh b/cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_dbg.sh similarity index 100% rename from cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_dbg.sh rename to cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_dbg.sh diff --git a/cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_opt.sh b/cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_opt.sh similarity index 100% rename from cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_opt.sh rename to cmake/ctest/drivers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_opt.sh diff --git a/cmake/std/atdm/common/toss3/environment_new.sh b/cmake/std/atdm/common/toss3/environment_new.sh index 7577f41c60fc..caafdbcdc2b2 100755 --- a/cmake/std/atdm/common/toss3/environment_new.sh +++ b/cmake/std/atdm/common/toss3/environment_new.sh @@ -35,13 +35,13 @@ fi sparc_tpl_base=${ATDM_CONFIG_SPARC_TPL_BASE} module load cmake/3.12.2 -if [ "$ATDM_CONFIG_COMPILER" == "INTEL-18.0.2_OPENMPI-2.0.3" ]; then +if [ "$ATDM_CONFIG_COMPILER" == "INTEL-18.0.2_OPENMPI-4.0.1" ]; then module load intel/18.0.2.199 module load mkl/18.0.5.274 # Needed to address defect in MKL (#5316, #3992, #3914) - module load openmpi-intel/2.0 + module load openmpi-intel/4.0 - sparc_tpl_ext=cts1-bdw_intel-18.0.2 - sparc_tpl_mpi_ext=cts1-bdw_intel-18.0.2_openmpi-2.0.3 + sparc_tpl_ext=cts1-bdw_intel-19.0.5 + sparc_tpl_mpi_ext=cts1-bdw_intel-19.0.5_openmpi-4.0.1 # rabartl: ToDo: Above, we need to find a way to extract 'cts1-bdw' out of # this file for this to be general! @@ -79,16 +79,16 @@ export OMPI_FC=`which ifort` export ATDM_CONFIG_LAPACK_LIBS="-mkl" export ATDM_CONFIG_BLAS_LIBS="-mkl" -export BOOST_ROOT=${sparc_tpl_base}/boost-1.65.1/00000000/${sparc_tpl_ext} +export BOOST_ROOT=${sparc_tpl_base}/boost-1.72.0/00000000/${sparc_tpl_ext} export HDF5_ROOT=${sparc_tpl_base}/hdf5-1.10.5/00000000/${sparc_tpl_mpi_ext} -export CGNS_ROOT=${sparc_tpl_base}/cgns-c09a5cd/27e5681f1b74c679b5dcb337ac71036d16c47977/${sparc_tpl_mpi_ext} -export PNETCDF_ROOT=${sparc_tpl_base}/pnetcdf-1.10.0/6144dc67b2041e4093063a04e89fc1e33398bd09/${sparc_tpl_mpi_ext} -export NETCDF_ROOT=${sparc_tpl_base}/netcdf-4.7.0/58bc48d95be2cc9272a18488fea52e1be1f0b42a/${sparc_tpl_mpi_ext} +export CGNS_ROOT=${sparc_tpl_base}/cgns-c09a5cd/d313cc2f822078e47c7dbdee074ecb0431e573eb/${sparc_tpl_mpi_ext} +export PNETCDF_ROOT=${sparc_tpl_base}/pnetcdf-1.12.1/6144dc67b2041e4093063a04e89fc1e33398bd09/${sparc_tpl_mpi_ext} +export NETCDF_ROOT=${sparc_tpl_base}/netcdf-4.7.0/24baa07a3fa1ff9dbc8e70dc591ebbdec56783b2/${sparc_tpl_mpi_ext} export PARMETIS_ROOT=${sparc_tpl_base}/parmetis-4.0.3/00000000/${sparc_tpl_mpi_ext} export METIS_ROOT=${sparc_tpl_base}/parmetis-4.0.3/00000000/${sparc_tpl_mpi_ext} export LIBHIO_ROOT=${sparc_tpl_base}/libhio-1.4.1.2/00000000/${sparc_tpl_mpi_ext} -export EUCLID_ROOT=${sparc_tpl_base}/euclid-19.30/95b8242ad729449fdb86591b9643c11463b61fa2/${sparc_tpl_mpi_ext} -export SGM_ROOT=${sparc_tpl_base}/sgm-19.30/00000000/${sparc_tpl_mpi_ext} +export EUCLID_ROOT=${sparc_tpl_base}/euclid-20.23/8b68b12f72b59648c9a0a962a6d55ea978199860/${sparc_tpl_mpi_ext} +export SGM_ROOT=${sparc_tpl_base}/sgm-20.23/00000000/${sparc_tpl_mpi_ext} export SUPERLUDIST_ROOT=${sparc_tpl_base}/superlu_dist-5.4.0/a3121eaff44f7bf7d44e625c3b3d2a9911e58876/${sparc_tpl_mpi_ext} export ATDM_CONFIG_USE_HWLOC=OFF diff --git a/cmake/std/atdm/cts1/all_supported_builds.sh b/cmake/std/atdm/cts1/all_supported_builds.sh index b7d69fd8887b..e47fe5bfd842 100644 --- a/cmake/std/atdm/cts1/all_supported_builds.sh +++ b/cmake/std/atdm/cts1/all_supported_builds.sh @@ -2,8 +2,8 @@ export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm- export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=( - cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_dbg - cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_opt + cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_dbg + cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_opt cts1-intel-19.0.5_openmpi-4.0.1_openmp_static_dbg cts1-intel-19.0.5_openmpi-4.0.1_openmp_static_opt ) diff --git a/cmake/std/atdm/cts1/custom_builds.sh b/cmake/std/atdm/cts1/custom_builds.sh index ef7da19ddfff..d6d92c3e480c 100644 --- a/cmake/std/atdm/cts1/custom_builds.sh +++ b/cmake/std/atdm/cts1/custom_builds.sh @@ -14,13 +14,13 @@ if [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19.0.5-openmpi-4.0.1"* ]] \ || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19"* ]] \ ; then export ATDM_CONFIG_COMPILER=INTEL-19.0.5_OPENMPI-4.0.1 -elif [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2-openmpi-2.0.3"* ]] \ - || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2_openmpi-2.0.3"* ]] \ +elif [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2-openmpi-4.0.1"* ]] \ + || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2_openmpi-4.0.1"* ]] \ || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2"* ]] \ || [[ $ATDM_CONFIG_BUILD_NAME == *"intel"* ]] \ || [[ $ATDM_CONFIG_BUILD_NAME == *"default" ]] \ ; then - export ATDM_CONFIG_COMPILER=INTEL-18.0.2_OPENMPI-2.0.3 + export ATDM_CONFIG_COMPILER=INTEL-18.0.2_OPENMPI-4.0.1 else echo echo "***" @@ -28,7 +28,7 @@ else echo "***" echo "*** Supported compilers include:" echo "***" - echo "**** intel-18.0.2_openmpi-2.0.3 (default)" + echo "**** intel-18.0.2_openmpi-4.0.1 (default)" echo "**** intel-19.0.5_openmpi-4.0.1" echo "***" return