Change METAPHYSICL_HAVE_KOKKKOS to METAPHYSICL_KOKKOS_COMPILATION

Author: lindsayad

m4/kokkos.m4

@@ -15,7 +15,7 @@ AC_DEFUN([CONFIGURE_KOKKOS],
     [KOKKOS_PREFIX="$withval"], [KOKKOS_PREFIX=""])
 
   AS_IF([test "x$KOKKOS_PREFIX" != "x"], [
-    KOKKOS_CPPFLAGS="-DMETAPHYSICL_HAVE_KOKKOS -I$KOKKOS_PREFIX/include"
+    KOKKOS_CPPFLAGS="-DMETAPHYSICL_KOKKOS_COMPILATION -I$KOKKOS_PREFIX/include"
     KOKKOS_CXXFLAGS="--forward-unknown-to-host-compiler $KOKKOS_CXXFLAGS"
     KOKKOS_LDFLAGS="--forward-unknown-to-host-compiler -L$KOKKOS_PREFIX/lib -Wl,-rpath,$KOKKOS_PREFIX/lib"
     KOKKOS_LIBS="-lkokkoscore"

src/core/include/metaphysicl/metaphysicl_device.h

@@ -1,7 +1,7 @@
 #ifndef METAPHYSICL_DEVICE_H
 #define METAPHYSICL_DEVICE_H
 
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 
 #include <Kokkos_Array.hpp>
 #include <Kokkos_Macros.hpp>

src/numerics/include/metaphysicl/semidynamicsparsenumberarray_decl.h

@@ -75,7 +75,7 @@ class SemiDynamicSparseNumberArrayGeneric
 
 template <typename T, typename I, typename N>
 using SemiDynamicSparseNumberArray = SemiDynamicSparseNumberArrayGeneric<T, I, N, DynamicStdArrayWrapper<T, N::size>>;
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 template <typename T, typename I, typename N>
 using KokkosSemiDynamicSparseNumberArray = SemiDynamicSparseNumberArrayGeneric<T, I, N, DynamicKokkosArrayWrapper<T, N::size>>;
 #endif

src/utilities/include/metaphysicl/dynamic_kokkos_array_wrapper.h

@@ -28,7 +28,7 @@
 #include "metaphysicl/metaphysicl_asserts.h"
 #include "metaphysicl/metaphysicl_config.h"
 
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 #include <Kokkos_Array.hpp>
 
 namespace MetaPhysicL {

src/utilities/include/metaphysicl/metaphysicl_math.h

@@ -9,7 +9,7 @@
 #define METAPHYSICL_MATH_H
 
 #include "metaphysicl/metaphysicl_device.h"
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 #include <Kokkos_Core.hpp>
 #else
 #include <cmath>
@@ -31,7 +31,7 @@ namespace math {
   }                                                                            \
   }
 
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 #define METAPHYSICL_MATH_DETAIL_UNQUALIFIED_UNARY(NAME)                        \
   namespace detail {                                                           \
   template <class X> METAPHYSICL_INLINE auto unqualified_##NAME(const X &x) {  \
@@ -48,7 +48,7 @@ namespace math {
   METAPHYSICL_MATH_DETAIL_UNQUALIFIED_UNARY_STD(NAME)
 #endif
 
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 #define METAPHYSICL_MATH_DETAIL_UNQUALIFIED_BINARY(NAME)                       \
   namespace detail {                                                           \
   template <class X, class Y>                                                  \

src/utilities/include/metaphysicl/metaphysicl_numeric_limits.h

@@ -1,7 +1,7 @@
 #ifndef METAPHYSICL_NUMERIC_LIMITS
 #define METAPHYSICL_NUMERIC_LIMITS
 
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 
 #include "metaphysicl/metaphysicl_device.h"
 #include <Kokkos_NumericTraits.hpp>
@@ -73,6 +73,6 @@ template <typename T> class numeric_limits {
 
 } // namespace MetaPhysicL
 
-#endif // METAPHYSICL_HAVE_KOKKOS
+#endif // METAPHYSICL_KOKKOS_COMPILATION
 
 #endif // METAPHYSICL_NUMERIC_LIMITS

test/kokkos_sparse_derivs_unit.K

@@ -4,7 +4,7 @@
 
 #include "metaphysicl/metaphysicl_config.h"
 
-#ifdef METAPHYSICL_HAVE_KOKKOS
+#ifdef METAPHYSICL_KOKKOS_COMPILATION
 
 #include "metaphysicl/dualsemidynamicsparsenumberarray.h"
 #include "metaphysicl/metaphysicl_exceptions.h"
@@ -153,4 +153,4 @@ int main(int argc, char *argv[]) {
 
 int main() { return 0; }
 
-#endif // METAPHYSICL_HAVE_KOKKOS
+#endif // METAPHYSICL_KOKKOS_COMPILATION