Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20181122_020612 branch to master

cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc-cuda.cmake

@@ -102,6 +102,12 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
       "-DTPL_ENABLE_CUSPARSE:BOOL=ON"
       "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
+      # Host Blas is required (https://github.com/kokkos/kokkos-kernels/issues/347) for Kokkos-Kernels to build correctly
+      "-DTPL_ENABLE_BLAS:BOOL=ON"
+      "-DTPL_ENABLE_LAPACK:BOOL=ON"
+      "-DTPL_BLAS_LIBRARIES=/usr/lib64/libblas.so.3.2.1"
+      "-DTPL_LAPACK_LIBRARIES=/usr/lib64/liblapack.so.3.2.1"
+
       ### PACKAGE CONFIGURATION ###
           "-DKokkos_ENABLE_Cuda:BOOL=ON"
           "-DKokkos_ENABLE_Cuda_UVM:BOOL=ON"

cmake/ctest/drivers/rocketman/TrilinosCTestDriverCore.rocketman.gcc.cmake

@@ -88,8 +88,6 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
 
     "-DTrilinos_ENABLE_COMPLEX:BOOL=OFF"
 
-    "-DTrilinos_ENABLE_Fortran=OFF"
-
     "-DHDF5_INCLUDE_DIRS:FILEPATH=$ENV{SEMS_HDF5_ROOT}/include"
     "-DHDF5_LIBRARY_DIRS:FILEPATH=$ENV{SEMS_HDF5_ROOT}/lib"
 

cmake/std/PullRequestLinuxDriver-Test.sh

@@ -147,6 +147,13 @@ elif [ "Trilinos_pullrequest_gcc_4.9.3_SERIAL" == "${JOB_BASE_NAME:?}" ] ; then
         echo -e "There was an issue loading the gcc environment. The error code was: $ierror"
         exit $ierror
     fi
+elif [ "Trilinos_pullrequest_gcc_7.3.0" == "${JOB_BASE_NAME:?}" ] ; then
+    source ${TRILINOS_DRIVER_SRC_DIR}/cmake/std/sems/PullRequestGCC7.3.0TestingEnv.sh
+    ierror=$?
+    if [[ $ierror != 0 ]]; then
+        echo -e "There was an issue loading the gcc environment. The error code was: $ierror"
+        exit $ierror
+    fi
 elif [ "Trilinos_pullrequest_intel_17.0.1" == "${JOB_BASE_NAME:?}" ] ; then
     source ${TRILINOS_DRIVER_SRC_DIR}/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh
     ierror=$?
@@ -230,6 +237,8 @@ else
     elif [ "Trilinos_pullrequest_gcc_4.9.3_SERIAL" == "${JOB_BASE_NAME:?}" ]; then
         # TODO: Update this to use a 4.9.3 SERIAL testing environment script.
         CONFIG_SCRIPT=PullRequestLinuxGCC4.9.3TestingSettingsSERIAL.cmake
+    elif [ "Trilinos_pullrequest_gcc_7.3.0" == "${JOB_BASE_NAME:?}" ]; then
+        CONFIG_SCRIPT=PullRequestLinuxGCC7.3.0TestingSettings.cmake
     fi
 fi
 

cmake/std/PullRequestLinuxGCC7.3.0TestingSettings.cmake

@@ -0,0 +1,22 @@
+# This file contains the options needed to both run the pull request testing
+# for Trilinos for the Linux GCC 7.3.0 pull request testing builds, and to reproduce
+# the errors reported by those builds. Prior to using this this file, the
+# appropriate set of SEMS modules must be loaded and accessible through the
+# SEMS NFS mount. (See the sems/PullRequestGCC*TestingEnv.sh files.)
+
+# Usage: cmake -C PullRequestLinuxGCC7.3.0TestingSettings.cmake
+
+# Misc options typically added by CI testing mode in TriBITS
+
+# Use the below option only when submitting to the dashboard
+#set (CTEST_USE_LAUNCHERS ON CACHE BOOL "Set by default for PR testing")
+
+set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "Set by default for PR testing")
+# NOTE: The above is a workaround for the problem of having threads on MPI
+# ranks bind to the same cores (see #2422).
+
+# Disable just one Teko sub-unit test that fails with openmpi 1.10 (#2712)
+set (Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D ON CACHE BOOL "Temporarily disabled in PR testing")
+
+include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
+

cmake/std/sems/PullRequestGCC7.3.0TestingEnv.sh

