Skip to content

Commit

Permalink
Merge Pull Request #6140 from trilinos/Trilinos/master_merge_20191023…
Browse files Browse the repository at this point in the history 
…_000620

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20191023_000620 branch to master
PR Author: trilinos-autotester
  • Loading branch information
@trilinos-autotester
trilinos-autotester authored Oct 23, 2019
2 parents b43b761 + b3db9c1 commit 6605279
Show file tree
Hide file tree
Showing 283 changed files with 4,299 additions and 4,294 deletions.
76 changes: 75 additions & 1 deletion cmake/RepositoryDependenciesSetup.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,78 @@ if (TPL_ENABLE_CUDA AND NOT Kokkos_ENABLE_Cuda_Relocatable_Device_Code)
elseif (${PROJECT_NAME}_ENABLE_ShyLU_NodeTacho)
message(FATAL_ERROR "ERROR: ${PROJECT_NAME}_ENABLE_ShyLU_NodeTacho=ON but TPL_ENABLE_CUDA='${TPL_ENABLE_CUDA}' AND Kokkos_ENABLE_Cuda_Relocatable_Device_Code='${Kokkos_ENABLE_Cuda_Relocatable_Device_Code}' which is not allowed!")
endif()
endif()
endif()

#########################################################################
# STKBalance does not work with GO=INT or GO=UNSIGNED
# Note and disable it if it was set as a dependence of STK
# Error out if it was explicitly requested by user

IF ((NOT ("${Tpetra_ENABLE_DEPRECATED_CODE}" STREQUAL "")) # Remove this test
AND # when removing
(NOT Tpetra_ENABLE_DEPRECATED_CODE)) # Tpetra DEPRECATED
# code
SET(KDD_ENABLE_DEPRECATED OFF) # Remove this line when DEPRECATED is removed
SET(KDD_INT_INT OFF) # Current default
ELSE() # Remove this "else" section when Tpetra DEPRECATED code is removed
SET(KDD_ENABLE_DEPRECATED ON) # Remove this line when DEPRECATED is removed
SET(KDD_INT_INT ON) # Deprecated default
ENDIF()

SET(KDD_INT_UNSIGNED OFF) # Current default
SET(KDD_INT_LONG OFF) # Current default
SET(KDD_INT_LONG_LONG ON) # Current default

IF (NOT ("${Tpetra_INST_INT_INT}" STREQUAL ""))
SET(KDD_INT_INT ${Tpetra_INST_INT_INT})
if (${KDD_INT_INT} # Keep this test but
AND (NOT ${KDD_ENABLE_DEPRECATED})) # remove this test when DEPRECATED
# is removed
SET(KDD_INT_LONG_LONG OFF)
ENDIF()
ENDIF()

IF(NOT ("${Tpetra_INST_INT_UNSIGNED}" STREQUAL ""))
SET(KDD_INT_UNSIGNED ${Tpetra_INST_INT_UNSIGNED})
if (${KDD_INT_UNSIGNED} # Keep this test but
AND (NOT ${KDD_ENABLE_DEPRECATED})) # remove this test when DEPRECATED
# is removed
SET(KDD_INT_LONG_LONG OFF)
ENDIF()
ENDIF()

IF(NOT ("${Tpetra_INST_INT_LONG}" STREQUAL ""))
SET(KDD_INT_LONG ${Tpetra_INST_INT_LONG})
if (${KDD_INT_LONG} # Keep this test but
AND (NOT ${KDD_ENABLE_DEPRECATED})) # remove this test when DEPRECATED
# is removed
SET(KDD_INT_LONG_LONG OFF)
ENDIF()
ENDIF()

IF(NOT ("${Tpetra_INST_INT_LONG_LONG}" STREQUAL ""))
SET(KDD_INT_LONG_LONG ${Tpetra_INST_INT_LONG_LONG})
ENDIF()

