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

Jump to bottom

Drop the requirement for Trilinos+Kokkos from 13.2 to 12.14.1 #14639

Merged
merged 1 commit into from
Jan 4, 2023
Merged

Drop the requirement for Trilinos+Kokkos from 13.2 to 12.14.1 #14639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmake/configure/configure_20_trilinos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,18 @@ macro(feature_trilinos_find_external var)
endif()

#
# We require at least Trilinos 13.2
# We require at least Trilinos 12.14.1
#
if(TRILINOS_VERSION VERSION_LESS 13.2)
if(TRILINOS_VERSION VERSION_LESS 12.14.1)
message(STATUS "Could not find a sufficient Trilinos installation: "
"deal.II requires at least version 13.2 if the Trilinos installation includes Kokkos, "
"deal.II requires at least version 12.14.1 if the Trilinos installation includes Kokkos, "
"but version ${TRILINOS_VERSION} was found."
)
set(TRILINOS_ADDITIONAL_ERROR_STRING
${TRILINOS_ADDITIONAL_ERROR_STRING}
"The Trilinos installation (found at \"${TRILINOS_DIR}\")\n"
"with version ${TRILINOS_VERSION} is too old.\n"
"deal.II requires at least version 13.2 if the Trilinos installation includes Kokkos.\n\n"
"deal.II requires at least version 12.14.1 if the Trilinos installation includes Kokkos.\n\n"
)
set(${var} FALSE)
endif()
Expand Down
2 changes: 1 addition & 1 deletion doc/external-libs/trilinos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ <h5>Installing Trilinos</h5>

<p style="color: red">
Note: The current version of deal.II requires at least Trilinos 12.4
(13.2 if Trilinos includes Kokkos).
(12.14.1 if Trilinos includes Kokkos).
Deal.II is known to work with Trilinos up to 13.4. Other versions of
Trilinos should work too but have not been tested prior to the
release.
Expand Down
2 changes: 1 addition & 1 deletion doc/news/changes/20221230DanielArndt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Updated: The minimum version for Trilinos has been bumped to 13.2 if Trilinos
Updated: The minimum version for Trilinos has been bumped to 12.14.1 if Trilinos
bundles Kokkkos.
<br>
(Daniel Arndt, 2022/12/30)