@@ -0,0 +1,36 @@
+# This script can be used to load the appropriate environment for the
+# GCC 7.3.0 Pull Request testing build on a Linux machine that has access to
+# the SEMS NFS mount.
+
+# usage: $ source PullRequestGCC7.3.0TestingEnv.sh
+
+source /projects/sems/modulefiles/utils/sems-modules-init.sh
+
+module load sems-gcc/7.3.0
+module load sems-openmpi/1.10.1
+module load sems-python/2.7.9
+module load sems-git/2.10.1
+module load sems-boost/1.63.0/base
+module load sems-zlib/1.2.8/base
+module load sems-hdf5/1.8.12/parallel
+module load sems-netcdf/4.4.1/exo_parallel
+module load sems-parmetis/4.0.3/parallel
+module load sems-scotch/6.0.3/nopthread_64bit_parallel
+module load sems-superlu/4.3/base
+
+# Load the SEMS CMake Module
+# - One of the SEMS modules will load CMake 3.4.x also,
+#   so this will pull in the SEMS cmake 3.10.3 version
+#   for Trilinos compatibility.
+module load sems-cmake/3.10.3
+
+# Using CMake and Ninja modules from the ATDM project space.
+# SEMS does not yet supply a recent enough version of CMake
+# for the single configure/build/test capability. We are also
+# using a custom version of Ninja (with Fortran support not
+# available in main-line Ninja) to significantly speed up
+# compile and link times.
+module load atdm-env
+module load atdm-cmake/3.11.1
+module load atdm-ninja_fortran/1.7.2
+

packages/panzer/adapters-stk/example/CMakeLists.txt

@@ -1,6 +1,7 @@
 ADD_SUBDIRECTORY(square_mesh)
 ADD_SUBDIRECTORY(PoissonExample)
 ADD_SUBDIRECTORY(CurlLaplacianExample)
+ADD_SUBDIRECTORY(MixedCurlLaplacianExample)
 ADD_SUBDIRECTORY(MixedPoissonExample)
 ADD_SUBDIRECTORY(PoissonInterfaceExample)
 ADD_SUBDIRECTORY(assembly_engine)

packages/panzer/adapters-stk/example/MixedCurlLaplacianExample/CMakeLists.txt