IF ((NOT ${KDD_INT_LONG}) AND (NOT ${KDD_INT_LONG_LONG}))
IF ("${${PROJECT_NAME}_ENABLE_STKBalance}" STREQUAL "")
# STKBalance may be enabled but only implicitly (as a dependence of STK);
# give a message but turn off STKBalance support
MESSAGE("NOTE: int global indices are enabled in Trilinos. "
"Because STKBalance requires long or long long "
"global indices, STKBalance will be disabled. "
"To make this warning go away, do not request "
"int global indices in Trilinos (that is, do not "
"set Tpetra_INST_INT_INT=ON or "
"Tpetra_INST_INT_UNSIGNED=ON)." )
SET(${PROJECT_NAME}_ENABLE_STKBalance OFF)
ELSEIF (${PROJECT_NAME}_ENABLE_STKBalance)
# STKBalance was explicitly enabled by the user, so error out
MESSAGE(FATAL_ERROR
"STKBalance requires long or long long global indices, "
"but Trilinos is using int indices "
"(likely via Tpetra_INST_INT_INT or Tpetra_INST_INT_UNSIGNED). "
"Disable STKBalance or specify Tpetra_INST_INT_LONG_LONG.")
ENDIF()
ENDIF()

4 changes: 3 additions & 1 deletion cmake/ctest/drivers/rocketman/TrilinosCTestDriverCore.rocketman.gcc.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,13 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
${EXTRA_SYSTEM_CONFIGURE_OPTIONS}
"-DTPL_ENABLE_MPI=ON"
"-DMPI_BASE_DIR:PATH=$ENV{SEMS_OPENMPI_ROOT}"
"-DMPI_EXEC_POST_NUMPROCS_FLAGS:STRING=--bind-to\\\;socket\\\;--map-by\\\;socket"
"-DTPL_BLAS_LIBRARIES=/usr/lib64/libblas.so.3.2.1"
"-DTPL_LAPACK_LIBRARIES=/usr/lib64/liblapack.so.3.2.1"
)

#NUMA memory binding doesn't work on rocketman currently; TODO: get libnumactl and enable binding again
#"-DMPI_EXEC_POST_NUMPROCS_FLAGS:STRING=--bind-to\\\;core\\\;--map-by\\\;core"

SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS
"--gen-suppressions=all --error-limit=no --log-file=nightly_suppressions.txt" ${CTEST_MEMORYCHECK_COMMAND_OPTIONS} )

Expand Down
14 changes: 10 additions & 4 deletions ...drivers/rocketman/ctest_linux_experimental_mpi_release_tpetra_performance_rocketman.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,23 @@ SET(CTEST_TEST_TYPE Experimental)
SET(Trilinos_TRACK Experimental) # Set the CDash track to Nightly
SET(CTEST_TEST_TIMEOUT 14400) # twice the default value, for valgrind
SET(CTEST_DO_MEMORY_TESTING FALSE)

SET(Trilinos_PACKAGES Tpetra)
SET(Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES FALSE)
SET(Trilinos_DISABLE_ENABLED_FORWARD_DEP_PACKAGES TRUE)
SET(Trilinos_PACKAGES "Tpetra;Galeri;MueLu")
SET(Trilinos_EXCLUDE_PACKAGES "Sacado;RTOp;Stratimikos;Shards;TrilinosSS;Epetra")

# If true, this option yields faster builds. In that case, however, it won't disable any upstream package that fails to compile.
SET(Trilinos_CTEST_DO_ALL_AT_ONCE TRUE)

SET(EXTRA_CONFIGURE_OPTIONS
"-DTrilinos_ENABLE_DEPENDENCY_UNIT_TESTS=OFF"
"-DTrilinos_TEST_CATEGORIES:STRING=PERFORMANCE"
"-DMPI_EXEC_MAX_NUMPROCS=36"
"-DMPI_EXEC_DEFAULT_NUMPROCS=36"
"-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION=ON"
"-DXpetra_ENABLE_Experimental:BOOL=ON"
"-DMueLu_ENABLE_Experimental:BOOL=ON"
"-DMueLu_ENABLE_TESTS=ON"
"-DMPI_EXEC_MAX_NUMPROCS=28"
"-DMPI_EXEC_DEFAULT_NUMPROCS=28"
)

