Merge branch 'fix-cuda-issues' into 'master'

Fix CUDA issues See merge request OPAL/Libraries/ippl!168
IPPL-framework · May 3, 2023 · 42b6182 · 42b6182
2 parents 2e49b8f + 580c7b8
commit 42b6182
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Interpolation/CIC.hpp b/src/Interpolation/CIC.hpp
@@ -47,7 +47,7 @@ namespace ippl {
         }
 
         template <unsigned long ScatterPoint, unsigned long... Index, typename T, unsigned Dim,
-                  typename IndexType = size_t>
+                  typename IndexType>
         KOKKOS_INLINE_FUNCTION constexpr int scatterToPoint(
             const std::index_sequence<Index...>&,
             const typename detail::ViewType<T, Dim>::view_type& view, const Vector<T, Dim>& wlo,
@@ -57,8 +57,7 @@ namespace ippl {
             return 0;
         }
 
-        template <unsigned long... ScatterPoint, typename T, unsigned Dim,
-                  typename IndexType = size_t>
+        template <unsigned long... ScatterPoint, typename T, unsigned Dim, typename IndexType>
         KOKKOS_INLINE_FUNCTION constexpr void scatterToField(
             const std::index_sequence<ScatterPoint...>&,
             const typename detail::ViewType<T, Dim>::view_type& view, const Vector<T, Dim>& wlo,
@@ -70,7 +69,7 @@ namespace ippl {
         }
 
         template <unsigned long GatherPoint, unsigned long... Index, typename T, unsigned Dim,
-                  typename IndexType = size_t>
+                  typename IndexType>
         KOKKOS_INLINE_FUNCTION constexpr T gatherFromPoint(
             const std::index_sequence<Index...>&,
             const typename detail::ViewType<T, Dim>::view_type& view, const Vector<T, Dim>& wlo,
@@ -79,8 +78,7 @@ namespace ippl {
                    * view(interpolationIndex<GatherPoint, Index>(args)...);
         }
 
-        template <unsigned long... GatherPoint, typename T, unsigned Dim,
-                  typename IndexType = size_t>
+        template <unsigned long... GatherPoint, typename T, unsigned Dim, typename IndexType>
         KOKKOS_INLINE_FUNCTION constexpr T gatherFromField(
             const std::index_sequence<GatherPoint...>&,
             const typename detail::ViewType<T, Dim>::view_type& view, const Vector<T, Dim>& wlo,

diff --git a/src/Ippl.cpp b/src/Ippl.cpp
@@ -144,6 +144,8 @@ T Ippl::getNumericalOption(const char* arg) {
             throw std::runtime_error("Expected floating point argument!");
         }
     }
+    // Silence nvcc warning: missing return statement at end of non-void function
+    throw std::runtime_error("Unreachable state");
 }
 
 /////////////////////////////////////////////////////////////////////