@@ -0,0 +1,229 @@
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+SET(ASSEMBLY_EXAMPLE_SOURCES
+  main.cpp
+  )
+
+TRIBITS_ADD_EXECUTABLE(
+  MixedCurlLaplacianExample
+  SOURCES ${ASSEMBLY_EXAMPLE_SOURCES}
+  )
+
+TRIBITS_ADD_ADVANCED_TEST(
+  MixedCurlLaplacianExample
+  EXCLUDE_IF_NOT_TRUE ${${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS}
+  TEST_0 EXEC MixedCurlLaplacianExample
+    ARGS --use-epetra --output-filename="base-curl-test-"
+    PASS_REGULAR_EXPRESSION "ALL PASSED: Epetra"
+    NUM_MPI_PROCS 4
+  TEST_1 EXEC MixedCurlLaplacianExample
+    ARGS --use-tpetra --output-filename="base-curl-test-"
+    PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+    NUM_MPI_PROCS 4
+  COMM mpi
+  )
+
+FOREACH( ORDER 1 2 )
+  TRIBITS_ADD_ADVANCED_TEST(
+    MixedCurlLaplacianExample-ConvTest-Quad-Order-${ORDER}
+    EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS
+    TEST_0 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Quad" --x-elements=4 --y-elements=4 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Quad-${ORDER}-04
+    TEST_1 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Quad" --x-elements=8 --y-elements=8 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Quad-${ORDER}-08
+    TEST_2 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Quad" --x-elements=16 --y-elements=16 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Quad-${ORDER}-16
+    TEST_3 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Quad" --x-elements=32 --y-elements=32 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Quad-${ORDER}-32
+    TEST_4 CMND python
+      ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py
+           ${ORDER}
+           MPE-ConvTest-Quad-${ORDER}-
+           4
+           8
+           16
+           32
+      PASS_REGULAR_EXPRESSION "Test Passed"
+    COMM mpi
+    )
+ENDFOREACH()
+
+FOREACH( ORDER 3 )
+  TRIBITS_ADD_ADVANCED_TEST(
+    MixedCurlLaplacianExample-ConvTest-Quad-Order-${ORDER}
+    EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS
+    TEST_0 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Quad" --x-elements=4 --y-elements=4 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Quad-${ORDER}-04
+    TEST_1 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Quad" --x-elements=8 --y-elements=8 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Quad-${ORDER}-08
+    TEST_2 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Quad" --x-elements=16 --y-elements=16 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Quad-${ORDER}-16
+    TEST_4 CMND python
+      ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py
+           ${ORDER}
+           MPE-ConvTest-Quad-${ORDER}-
+           4
+           8
+           16
+      PASS_REGULAR_EXPRESSION "Test Passed"
+    COMM mpi
+    )
+ENDFOREACH()
+
+FOREACH( ORDER 1 )
+  TRIBITS_ADD_ADVANCED_TEST(
+    MixedCurlLaplacianMultiblockExample-ConvTest-Quad-Order-${ORDER}
+    EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS
+    TEST_0 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --x-blocks=2 --cell="Quad" --x-elements=8 --y-elements=8 --z-elements=4 --basis-order=${ORDER} --output-filename="multiblock-"
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-Multiblock-ConvTest-Quad-${ORDER}-08
+    TEST_1 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --x-blocks=2 --cell="Quad" --x-elements=16 --y-elements=16 --z-elements=4 --basis-order=${ORDER} --output-filename="multiblock-"
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-Multiblock-ConvTest-Quad-${ORDER}-16
+    TEST_2 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --x-blocks=2 --cell="Quad" --x-elements=32 --y-elements=32 --z-elements=4 --basis-order=${ORDER} --output-filename="multiblock-"
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-Multiblock-ConvTest-Quad-${ORDER}-32
+    TEST_3 CMND python
+      ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py
+           ${ORDER}
+           MPE-Multiblock-ConvTest-Quad-${ORDER}-
+           8
+           16
+           32
+      PASS_REGULAR_EXPRESSION "Test Passed"
+    COMM mpi
+    )
+ENDFOREACH()
+
+FOREACH( ORDER 1 )
+  TRIBITS_ADD_ADVANCED_TEST(
+    MixedCurlLaplacianExample-ConvTest-Tri-Order-${ORDER}
+    EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS
+    TEST_0 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Tri" --x-elements=8 --y-elements=8 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Tri-${ORDER}-08
+    TEST_1 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Tri" --x-elements=16 --y-elements=16 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Tri-${ORDER}-16
+    TEST_2 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Tri" --x-elements=32 --y-elements=32 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Tri-${ORDER}-32
+    TEST_3 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Tri" --x-elements=64 --y-elements=64 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Tri-${ORDER}-64
+    TEST_4 CMND python
+      ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py
+           ${ORDER}
+           MPE-ConvTest-Tri-${ORDER}-
+           8
+           16
+           32
+           64
+      PASS_REGULAR_EXPRESSION "Test Passed"
+    COMM mpi
+    )
+ENDFOREACH()
+
+FOREACH( ORDER 2 )
+  TRIBITS_ADD_ADVANCED_TEST(
+    MixedCurlLaplacianExample-ConvTest-Tri-Order-${ORDER}
+    EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS
+    TEST_0 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Tri" --x-elements=4 --y-elements=4 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Tri-${ORDER}-04
+    TEST_1 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Tri" --x-elements=8 --y-elements=8 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Tri-${ORDER}-08
+    TEST_2 EXEC MixedCurlLaplacianExample
+      ARGS --use-tpetra --use-twod --cell="Tri" --x-elements=16 --y-elements=16 --z-elements=4 --basis-order=${ORDER}
+      PASS_REGULAR_EXPRESSION "ALL PASSED: Tpetra"
+      NUM_MPI_PROCS 4
+      OUTPUT_FILE MPE-ConvTest-Tri-${ORDER}-16
+    TEST_3 CMND python
+      ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py
+           ${ORDER}
+           MPE-ConvTest-Tri-${ORDER}-
+           4
+           8
+           16
+      PASS_REGULAR_EXPRESSION "Test Passed"
+    COMM mpi
+    )
+ENDFOREACH()
+
+# FOREACH( ORDER 1 2 3 4 )
+#   TRIBITS_ADD_ADVANCED_TEST(
+#     CurlLaplacianExample-ConvTest-Hex-Order-${ORDER}
+#     EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS
+#     TEST_0 EXEC CurlLaplacianExample
+#       ARGS --use-epetra --use-threed --x-elements=4 --y-elements=4 --z-elements=4 --basis-order=${ORDER} --
+#       PASS_REGULAR_EXPRESSION "ALL PASSED: Epetra"
+#       NUM_MPI_PROCS 4
+#       OUTPUT_FILE MPE-ConvTest-Hex-${ORDER}-04
+#     TEST_1 EXEC CurlLaplacianExample
+#       ARGS --use-epetra --use-threed --x-elements=8 --y-elements=8 --z-elements=4 --basis-order=${ORDER}
+#       PASS_REGULAR_EXPRESSION "ALL PASSED: Epetra"
+#       NUM_MPI_PROCS 4
+#       OUTPUT_FILE MPE-ConvTest-Hex-${ORDER}-08
+#     TEST_2 EXEC CurlLaplacianExample
+#       ARGS --use-epetra --use-threed --x-elements=16 --y-elements=16 --z-elements=4 --basis-order=${ORDER}
+#       PASS_REGULAR_EXPRESSION "ALL PASSED: Epetra"
+#       NUM_MPI_PROCS 4
+#       OUTPUT_FILE MPE-ConvTest-Hex-${ORDER}-16
+#     TEST_3 EXEC CurlLaplacianExample
+#       ARGS --use-epetra --use-threed --x-elements=32 --y-elements=32 --z-elements=4 --basis-order=${ORDER}
+#       PASS_REGULAR_EXPRESSION "ALL PASSED: Epetra"
+#       NUM_MPI_PROCS 4
+#       OUTPUT_FILE MPE-ConvTest-Hex-${ORDER}-32
+#     TEST_4 CMND python
+#       ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py
+#            ${ORDER}
+#            MPE-ConvTest-Hex-${ORDER}-
+#            4
+#            8
+#            16
+#            32
+#       PASS_REGULAR_EXPRESSION "Test Passed"
+#     COMM mpi
+#     )
+# ENDFOREACH()