fixes for the CUDA build

Author: ibaned

kul.hpp

@@ -1179,9 +1179,12 @@ class conversion {
 };
 
 template <class T, class From, class To>
-inline constexpr conversion<T> static_conversion = conversion<T>(
+KOKKOS_INLINE_FUNCTION constexpr conversion<T> static_conversion()
+{
+ return conversion<T>(
  From::static_magnitude(), From::static_origin(),
  To::static_magnitude(), To::static_origin());
+}
 
 // Section [prefix]: class template versions of metric prefixes
 
@@ -1528,7 +1531,7 @@ class quantity {
  std::enable_if_t<!are_equal<Unit, Unit2>, bool> = false>
  KOKKOS_INLINE_FUNCTION constexpr
  quantity(quantity<T2, Unit2> const& other)
- :m_value(static_conversion<T2, Unit2, Unit>(other.value()))
+ :m_value(static_conversion<T2, Unit2, Unit>()(other.value()))
  {
  static_assert(Unit::static_dimension() == Unit2::static_dimension(),
  "cannot convert between quantities with different dimensions");

kul_unit_tests.cpp

@@ -331,7 +331,7 @@ TEST(conversion, in_mm)
 
 TEST(static_conversion, in_mm)
 {
- auto constexpr c = kul::static_conversion<double, kul::inch, kul::milli<kul::meter>>;
+ auto constexpr c = kul::static_conversion<double, kul::inch, kul::milli<kul::meter>>();
  auto constexpr v = c(1.0);
  static_assert(v == 25.4, "static inch to mm");
 }
@@ -364,20 +364,20 @@ TEST(quantity, compare)
  static_assert(c1 >= c1, "constexpr greater-than-or-equal of equal");
  auto const r1 = kul::quantity<double, kul::meter>(1.0);
  auto const r2 = kul::quantity<double, kul::meter>(2.0);
- EXPECT_TRUE(c1 == c1);
- EXPECT_TRUE(!(c1 != c1));
- EXPECT_TRUE(!(c1 == c2));
- EXPECT_TRUE(c1 != c2);
- EXPECT_TRUE(c1 < c2);
- EXPECT_TRUE(!(c1 > c2));
- EXPECT_TRUE(!(c2 < c1));
- EXPECT_TRUE(c2 > c1);
- EXPECT_TRUE(c1 <= c2);
- EXPECT_TRUE(!(c1 >= c2));
- EXPECT_TRUE(!(c2 <= c1));
- EXPECT_TRUE(c2 >= c1);
- EXPECT_TRUE(c1 <= c1);
- EXPECT_TRUE(c1 >= c1);
+ EXPECT_TRUE(r1 == r1);
+ EXPECT_TRUE(!(r1 != r1));
+ EXPECT_TRUE(!(r1 == r2));
+ EXPECT_TRUE(r1 != r2);
+ EXPECT_TRUE(r1 < r2);
+ EXPECT_TRUE(!(r1 > r2));
+ EXPECT_TRUE(!(r2 < r1));
+ EXPECT_TRUE(r2 > r1);
+ EXPECT_TRUE(r1 <= r2);
+ EXPECT_TRUE(!(r1 >= r2));
+ EXPECT_TRUE(!(r2 <= r1));
+ EXPECT_TRUE(r2 >= r1);
+ EXPECT_TRUE(r1 <= r1);
+ EXPECT_TRUE(r1 >= r1);
 }
 
 TEST(quantity, add)

p3a_quantity.hpp

@@ -123,14 +123,14 @@ struct minimum<quantity<T, Unit>> {
 
 template <class M, class T, class Unit,
  std::enable_if_t<!std::is_same_v<M, bool>, bool> = false>
-P3A_HOST_DEVICE P3A_ALWAYS_INLINE
+P3A_HOST_DEVICE P3A_ALWAYS_INLINE inline
 auto condition(M const& mask, quantity<T, Unit> const& a, quantity<T, Unit> const& b)
 {
  return quantity<T, Unit>(condition(mask, a.value(), b.value()));
 }
 
 template <class T, class Unit, class Abi>
-P3A_HOST_DEVICE P3A_ALWAYS_INLINE
+P3A_HOST_DEVICE P3A_ALWAYS_INLINE inline
 auto load(
  quantity<T, Unit> const* ptr,
  int offset,
@@ -140,7 +140,7 @@ auto load(
 }
 
 template <class T, class Unit, class Abi>
-P3A_HOST_DEVICE P3A_ALWAYS_INLINE
+P3A_HOST_DEVICE P3A_ALWAYS_INLINE inline
 void store(
  quantity<simd<T, Abi>, Unit> const& q,
  quantity<T, Unit>* ptr,
@@ -151,7 +151,7 @@ void store(
 }
 
 template <class T, class Unit, class Abi, class Integral>
-P3A_HOST_DEVICE P3A_ALWAYS_INLINE
+P3A_HOST_DEVICE P3A_ALWAYS_INLINE inline
 auto load(
  quantity<T, Unit> const* ptr,
  simd<Integral, Abi> const& offset,
@@ -161,7 +161,7 @@ auto load(
 }
 
 template <class T, class Unit, class Abi, class Integral>
-P3A_HOST_DEVICE P3A_ALWAYS_INLINE
+P3A_HOST_DEVICE P3A_ALWAYS_INLINE inline
 void store(
  quantity<simd<T, Abi>, Unit> const& q,
  quantity<T, Unit>* ptr,