]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Only include Kokkos_Abort.hpp in exceptions.h for Kokkos 4.2.0 and higher 16189/head
authorDaniel Arndt <arndtd@ornl.gov>
Wed, 25 Oct 2023 17:46:03 +0000 (13:46 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Wed, 25 Oct 2023 17:47:01 +0000 (13:47 -0400)
include/deal.II/base/exceptions.h

index 1b9594e109b73d55e7c9460b29fad60c1779dbc2..9a2600893c5e3f012332cb858306294a0f036ba8 100644 (file)
 #include <deal.II/base/config.h>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-#include <Kokkos_Core.hpp>
+#include <Kokkos_Macros.hpp>
+#if KOKKOS_VERSION >= 40200
+#  include <Kokkos_Abort.hpp>
+#else
+#  include <Kokkos_Core.hpp>
+#endif
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <exception>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.