#
Expand Down
82 changes: 24 additions & 58 deletions cmake/std/atdm/ATDMDevEnvSettings.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ ELSE()
SET(ATDM_KOKKOS_SERIAL ON)
ENDIF()

# ATDM_CMAKE_BUILD_TYPE and ATDM_BOUNDS_CHECK
# ATDM_CMAKE_BUILD_TYPE and ATDM_BOUNDS_CHECK (Trilinos_ENABLE_DEBUG)

IF ("$ENV{ATDM_CONFIG_BUILD_TYPE}" STREQUAL "RELEASE-DEBUG")
SET(ATDM_CMAKE_BUILD_TYPE RELEASE)
SET(ATDM_BOUNDS_CHECK ON)
Expand All @@ -93,6 +94,8 @@ ELSE()
)
ENDIF()

ATDM_SET_CACHE(Trilinos_ENABLE_DEBUG "${ATDM_BOUNDS_CHECK}" CACHE BOOL)

ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS "")
ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(SHARED_LIBS OFF)
ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(PT_PACKAGES OFF)
Expand Down Expand Up @@ -120,6 +123,10 @@ IF(ATDM_CONFIG_KOKKOS_ARCH_JOB_NAME_KEYS)
_${ATDM_CONFIG_KOKKOS_ARCH_JOB_NAME_KEYS})
ENDIF()

# To be used in Tweaks.cmake files logic
SET(ATDM_COMPILER "$(ENV{ATDM_CONFIG_COMPILER}")
SET(ATDM_KOKKOS_ARCH_JOB_NAME_KEYS ${ATDM_CONFIG_KOKKOS_ARCH_JOB_NAME_KEYS})

SET(ATDM_BUILD_NAME_KEYS_STR
"$ENV{ATDM_CONFIG_COMPILER}_$ENV{ATDM_CONFIG_BUILD_TYPE}_${ATDM_NODE_TYPE}${ATDM_CONFIG_KOKKOS_ARCH_JOB_NAME_KEYS}")
PRINT_VAR(ATDM_BUILD_NAME_KEYS_STR)
Expand All @@ -131,17 +138,21 @@ ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(MPI_EXEC_NUMPROCS_FLAG -np)
# B) Look for tweaks file(s) for this build and load the file(s) if it exists
#

SET(ATDM_TWEAKS_FILE_DEFAULT_DEFAULT
"${CMAKE_CURRENT_LIST_DIR}/$ENV{ATDM_CONFIG_SYSTEM_NAME}/tweaks/${ATDM_BUILD_NAME_KEYS_STR}.cmake")
IF (EXISTS "${ATDM_TWEAKS_FILE_DEFAULT_DEFAULT}")
SET(ATDM_TWEAKS_FILES_DEFAULT "${ATDM_TWEAKS_FILE_DEFAULT_DEFAULT}")
ELSE()
SET(ATDM_TWEAKS_FILES_DEFAULT "")
ENDIF()
SET(ATDM_DEFAULT_TWEAK_FILES
"${CMAKE_CURRENT_LIST_DIR}/$ENV{ATDM_CONFIG_SYSTEM_NAME}/tweaks/${ATDM_BUILD_NAME_KEYS_STR}.cmake"
"${CMAKE_CURRENT_LIST_DIR}/$ENV{ATDM_CONFIG_SYSTEM_NAME}/tweaks/Tweaks.cmake"
)

