Update Kokkos library in LAMMPS to v4.2.1

2024-03-06 14:58:06 -07:00
parent 9d9dbc1fa8
commit 6cc9a4c7b7
32 changed files with 121 additions and 64 deletions
--- a/lib/kokkos/algorithms/unit_tests/TestStdAlgorithmsCommon.hpp
+++ b/lib/kokkos/algorithms/unit_tests/TestStdAlgorithmsCommon.hpp
@ -198,8 +198,9 @@ auto create_deep_copyable_compatible_view_with_same_extent(ViewType view) {

  // this is needed for intel to avoid
  // error #1011: missing return statement at end of non-void function
-#if defined KOKKOS_COMPILER_INTEL || \
-    (defined(KOKKOS_COMPILER_NVCC) && KOKKOS_COMPILER_NVCC >= 1130)
+#if defined KOKKOS_COMPILER_INTEL ||                                  \
+    (defined(KOKKOS_COMPILER_NVCC) && KOKKOS_COMPILER_NVCC >= 1130 && \
+     !defined(KOKKOS_COMPILER_MSVC))
  __builtin_unreachable();
 #endif
 }