Skip to content

Commit

Permalink
Merge branch 'cleanup-better-ci-build-482' into develop (#482, #362, #…
Browse files Browse the repository at this point in the history 
…158, #831, #811, #826, #410)
  • Loading branch information
@bartlettroscoe
bartlettroscoe committed Nov 28, 2016
2 parents fc16514 + 4be40c2 commit 0acaa65
Show file tree
Hide file tree
Showing 37 changed files with 938 additions and 429 deletions.
9 changes: 9 additions & 0 deletions INSTALL.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@ To use shared libraries (much smaller executables and faster linking) use::

-DBUILD_SHARED_LIBS=ON

To enable support for the ``float`` scalar type use::

-DTrilinos_ENABLE_FLOAT=ON

To enable support for ``std::complex<T>`` scalar types use::

-DTrilinos_ENABLE_COMPLEX=ON

To disable Fortran use the following::

-DTrilinos_ENABLE_FORTRAN=OFF
Expand All @@ -134,3 +142,4 @@ To enable a package::
To enable tests::

-DTrilinos_ENABLE_TESTS=ON

142 changes: 71 additions & 71 deletions PackagesList.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,84 +58,84 @@
# Define the Trilinos packages
#
TRIBITS_REPOSITORY_DEFINE_PACKAGES(
Gtest commonTools/gtest SS
ThreadPool packages/ThreadPool PS # Depends on Pthreads
Kokkos packages/kokkos PS
Teuchos packages/teuchos PS
RTOp packages/rtop PS
Sacado packages/sacado PS
Epetra packages/epetra PS
SCORECpcu SCOREC/pcu SS
SCORECgmi SCOREC/gmi SS
SCORECgmi_sim SCOREC/gmi_sim SS
SCORECapf SCOREC/apf SS
SCORECapf_sim SCOREC/apf_sim SS
SCORECmds SCOREC/mds SS
SCORECparma SCOREC/parma SS
SCORECspr SCOREC/spr SS
Zoltan packages/zoltan PS
Shards packages/shards PS
GlobiPack packages/globipack PS
Triutils packages/triutils PS
Tpetra packages/tpetra PS
EpetraExt packages/epetraext PS
Domi packages/domi EX
Thyra packages/thyra PS
Xpetra packages/xpetra PS
OptiPack packages/optipack PS
Isorropia packages/isorropia PS
Pliris packages/pliris PS
Gtest commonTools/gtest PT
ThreadPool packages/ThreadPool PT # Depends on Pthreads
Kokkos packages/kokkos PT
Teuchos packages/teuchos PT
RTOp packages/rtop PT
Sacado packages/sacado PT
Epetra packages/epetra PT
SCORECpcu SCOREC/pcu ST
SCORECgmi SCOREC/gmi ST
SCORECgmi_sim SCOREC/gmi_sim ST
SCORECapf SCOREC/apf ST
SCORECapf_sim SCOREC/apf_sim ST
SCORECmds SCOREC/mds ST
SCORECparma SCOREC/parma ST
SCORECspr SCOREC/spr ST
Zoltan packages/zoltan PT
Shards packages/shards PT
GlobiPack packages/globipack PT
Triutils packages/triutils PT
Tpetra packages/tpetra PT
EpetraExt packages/epetraext PT
Domi packages/domi PT
Thyra packages/thyra PT
Xpetra packages/xpetra PT
OptiPack packages/optipack PT
Isorropia packages/isorropia PT
Pliris packages/pliris ST
Claps packages/claps EX
AztecOO packages/aztecoo PS
Galeri packages/galeri PS
Amesos packages/amesos PS
Pamgen packages/pamgen PS
Zoltan2 packages/zoltan2 SS
Ifpack packages/ifpack PS
ML packages/ml PS
Belos packages/belos PS
ShyLU packages/shylu SS
Amesos2 packages/amesos2 SS
SEACAS packages/seacas SS # Depends on netcdf, optionally hdf5, xdmf, pamgen
AztecOO packages/aztecoo PT
Galeri packages/galeri PT
Amesos packages/amesos PT
Pamgen packages/pamgen PT
Zoltan2 packages/zoltan2 PT
Ifpack packages/ifpack PT
ML packages/ml PT
Belos packages/belos PT
ShyLU packages/shylu PT
Amesos2 packages/amesos2 PT
SEACAS packages/seacas PT # Depends on netcdf, optionally hdf5, xdmf, pamgen
Trios packages/trios EX #temporary
Komplex packages/komplex PS
Anasazi packages/anasazi PS
Ifpack2 packages/ifpack2 PS
Stratimikos packages/stratimikos PS
FEI packages/fei PS
Teko packages/teko SS
TriKota packages/TriKota SS
Intrepid packages/intrepid PS
Intrepid2 packages/intrepid2 SS
STK packages/stk SS # Depends on boost
SCORECapf_zoltan SCOREC/zoltan SS
SCORECapf_stk SCOREC/stk SS
SCORECma SCOREC/ma SS
SCORECpumi SCOREC/pumi SS
SCOREC SCOREC SS
Phalanx packages/phalanx SS
NOX packages/nox PS
Moertel packages/moertel PS
MueLu packages/muelu SS
Rythmos packages/rythmos PS
Komplex packages/komplex ST
Anasazi packages/anasazi PT
Ifpack2 packages/ifpack2 PT
Stratimikos packages/stratimikos PT
FEI packages/fei PT
Teko packages/teko PT
TriKota packages/TriKota ST
Intrepid packages/intrepid PT
Intrepid2 packages/intrepid2 PT
STK packages/stk PT # Depends on boost
SCORECapf_zoltan SCOREC/zoltan ST
SCORECapf_stk SCOREC/stk ST
SCORECma SCOREC/ma ST
SCORECpumi SCOREC/pumi ST
SCOREC SCOREC ST
Phalanx packages/phalanx PT
NOX packages/nox PT
Moertel packages/moertel ST
MueLu packages/muelu PT
Rythmos packages/rythmos PT
Tempus tempus ST
MOOCHO packages/moocho ST
Stokhos packages/stokhos SS
ROL packages/rol SS
Piro packages/piro SS
Panzer packages/panzer SS
Sundance packages/Sundance SS # Could be PS based on deps (BUG: 4669)
CTrilinos packages/CTrilinos SS # Switched to SS to speed up checkin testing
Stokhos packages/stokhos PT
ROL packages/rol PT
Piro packages/piro PT
Panzer packages/panzer PT
Sundance packages/Sundance ST # Could be PT based on deps (BUG: 4669)
CTrilinos packages/CTrilinos ST # Switched to ST to speed up checkin testing
ForTrilinos packages/ForTrilinos EX
PyTrilinos packages/PyTrilinos SS
WebTrilinos packages/WebTrilinos EX # Should be SS
NewPackage packages/new_package EX # Should be SS
PyTrilinos packages/PyTrilinos ST
WebTrilinos packages/WebTrilinos EX # Should be ST
NewPackage packages/new_package EX # Should be ST
Optika packages/optika EX
Mesquite packages/mesquite PS
Mesquite packages/mesquite ST
MeshingGenie packages/meshinggenie EX
TrilinosCouplings packages/trilinoscouplings SS
Pike packages/pike SS
xSDKTrilinos packages/xSDKTrilinos SS
TrilinosCouplings packages/trilinoscouplings PT
Pike packages/pike PT
xSDKTrilinos packages/xSDKTrilinos ST
)

# Allow builds even if some packages are missing
Expand Down
178 changes: 62 additions & 116 deletions TPLsList.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,156 +53,102 @@
# ************************************************************************
# @HEADER

#
# Define the list of TPLs, their find module names, and their classification
#
# TPL_NAME:
#
# The name of the TPL used in the CMake cache variables TPL_ENABLE_${TPL_NAME}
#
# TPL_FINDMOD:
#
# The name of the find module under that is used to get the names of the
# TPLs. If ends in '/' then this gives the directory and the standard module
# name will be used which is FindTPL${TPL_NAME}.cmake.
#
# TPL_CLASSIFICATION:
#
# PS: Primary Stable TPL
#
# Primary Stable TPLs are those TPLs that a Trilinos developer must have
# installed on their machine in order to be able to do Trilinos
# development. For example, we require that you have BLAS, LAPACK, and
# MPI installed in order to do Trilinos development. These are
# fundamental dependencies that are needed in order to do precheckin
# testing.
#
# SS: Secondary Stable TPL
#
# Secondary Stable TPLs are those TPLs that are not required in order to
# be able to develop and test Trilinos before checkins but are none the
# less offically supported. Support for SS TPLs is tested as part of the
# nightly testing process.
#
# TS: Tertiary Stable TPL
#
# Tertiary Stable TPLs are those TPLs that are supported TPLs but can not
# be included in the set of SS TPLs because they may conflicit with other
# SS Code. For example, METIS is listed as a TS TPL because it conflicts
# with ParMETIS which is declared as a SS TPL.
#
# EX: Experimental TPL
#
# Experimental TPLs are not offically supported. They represent
# experimental capabilities of Trilinos packages. Support for EX TPLs is
# never tested as part of the main nightly testing process. However,
# package developers are encouraged to set up their own nightly testing
# for their EX TPLs for their packages.
#
# The default enable for all TPLs is empty "" reguardless of the category.
# The idea is that the enabling of the TPL will be done by the package and
# other enables that the user has to set.
#
# NOTE: The TPLs must be listed in the order of increasing dependencies (if
# such dependencies exist).
#

SET( Trilinos_TPLS_FINDMODS_CLASSIFICATIONS
TRIBITS_REPOSITORY_DEFINE_TPLS(
MKL "cmake/TPLs/" EX
yaml-cpp "cmake/TPLs/" EX
Peano "cmake/TPLs/" EX
CUDA "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" SS
CUSPARSE "cmake/TPLs/" SS
Thrust "cmake/TPLs/" SS
Cusp "cmake/TPLs/" SS
CUDA "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" ST
CUSPARSE "cmake/TPLs/" ST
Thrust "cmake/TPLs/" ST
Cusp "cmake/TPLs/" ST
TBB "cmake/TPLs/" EX
Pthread "cmake/TPLs/" SS
HWLOC "cmake/TPLs/" SS
QTHREAD "cmake/TPLs/" SS
BinUtils "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" SS
ARPREC "packages/teuchos/cmake/tpls/" SS
QD "packages/teuchos/cmake/tpls/" SS
MPI "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PS
BLAS "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PS
LAPACK "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PS
Boost "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" SS
Scotch "cmake/TPLs/" SS
OVIS "cmake/TPLs/" SS
gpcd "cmake/TPLs/" SS
CGNS "cmake/TPLs/" SS
Pthread "cmake/TPLs/" PT
HWLOC "cmake/TPLs/" ST
QTHREAD "cmake/TPLs/" ST
BinUtils "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" ST
ARPREC "packages/teuchos/cmake/tpls/" ST
QD "packages/teuchos/cmake/tpls/" ST
MPI "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PT
BLAS "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT
LAPACK "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT
Boost "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT
Scotch "cmake/TPLs/" ST
OVIS "cmake/TPLs/" ST
gpcd "cmake/TPLs/" ST
CGNS "cmake/TPLs/" ST
METIS "cmake/TPLs/" TS
ParMETIS "cmake/TPLs/" SS
ParMETIS "cmake/TPLs/" PT
PuLP "cmake/TPLs/" EX
TopoManager "cmake/TPLs/" EX
LibTopoMap "cmake/TPLs/" SS
PaToH "cmake/TPLs/" SS
CppUnit "cmake/TPLs/" SS
ADOLC "cmake/TPLs/" SS
LibTopoMap "cmake/TPLs/" ST
PaToH "cmake/TPLs/" ST
CppUnit "cmake/TPLs/" ST
ADOLC "cmake/TPLs/" ST
ADIC "cmake/TPLs/" EX
TVMET "cmake/TPLs/" SS
MF "cmake/TPLs/" SS
ExodusII "cmake/TPLs/" SS
Nemesis "cmake/TPLs/" SS
TVMET "cmake/TPLs/" ST
MF "cmake/TPLs/" ST
ExodusII "cmake/TPLs/" ST
Nemesis "cmake/TPLs/" ST
XDMF "cmake/TPLs/" TS
Zlib "cmake/TPLs/" SS
HDF5 "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" EX
Netcdf "cmake/TPLs/" SS
y12m "cmake/TPLs/" SS
SuperLUDist "cmake/TPLs/" SS
SuperLUMT "cmake/TPLs/" SS
SuperLU "cmake/TPLs/" SS
Zlib "cmake/TPLs/" PT
HDF5 "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" PT
Netcdf "cmake/TPLs/" PT
y12m "cmake/TPLs/" ST
SuperLUDist "cmake/TPLs/" ST
SuperLUMT "cmake/TPLs/" ST
SuperLU "cmake/TPLs/" PT
Cholmod "cmake/TPLs/" EX
UMFPACK "cmake/TPLs/" SS
UMFPACK "cmake/TPLs/" ST
MA28 "cmake/TPLs/" TS
AMD "cmake/TPLs/" TS
CSparse "cmake/TPLs/" EX
HYPRE "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" EX
PETSC "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" SS
BLACS "cmake/TPLs/" SS
SCALAPACK "cmake/TPLs/" SS
MUMPS "cmake/TPLs/" SS
PETSC "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/" ST
BLACS "cmake/TPLs/" ST
SCALAPACK "cmake/TPLs/" ST
MUMPS "cmake/TPLs/" ST
PARDISO_MKL "cmake/TPLs/" EX
PARDISO "cmake/TPLs/" EX
Oski "cmake/TPLs/" SS
TAUCS "cmake/TPLs/" SS
Oski "cmake/TPLs/" ST
TAUCS "cmake/TPLs/" ST
ForUQTK "cmake/TPLs/" EX
Dakota "cmake/TPLs/" EX
HIPS "cmake/TPLs/" EX
MATLAB "cmake/TPLs/" EX
CASK "cmake/TPLs/" EX
SPARSKIT "cmake/TPLs/" SS
QT "packages/teuchos/cmake/tpls/" SS
SPARSKIT "cmake/TPLs/" ST
QT "packages/teuchos/cmake/tpls/" ST
gtest "cmake/TPLs/" EX
BoostLib "cmake/TPLs/" SS
BoostAlbLib "cmake/TPLs/" SS
BoostLib "cmake/TPLs/" PT
BoostAlbLib "cmake/TPLs/" ST
OpenNURBS "cmake/TPLs/" EX
Portals "cmake/TPLs/" SS
CrayPortals "cmake/TPLs/" SS
Gemini "cmake/TPLs/" SS
InfiniBand "cmake/TPLs/" SS
BGPDCMF "cmake/TPLs/" SS
BGQPAMI "cmake/TPLs/" SS
Pablo "cmake/TPLs/" SS
HPCToolkit "cmake/TPLs/" SS
Pnetcdf "cmake/TPLs/" SS
Portals "cmake/TPLs/" ST
CrayPortals "cmake/TPLs/" ST
Gemini "cmake/TPLs/" ST
InfiniBand "cmake/TPLs/" ST
BGPDCMF "cmake/TPLs/" ST
BGQPAMI "cmake/TPLs/" ST
Pablo "cmake/TPLs/" ST
HPCToolkit "cmake/TPLs/" ST
Pnetcdf "cmake/TPLs/" ST
Clp "cmake/TPLs/" EX
GLPK "cmake/TPLs/" EX
qpOASES "cmake/TPLs/" EX
Matio "cmake/TPLs/" SS
PAPI "cmake/TPLs/" SS
Matio "cmake/TPLs/" ST
PAPI "cmake/TPLs/" ST
MATLABLib "cmake/TPLs/" EX
Eigen "packages/teuchos/cmake/tpls/" EX
X11 "cmake/TPLs/" SS
X11 "cmake/TPLs/" ST
Lemon "cmake/TPLs/" EX
GLM "cmake/TPLs/" EX
quadmath "cmake/TPLs/" EX
CAMAL "cmake/TPLs/" SS
RTlib "cmake/TPLs/" SS
DLlib "cmake/TPLs/" SS
CAMAL "cmake/TPLs/" ST
RTlib "cmake/TPLs/" ST
DLlib "cmake/TPLs/" ST
AmgX "cmake/TPLs/" EX
CGAL "cmake/TPLs/" EX
CGALCore "cmake/TPLs/" EX
VTune "cmake/TPLs/" SS
VTune "cmake/TPLs/" ST
TASMANIAN "cmake/TPLs/" EX
ArrayFireCPU "cmake/TPLs/" EX
SimMesh "SCOREC/cmake/TPLs/" EX
Expand Down
Loading

0 comments on commit 0acaa65

Please sign in to comment.