SET(ATDM_TWEAKS_FILES_DEFAULT "")
FOREACH(ATDM_DEFAULT_TWEAK_FILE ${ATDM_DEFAULT_TWEAK_FILES})
IF (EXISTS "${ATDM_DEFAULT_TWEAK_FILE}")
LIST(APPEND ATDM_TWEAKS_FILES_DEFAULT "${ATDM_DEFAULT_TWEAK_FILE}")
ENDIF()
ENDFOREACH()

ADVANCED_SET(ATDM_TWEAKS_FILES "${ATDM_TWEAKS_FILES_DEFAULT}"
CACHE FILEPATH
"Extra *.cmake file to include to define tweaks for this ATDM build ${ATDM_BUILD_NAME_KEYS_STR}"
"Extra *.cmake file(s) to include to define tweaks for this ATDM build ${ATDM_BUILD_NAME_KEYS_STR}"
)
PRINT_VAR(ATDM_TWEAKS_FILES)

Expand Down Expand Up @@ -257,7 +268,6 @@ ATDM_SET_CACHE(MPI_EXEC_NUMPROCS_FLAG "${ATDM_MPI_EXEC_NUMPROCS_FLAG}" CACHE STR
ATDM_SET_CACHE(MPI_EXEC_POST_NUMPROCS_FLAGS "$ENV{ATDM_CONFIG_MPI_POST_FLAGS}"
CACHE STRING)
ATDM_SET_CACHE(Trilinos_VERBOSE_CONFIGURE OFF CACHE BOOL)
ATDM_SET_CACHE(Trilinos_ENABLE_DEBUG "${ATDM_BOUNDS_CHECK}" CACHE BOOL)
ATDM_SET_CACHE(Trilinos_ENABLE_EXPLICIT_INSTANTIATION ON CACHE BOOL)
ATDM_SET_CACHE(Trilinos_ENABLE_INSTALL_CMAKE_CONFIG_FILES ON CACHE BOOL)
ATDM_SET_CACHE(Trilinos_ENABLE_DEVELOPMENT_MODE OFF CACHE BOOL)
Expand All @@ -271,8 +281,8 @@ ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_Relocatable_Device_Code "$ENV{ATDM_CONFIG_CUDA
CACHE BOOL)
ATDM_SET_CACHE(Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA ON CACHE BOOL)
ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_Lambda "${ATDM_USE_CUDA}" CACHE BOOL)
ATDM_SET_CACHE(Kokkos_ENABLE_Debug_Bounds_Check "${ATDM_BOUNDS_CHECK}" CACHE BOOL)
ATDM_SET_CACHE(KOKKOS_ENABLE_DEBUG "${ATDM_BOUNDS_CHECK}" CACHE BOOL)
ATDM_SET_CACHE(Kokkos_ENABLE_Debug_Bounds_Check "${Trilinos_ENABLE_DEBUG}" CACHE BOOL)
ATDM_SET_CACHE(KOKKOS_ENABLE_DEBUG "${Trilinos_ENABLE_DEBUG}" CACHE BOOL)
ATDM_SET_CACHE(KOKKOS_ARCH "$ENV{ATDM_CONFIG_KOKKOS_ARCH}" CACHE STRING)
ATDM_SET_CACHE(EpetraExt_ENABLE_HDF5 OFF CACHE BOOL)
ATDM_SET_CACHE(Panzer_ENABLE_FADTYPE "Sacado::Fad::DFad<RealType>" CACHE STRING)
Expand All @@ -282,6 +292,7 @@ ATDM_SET_CACHE(Tpetra_INST_CUDA "${ATDM_USE_CUDA}" CACHE BOOL)
ATDM_SET_CACHE(Tpetra_INST_SERIAL "${ATDM_INST_SERIAL}" CACHE BOOL)
ATDM_SET_CACHE(Tpetra_INST_INT_INT OFF CACHE BOOL)
ATDM_SET_CACHE(Xpetra_ENABLE_Epetra OFF CACHE BOOL)
ATDM_SET_CACHE(Amesos2_ENABLE_Epetra OFF CACHE BOOL)
ATDM_SET_CACHE(MueLu_ENABLE_Kokkos_Refactor_Use_By_Default ON CACHE BOOL)
ATDM_SET_CACHE(MueLu_ENABLE_Epetra OFF CACHE BOOL)
ATDM_SET_CACHE(Piro_ENABLE_MueLu OFF CACHE BOOL)
Expand All @@ -292,7 +303,6 @@ ATDM_SET_CACHE(DART_TESTING_TIMEOUT 600 CACHE STRING)
IF (ATDM_ENABLE_SPARC_SETTINGS)
ATDM_SET_CACHE(Zoltan_ENABLE_ULLONG_IDS ON CACHE BOOL)
ATDM_SET_CACHE(Anasazi_ENABLE_RBGen ON CACHE BOOL)
ATDM_SET_CACHE(Amesos2_ENABLE_Epetra OFF CACHE BOOL)
ENDIF()

