From 3db64e1f82c27235adba44a017d73ed91dc67aa0 Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Thu, 8 Feb 2024 12:54:10 -0500 Subject: [PATCH 1/4] Tpetra: cleanup remove Kokkos::Experimental::HBWSpace mentions --- .../compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp index a0130bc858be..427bd85bc1c5 100644 --- a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp +++ b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp @@ -51,14 +51,8 @@ class KokkosDeviceWrapperNode { static constexpr bool is_serial = false; #endif - //! Whether the ExecutionSpace is CPU-like (its default memory space is HostSpace or HBWSpace) -#ifdef KOKKOS_HBWSPACE_HPP - static constexpr bool is_cpu = - std::is_same_v || - std::is_same_v; -#else static constexpr bool is_cpu = std::is_same_v; -#endif + //! Whether the ExecutionSpace is GPU-like (its default memory space is not HostSpace) static constexpr bool is_gpu = !is_cpu; From 1a8c17cd3af469f321e5c88bdf4c9b40cee0c5f4 Mon Sep 17 00:00:00 2001 From: Samuel Browne Date: Wed, 31 Jan 2024 14:26:23 -0700 Subject: [PATCH 2/4] Warn users if they enable deprecated packages --- CMakeLists.txt | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a10c659306ee..de2de6d75436 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,4 +111,28 @@ IF(${PROJECT_NAME}_ENABLE_YouCompleteMe) INCLUDE(CodeCompletion) ENDIF() +set(deprecated_packages Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML Triutils) +set(enabled_deprecated_packages "") +FOREACH(package ${deprecated_packages}) + IF(Trilinos_ENABLE_${package}) + set(enabled_deprecated_packages ${package} ${enabled_deprecated_packages}) + ENDIF() +ENDFOREACH() + +IF(enabled_deprecated_packages) + message("********************************************************************") + message("******** WARNING WARNING WARNING WARNING WARNING WARNING *********") + message("********************************************************************") + message("* Several Trilinos packages are scheduled for deprecation in 2025.") + message("* The following deprecated packages are enabled (either explicitly") + message("* or implicitly due to a dependency)") + message("*") + string(REPLACE ";" "\n* " p "${enabled_deprecated_packages}") + message("* ${p}") + message("*") + message("********************************************************************") + message("") + message(WARNING "Deprecated packages that are enabled: ${enabled_deprecated_packages}") +ENDIF() + message(STATUS "If publishing results using Trilinos, please cite us: https://trilinos.github.io/cite.html") From 2e3134d435064a896429ee40e05b3ffd66a0be7a Mon Sep 17 00:00:00 2001 From: Samuel Browne Date: Thu, 15 Feb 2024 10:10:42 -0700 Subject: [PATCH 3/4] Mark more packages as deprecated --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de2de6d75436..c6d609777a09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ IF(${PROJECT_NAME}_ENABLE_YouCompleteMe) INCLUDE(CodeCompletion) ENDIF() -set(deprecated_packages Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML Triutils) +set(deprecated_packages Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils) set(enabled_deprecated_packages "") FOREACH(package ${deprecated_packages}) IF(Trilinos_ENABLE_${package}) From e9ea28e9ac9197c0c81177060a1dc524ef4cd11d Mon Sep 17 00:00:00 2001 From: Samuel Browne Date: Thu, 15 Feb 2024 10:37:53 -0700 Subject: [PATCH 4/4] Mark PyTrilinos as deprecated --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6d609777a09..6d6850024e60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ IF(${PROJECT_NAME}_ENABLE_YouCompleteMe) INCLUDE(CodeCompletion) ENDIF() -set(deprecated_packages Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils) +set(deprecated_packages Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris PyTrilinos ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils) set(enabled_deprecated_packages "") FOREACH(package ${deprecated_packages}) IF(Trilinos_ENABLE_${package})