From 721eac31a993937ef1c8a0049dab2469037bff74 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 17 Oct 2022 15:32:26 -0600 Subject: [PATCH 1/7] Kokkos: Remove listing of undefined TPL deps (trilinos/Trilinos#11152) Updated TriBITS 'master' now catches undefined TPLs listed as dependencies of a TriBITS package. (Amazingly, classic TriBITS simply silently ignored these undefined TPLs. See tribits/CHANGELOG.md entry in TriBITSPub/TriBITS#530.) This works with older TriBITS and will be needed when TriBITS 'master' is snapshotted into Trilinos 'develop'. --- packages/kokkos/algorithms/cmake/Dependencies.cmake | 2 +- packages/kokkos/containers/cmake/Dependencies.cmake | 2 +- packages/kokkos/core/cmake/Dependencies.cmake | 2 +- packages/kokkos/simd/cmake/Dependencies.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kokkos/algorithms/cmake/Dependencies.cmake b/packages/kokkos/algorithms/cmake/Dependencies.cmake index 1b413106817c..c36b62523fad 100644 --- a/packages/kokkos/algorithms/cmake/Dependencies.cmake +++ b/packages/kokkos/algorithms/cmake/Dependencies.cmake @@ -1,5 +1,5 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_REQUIRED_PACKAGES KokkosCore KokkosContainers - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC HPX + LIB_OPTIONAL_TPLS Pthread CUDA HWLOC TEST_OPTIONAL_TPLS CUSPARSE ) diff --git a/packages/kokkos/containers/cmake/Dependencies.cmake b/packages/kokkos/containers/cmake/Dependencies.cmake index 5e29157369c9..1d71d8af3411 100644 --- a/packages/kokkos/containers/cmake/Dependencies.cmake +++ b/packages/kokkos/containers/cmake/Dependencies.cmake @@ -1,5 +1,5 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_REQUIRED_PACKAGES KokkosCore - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC HPX + LIB_OPTIONAL_TPLS Pthread CUDA HWLOC TEST_OPTIONAL_TPLS CUSPARSE ) diff --git a/packages/kokkos/core/cmake/Dependencies.cmake b/packages/kokkos/core/cmake/Dependencies.cmake index cc901a4ede0c..611c089b2e3f 100644 --- a/packages/kokkos/core/cmake/Dependencies.cmake +++ b/packages/kokkos/core/cmake/Dependencies.cmake @@ -1,5 +1,5 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC DLlib HPX + LIB_OPTIONAL_TPLS Pthread CUDA HWLOC DLlib TEST_OPTIONAL_TPLS CUSPARSE ) diff --git a/packages/kokkos/simd/cmake/Dependencies.cmake b/packages/kokkos/simd/cmake/Dependencies.cmake index 5e29157369c9..1d71d8af3411 100644 --- a/packages/kokkos/simd/cmake/Dependencies.cmake +++ b/packages/kokkos/simd/cmake/Dependencies.cmake @@ -1,5 +1,5 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_REQUIRED_PACKAGES KokkosCore - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC HPX + LIB_OPTIONAL_TPLS Pthread CUDA HWLOC TEST_OPTIONAL_TPLS CUSPARSE ) From 9ff3d45b80653067325b84308f617a51bfe1de84 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 17 Oct 2022 15:38:49 -0600 Subject: [PATCH 2/7] KokkosKernels: Remove listing of undefined TPL deps (trilinos/Trilinos#11152) Updated TriBITS 'master' now catches undefined TPLs listed as dependencies of a TriBITS package. (Amazingly, classic TriBITS simply silently ignored these undefined TPLs. See tribits/CHANGELOG.md entry in TriBITSPub/TriBITS#530.) This works with older TriBITS and will be needed when TriBITS 'master' is snapshotted into Trilinos 'develop'. --- packages/kokkos-kernels/cmake/Dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kokkos-kernels/cmake/Dependencies.cmake b/packages/kokkos-kernels/cmake/Dependencies.cmake index e8b1c6a5e233..4ce5a98dc09e 100644 --- a/packages/kokkos-kernels/cmake/Dependencies.cmake +++ b/packages/kokkos-kernels/cmake/Dependencies.cmake @@ -1,6 +1,6 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_REQUIRED_PACKAGES KokkosCore KokkosContainers KokkosAlgorithms - LIB_OPTIONAL_TPLS quadmath MKL BLAS LAPACK CUSPARSE MAGMA METIS SuperLU Cholmod LAPACKE CBLAS ARMPL ROCBLAS ROCSPARSE CUBLAS + LIB_OPTIONAL_TPLS quadmath MKL BLAS LAPACK CUSPARSE METIS SuperLU Cholmod CUBLAS TEST_OPTIONAL_TPLS yaml-cpp ) # NOTE: If you update names in LIB_OPTIONAL_TPLS above, make sure to map those names in From eccaeaa7ce5245a1b3872f06ddf9a9394702576e Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 17 Oct 2022 15:40:25 -0600 Subject: [PATCH 3/7] Rythmos: Remove listing of undefined TPL deps (#11152) Updated TriBITS 'master' now catches undefined TPLs listed as dependencies of a TriBITS package. (Amazingly, classic TriBITS simply silently ignored these undefined TPLs. See tribits/CHANGELOG.md entry in TriBITSPub/TriBITS#530.) This works with older TriBITS and will be needed when TriBITS 'master' is snapshotted into Trilinos 'develop'. --- packages/rythmos/cmake/Dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rythmos/cmake/Dependencies.cmake b/packages/rythmos/cmake/Dependencies.cmake index 3c5befd6e5a7..32a40c8ddb5a 100644 --- a/packages/rythmos/cmake/Dependencies.cmake +++ b/packages/rythmos/cmake/Dependencies.cmake @@ -3,6 +3,6 @@ SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES EpetraExt ThyraEpetraAdapters ThyraEpetraExtAdapters Sacado Stratimikos Belos NOX) SET(LIB_REQUIRED_DEP_TPLS) -SET(LIB_OPTIONAL_DEP_TPLS GaaspTpl Boost) +SET(LIB_OPTIONAL_DEP_TPLS Boost) SET(TEST_REQUIRED_DEP_TPLS) SET(TEST_OPTIONAL_DEP_TPLS) From 686e720937e3ef6d32560519f3555c9ce673dfe3 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 17 Oct 2022 15:40:53 -0600 Subject: [PATCH 4/7] SEACAS: Remove listing of undefined TPL deps (trilinos/Trilinos#11152) Updated TriBITS 'master' now catches undefined TPLs listed as dependencies of a TriBITS package. (Amazingly, classic TriBITS simply silently ignored these undefined TPLs. See tribits/CHANGELOG.md entry in TriBITSPub/TriBITS#530.) This works with older TriBITS and will be needed when TriBITS 'master' is snapshotted into Trilinos 'develop'. --- .../seacas/libraries/aprepro_lib/cmake/Dependencies.cmake | 1 - packages/seacas/libraries/exodus/cmake/Dependencies.cmake | 4 ++-- packages/seacas/libraries/ioss/cmake/Dependencies.cmake | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/seacas/libraries/aprepro_lib/cmake/Dependencies.cmake b/packages/seacas/libraries/aprepro_lib/cmake/Dependencies.cmake index 2153d1bb0111..6cbd978ae297 100644 --- a/packages/seacas/libraries/aprepro_lib/cmake/Dependencies.cmake +++ b/packages/seacas/libraries/aprepro_lib/cmake/Dependencies.cmake @@ -1,5 +1,4 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_OPTIONAL_PACKAGES SEACASExodus TEST_OPTIONAL_TPLS Pthread - TEST_OPTIONAL_DEP_TPLS Pthread ) diff --git a/packages/seacas/libraries/exodus/cmake/Dependencies.cmake b/packages/seacas/libraries/exodus/cmake/Dependencies.cmake index 1b7b8163d22d..203950dec23a 100644 --- a/packages/seacas/libraries/exodus/cmake/Dependencies.cmake +++ b/packages/seacas/libraries/exodus/cmake/Dependencies.cmake @@ -1,8 +1,8 @@ + + TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_REQUIRED_TPLS Netcdf LIB_OPTIONAL_TPLS Pthread HDF5 Pnetcdf MPI - LIB_OPTIONAL_DEP_TPLS Pthread HDF5 Pnetcdf MPI TEST_REQUIRED_TPLS Netcdf TEST_OPTIONAL_TPLS Pthread - TEST_OPTIONAL_DEP_TPLS Pthread ) diff --git a/packages/seacas/libraries/ioss/cmake/Dependencies.cmake b/packages/seacas/libraries/ioss/cmake/Dependencies.cmake index b0c993bab213..8df104ffd9c3 100644 --- a/packages/seacas/libraries/ioss/cmake/Dependencies.cmake +++ b/packages/seacas/libraries/ioss/cmake/Dependencies.cmake @@ -6,7 +6,7 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( else() TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_OPTIONAL_PACKAGES SEACASExodus Pamgen Zoltan Kokkos - LIB_OPTIONAL_TPLS HDF5 CGNS ParMETIS Faodel Cereal DLlib Pthread DataWarp ADIOS2 Catalyst2 GTest + LIB_OPTIONAL_TPLS HDF5 CGNS ParMETIS DLlib Pthread ADIOS2 ) endif() From 8195622c0da2088d590bb2768ed464c7bcf4bc68 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 17 Oct 2022 15:42:07 -0600 Subject: [PATCH 5/7] Zoltan: Remove listing of undefined TPL deps (trilinos/Trilinos#11152) Updated TriBITS 'master' now catches undefined TPLs listed as dependencies of a TriBITS package. (Amazingly, classic TriBITS simply silently ignored these undefined TPLs. See tribits/CHANGELOG.md entry in TriBITSPub/TriBITS#530.) This works with older TriBITS and will be needed when TriBITS 'master' is snapshotted into Trilinos 'develop'. --- packages/zoltan/cmake/Dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zoltan/cmake/Dependencies.cmake b/packages/zoltan/cmake/Dependencies.cmake index 5ffe0b4003e7..7460aab0b6be 100644 --- a/packages/zoltan/cmake/Dependencies.cmake +++ b/packages/zoltan/cmake/Dependencies.cmake @@ -3,6 +3,6 @@ SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES) SET(LIB_REQUIRED_DEP_TPLS) -SET(LIB_OPTIONAL_DEP_TPLS MPI METIS ParMETIS PaToH Scotch Zlib CCOLAMD OVIS) +SET(LIB_OPTIONAL_DEP_TPLS MPI METIS ParMETIS PaToH Scotch Zlib OVIS) SET(TEST_REQUIRED_DEP_TPLS) SET(TEST_OPTIONAL_DEP_TPLS) From 5b19b96cae915ad55997126c60bd2e4eaace33b3 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 17 Oct 2022 15:42:51 -0600 Subject: [PATCH 6/7] Zoltan2: Remove listing of undefined TPL deps (#11152) Updated TriBITS 'master' now catches undefined TPLs listed as dependencies of a TriBITS package. (Amazingly, classic TriBITS simply silently ignored these undefined TPLs. See tribits/CHANGELOG.md entry in TriBITSPub/TriBITS#530.) This works with older TriBITS and will be needed when TriBITS 'master' is snapshotted into Trilinos 'develop'. --- packages/zoltan2/cmake/Dependencies.cmake | 2 +- packages/zoltan2/core/cmake/Dependencies.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/zoltan2/cmake/Dependencies.cmake b/packages/zoltan2/cmake/Dependencies.cmake index 90f1bfd493e7..3c3aa88e8d32 100644 --- a/packages/zoltan2/cmake/Dependencies.cmake +++ b/packages/zoltan2/cmake/Dependencies.cmake @@ -5,4 +5,4 @@ SET(TEST_OPTIONAL_DEP_PACKAGES Epetra Galeri Pamgen SCORECgmi SCORECpcu SCORECap SET(LIB_REQUIRED_DEP_TPLS) SET(LIB_OPTIONAL_DEP_TPLS) SET(TEST_REQUIRED_DEP_TPLS) -SET(TEST_OPTIONAL_DEP_TPLS METIS PaToH ParMETIS PuLP Scotch AMD CCOLAMD OVIS TopoManager rcalib) +SET(TEST_OPTIONAL_DEP_TPLS METIS PaToH ParMETIS PuLP Scotch AMD OVIS TopoManager) diff --git a/packages/zoltan2/core/cmake/Dependencies.cmake b/packages/zoltan2/core/cmake/Dependencies.cmake index 68026705e7fe..9a8ffcbc4038 100644 --- a/packages/zoltan2/core/cmake/Dependencies.cmake +++ b/packages/zoltan2/core/cmake/Dependencies.cmake @@ -3,7 +3,7 @@ SET(LIB_OPTIONAL_DEP_PACKAGES Epetra SCORECgmi SCORECpcu SCORECapf SCORECmds SCO SET(TEST_REQUIRED_DEP_PACKAGES Tpetra TeuchosCore TeuchosComm TeuchosParameterList Xpetra Zoltan) SET(TEST_OPTIONAL_DEP_PACKAGES Epetra Galeri Pamgen SCORECgmi SCORECpcu SCORECapf SCORECmds SCORECparma) SET(LIB_REQUIRED_DEP_TPLS) -SET(LIB_OPTIONAL_DEP_TPLS METIS PaToH ParMETIS PuLP Scotch SARMA AMD CCOLAMD OVIS TopoManager rcalib) +SET(LIB_OPTIONAL_DEP_TPLS METIS PaToH ParMETIS PuLP Scotch SARMA AMD OVIS TopoManager) SET(TEST_REQUIRED_DEP_TPLS) -SET(TEST_OPTIONAL_DEP_TPLS METIS PaToH ParMETIS PuLP Scotch SARMA AMD CCOLAMD OVIS TopoManager rcalib) +SET(TEST_OPTIONAL_DEP_TPLS METIS PaToH ParMETIS PuLP Scotch SARMA AMD OVIS TopoManager) From da02d7eaf4d75500128fb531e7ad11238ee34e56 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 17 Oct 2022 17:51:11 -0600 Subject: [PATCH 7/7] Add run_trilinos_pr_builds to list of gitdist repos --- .gitdist.default | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitdist.default b/.gitdist.default index be031b139c78..71b3c804c3c6 100644 --- a/.gitdist.default +++ b/.gitdist.default @@ -11,6 +11,7 @@ packages/framework/son-ini-files packages/framework/srn-ini-files TriBITS TriBITS/TriBITSDoc +run_trilinos_pr_builds kokkos kokkos-kernels seacas