#
Expand Down Expand Up @@ -413,51 +423,7 @@ ATDM_SET_CACHE(TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH)
ATDM_SET_ENABLE(TPL_ENABLE_Matio OFF)

#
# G) Package and Test Disables
#
# There are some package tests that have to be disabled for a braod set of
# builds for example, if all openmp builds are failing a certain test then it
# makes more sense to disbale it once in this file instead of in every openmp
# buid's tweaks file
#

# Issue #3638
ATDM_SET_ENABLE(Teko_ModALPreconditioner_MPI_1_DISABLE ON)

# Disable MueLu for all cuda+complex builds for now since there are build
# errors in the MueLu library that takes out everything downstream that
# depends on MueLu (see #4599).
IF (ATDM_USE_CUDA AND ATDM_COMPLEX)
ATDM_SET_ENABLE(Trilinos_ENABLE_MueLu OFF)
ENDIF()

# Disable Zoltan2_XpetraEpertraMatrix exec that does not build with no global
# int instatiation (see #5411)
ATDM_SET_ENABLE(Zoltan2_XpetraEpetraMatrix_EXE_DISABLE ON)
ATDM_SET_ENABLE(Zoltan2_XpetraEpetraMatrix_MPI_4_DISABLE ON)

# Disable Piro_ThyraSolver exec that does not build with no global int
# instantiation (see #5412)
ATDM_SET_ENABLE(Piro_ThyraSolver_EXE_DISABLE ON)
ATDM_SET_ENABLE(Piro_ThyraSolver_MPI_4_DISABLE ON)

# Disable Piro_AnalysisDriverTpetra exec that will not build with no global
# int instantiation (see #5446)
ATDM_SET_ENABLE(Piro_AnalysisDriverTpetra_EXE_DISABLE ON)
ATDM_SET_ENABLE(Piro_AnalysisDriverTpetra_MPI_4_DISABLE ON)

# Disable ROL test exec that will not buld with no global int instantiation
# (see #5447)
ATDM_SET_ENABLE(ROL_adapters_tpetra_test_vector_SimulatedVectorTpetraBatchManagerInterface_EXE_DISABLE ON)
ATDM_SET_ENABLE(ROL_adapters_tpetra_test_vector_SimulatedVectorTpetraBatchManagerInterface_MPI_4_DISABLE ON)

IF ("${ATDM_CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
ATDM_SET_ENABLE(PanzerAdaptersSTK_CurlLaplacianExample-ConvTest-Quad-Order-4_DISABLE ON)
ATDM_SET_ENABLE(PanzerAdaptersSTK_MixedPoissonExample-ConvTest-Hex-Order-3_DISABLE ON)
ENDIF()

#
# H) ATDM env config install hooks
# G) ATDM env config install hooks
#
# Install just enough to allow loading the exact matching env and nothing
# else!
Expand Down
Loading

0 comments on commit 6605279

Please sign in to comment.