Merge Pull Request trilinos#11154 from bartlettroscoe/Trilinos/11152-…

…remove-undefined-tpl-deps Automatically Merged using Trilinos Pull Request AutoTester PR Title: Remove listing of undefined TPL deps (trilinos#11152) PR Author: bartlettroscoe
tcad-charon · Oct 19, 2022 · 118436c · 118436c
2 parents 5620862 + da02d7e
commit 118436c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git 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

diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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/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)
diff --git 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
@@ -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
@@ -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()
 

diff --git 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)
diff --git 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
@@ -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)