address review feedback; drop changes in tpls/mdspan/...

mdspan changes handled in kokkos/mdspan#349
ndellingwood · Jun 20, 2024 · 87eb97f · 87eb97f
1 parent 4a72714
commit 87eb97f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/core/src/View/MDSpan/Kokkos_MDSpan_Layout.hpp b/core/src/View/MDSpan/Kokkos_MDSpan_Layout.hpp
@@ -111,7 +111,7 @@ KOKKOS_INLINE_FUNCTION auto array_layout_from_mapping(
                        rank > 6 ? ext.extent(6) : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
                        rank > 7 ? ext.extent(7) : KOKKOS_IMPL_CTOR_DEFAULT_ARG};
   }
-#if defined KOKKOS_COMPILER_INTEL
+#ifdef KOKKOS_COMPILER_INTEL
   __builtin_unreachable();
 #endif
 }
@@ -146,7 +146,7 @@ KOKKOS_INLINE_FUNCTION auto mapping_from_view_mapping(const VM &view_mapping) {
   } else {
     return mapping_type(extents_from_view_mapping<extents_type>(view_mapping));
   }
-#if defined KOKKOS_COMPILER_INTEL
+#ifdef KOKKOS_COMPILER_INTEL
   __builtin_unreachable();
 #endif
 }

diff --git a/tpls/mdspan/include/experimental/__p2642_bits/layout_padded.hpp b/tpls/mdspan/include/experimental/__p2642_bits/layout_padded.hpp
@@ -59,9 +59,6 @@ MDSPAN_INLINE_FUNCTION constexpr size_t get_actual_static_padding_value() {
   } else {
     return dynamic_extent;
   }
-#ifdef __INTEL_COMPILER
-  __builtin_unreachable();
-#endif
   // Missing return statement warning from NVCC
 #ifdef __NVCC__
   return 0;
@@ -108,9 +105,6 @@ struct padded_extent {
     } else {
       return init_padding(exts, padding_value);
     }
-#ifdef __INTEL_COMPILER
-  __builtin_unreachable();
-#endif
   // Missing return statement warning from NVCC
 #ifdef __NVCC__
   return {};
@@ -126,9 +120,6 @@ struct padded_extent {
     } else {
       return {};
     }
-#ifdef __INTEL_COMPILER
-  __builtin_unreachable();
-#endif
   // Missing return statement warning from NVCC
 #ifdef __NVCC__
   return {};
@@ -144,9 +135,6 @@ struct padded_extent {
     } else {
       return {};
     }
-#ifdef __INTEL_COMPILER
-  __builtin_unreachable();
-#endif
   // Missing return statement warning from NVCC
 #ifdef __NVCC__
   return {};