From e783f5aee39b8e7f8e30b01dc00bc60479eae358 Mon Sep 17 00:00:00 2001 From: Samuel Browne Date: Thu, 28 Mar 2024 10:53:45 -0600 Subject: [PATCH 1/2] Move all deprecated packages to secondary tested Now, TriBITS will not automatically enable any of the to-be-deprecated packages if Trilinos_ENABLE_SECONDARY_TESTED_CODE is OFF. Also default Trilinos_ENABLE_SECONDARY_TESTED_CODE to OFF. Most of the PR builds enable secondary tested code, so this should be fairly safe. Summary: Do NOT automatically enable deprecated packages, even if Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES is ON (default). This is a change for user-facing behavior. If a user was depending on automatic package enablement for explicit behavior, they will need to specify that from now on (e.g., they were enabling Thyra and needed ThyraEpetraAdapters, they will now need to explicitly enable ThyraEpetraAdapters). --- PackagesList.cmake | 18 +++++++++--------- ProjectName.cmake | 2 +- .../shylu/shylu_dd/cmake/Dependencies.cmake | 2 +- packages/thyra/cmake/Dependencies.cmake | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PackagesList.cmake b/PackagesList.cmake index 63f0a571a32d..46b4e498bfa9 100644 --- a/PackagesList.cmake +++ b/PackagesList.cmake @@ -67,7 +67,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES( RTOp packages/rtop PT Sacado packages/sacado PT MiniTensor packages/minitensor PT - Epetra packages/epetra PT + Epetra packages/epetra ST SCOREClion SCOREC/lion ST SCORECpcu SCOREC/pcu ST SCORECgmi SCOREC/gmi ST @@ -80,22 +80,22 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES( AvatarT packages/avatart EX Zoltan packages/zoltan PT Shards packages/shards PT - Triutils packages/triutils PT - EpetraExt packages/epetraext PT + Triutils packages/triutils ST + EpetraExt packages/epetraext ST Tpetra packages/tpetra PT TrilinosSS packages/common/auxiliarySoftware/SuiteSparse PT # Auxiliary software. Domi packages/domi PT Thyra packages/thyra PT Xpetra packages/xpetra PT - Isorropia packages/isorropia PT + Isorropia packages/isorropia ST Pliris packages/pliris ST - AztecOO packages/aztecoo PT + AztecOO packages/aztecoo ST Galeri packages/galeri PT - Amesos packages/amesos PT + Amesos packages/amesos ST Pamgen packages/pamgen PT Zoltan2Core packages/zoltan2/core PT - Ifpack packages/ifpack PT - ML packages/ml PT + Ifpack packages/ifpack ST + ML packages/ml ST Belos packages/belos PT ShyLU_Node packages/shylu/shylu_node PT Amesos2 packages/amesos2 PT @@ -107,7 +107,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES( FEI packages/fei PT Teko packages/teko PT TriKota packages/TriKota ST - Intrepid packages/intrepid PT + Intrepid packages/intrepid ST Intrepid2 packages/intrepid2 PT Compadre packages/compadre ST STK packages/stk PT # Depends on boost diff --git a/ProjectName.cmake b/ProjectName.cmake index 4520f36a95b7..8847066b4a94 100644 --- a/ProjectName.cmake +++ b/ProjectName.cmake @@ -1,6 +1,6 @@ SET(PROJECT_NAME Trilinos) -SET(${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE_DEFAULT ON) +SET(${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE_DEFAULT OFF) SET(${PROJECT_NAME}_GENERATE_REPO_VERSION_FILE_DEFAULT ON) diff --git a/packages/shylu/shylu_dd/cmake/Dependencies.cmake b/packages/shylu/shylu_dd/cmake/Dependencies.cmake index f9fe7bf86c09..12793067a9a2 100644 --- a/packages/shylu/shylu_dd/cmake/Dependencies.cmake +++ b/packages/shylu/shylu_dd/cmake/Dependencies.cmake @@ -4,7 +4,7 @@ SET(SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS # New ShyLU subpackages: FROSch frosch PT REQUIRED #Core core EX OPTIONAL - Core core PT REQUIRED + Core core ST REQUIRED Common common ST OPTIONAL ) diff --git a/packages/thyra/cmake/Dependencies.cmake b/packages/thyra/cmake/Dependencies.cmake index df9c18db5651..4fe71575fbbe 100644 --- a/packages/thyra/cmake/Dependencies.cmake +++ b/packages/thyra/cmake/Dependencies.cmake @@ -1,7 +1,7 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS Core core PT REQUIRED - EpetraAdapters adapters/epetra PT OPTIONAL - EpetraExtAdapters adapters/epetraext PT OPTIONAL + EpetraAdapters adapters/epetra ST OPTIONAL + EpetraExtAdapters adapters/epetraext ST OPTIONAL TpetraAdapters adapters/tpetra PT OPTIONAL ) From 90abfbc972d189a01914c44e53099572be660d0b Mon Sep 17 00:00:00 2001 From: Samuel Browne Date: Thu, 18 Apr 2024 06:59:11 -0600 Subject: [PATCH 2/2] Add release note about enable behavior change --- RELEASE_NOTES | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index e2118aab28d6..233ba94b5539 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,4 +1,22 @@ +############################################################################### +# # +# Trilinos Release 16.0 Release Notes TBD May/June, 2024 # +# # +############################################################################### + +Framework + + - Marked all deprecated packages as 'Secondary Tested'. + - Reset default for `Trilinos_ENABLE_SECONDARY_TESTED_CODE` to `OFF`. + This will cause the previously-mentioned deprecated packages to NOT be + automatically enabled to help guide users away from them. The old + behavior can be restored by setting the variable back to `ON`, but note + that the recommended best practice is to explicitly enable packages that + the user is depending on (e.g. if you depend on ThyraEpetraAdapters, enable + that explicitly instead of Thyra and Epetra and allowing TriBITS to enable + the adapters). + ############################################################################### # # # Trilinos Release 15.1.0 Release Notes February 26, 2024 #