Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge trilinos/develop into e3sm-project/develop #98

Merged
merged 7 commits into from
Feb 16, 2024
Merged

Merge trilinos/develop into e3sm-project/develop #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3db64e1
Tpetra: cleanup remove Kokkos::Experimental::HBWSpace mentions
dalg24 Feb 8, 2024
1a8c17c
Warn users if they enable deprecated packages
sebrowne Jan 31, 2024
2e3134d
Mark more packages as deprecated
sebrowne Feb 15, 2024
e9ea28e
Mark PyTrilinos as deprecated
sebrowne Feb 15, 2024
4a1dc34
Merge Pull Request #12726 from dalg24/Trilinos/tpetra_hbw_space
trilinos-autotester Feb 15, 2024
c907271
Merge Pull Request #12746 from sebrowne/Trilinos/deprecated-package-w…
trilinos-autotester Feb 16, 2024
0ef4980
Merge remote-tracking branch 'upstream/develop' into develop
bartgol Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,28 @@ IF(${PROJECT_NAME}_ENABLE_YouCompleteMe)
INCLUDE(CodeCompletion)
ENDIF()

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})
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")
8 changes: 1 addition & 7 deletions packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<typename ExecutionSpace::memory_space, Kokkos::HostSpace> ||
std::is_same_v<typename ExecutionSpace::memory_space, Kokkos::Experimental::HBWSpace>;
#else
static constexpr bool is_cpu = std::is_same_v<typename ExecutionSpace::memory_space, Kokkos::HostSpace>;
#endif

//! Whether the ExecutionSpace is GPU-like (its default memory space is not HostSpace)
static constexpr bool is_gpu = !is_cpu;

Expand Down
Loading