Fix installed Kokkos FE header support

rochi00 · rochi00 · commit 4cc3a11c8b0c · 2026-05-06T16:18:35.000-06:00
diff --git a/contrib/bin/libmesh-config.in b/contrib/bin/libmesh-config.in
@@ -106,7 +106,7 @@ while [ "x$1" != "x" ]; do
 	    ;;
 
 	"--cppflags")
-	    return_val="${CPPFLAGS} $return_val"
+	    return_val="${CPPFLAGS} @KOKKOS_CPPFLAGS@ $return_val"
 	    ;;
 	
 	"--cxxflags")
diff --git a/contrib/utils/libmesh-dbg.pc.in b/contrib/utils/libmesh-dbg.pc.in
@@ -13,4 +13,5 @@ Libs: -Wl,-rpath,${libdir} -L${libdir} -lmesh_dbg -ltimpi_dbg \
 Libs.private:
 Cflags: @CPPFLAGS_DBG@ \
         -I${includedir} \
+        @KOKKOS_CPPFLAGS@ \
 	@libmesh_optional_INCLUDES@
diff --git a/contrib/utils/libmesh-devel.pc.in b/contrib/utils/libmesh-devel.pc.in
@@ -13,4 +13,5 @@ Libs: -Wl,-rpath,${libdir} -L${libdir} -lmesh_devel -ltimpi_devel \
 Libs.private:
 Cflags: @CPPFLAGS_DEVEL@ \
         -I${includedir} \
+        @KOKKOS_CPPFLAGS@ \
 	@libmesh_optional_INCLUDES@
diff --git a/contrib/utils/libmesh-oprof.pc.in b/contrib/utils/libmesh-oprof.pc.in
@@ -13,4 +13,5 @@ Libs: -Wl,-rpath,${libdir} -L${libdir} -lmesh_oprof -ltimpi_oprof \
 Libs.private:
 Cflags: @CPPFLAGS_OPROF@ \
         -I${includedir} \
+        @KOKKOS_CPPFLAGS@ \
 	@libmesh_optional_INCLUDES@
diff --git a/contrib/utils/libmesh-opt.pc.in b/contrib/utils/libmesh-opt.pc.in
@@ -13,4 +13,5 @@ Libs: -Wl,-rpath,${libdir} -L${libdir} -lmesh_opt -ltimpi_opt \
 Libs.private:
 Cflags: @CPPFLAGS_OPT@ \
         -I${includedir} \
+        @KOKKOS_CPPFLAGS@ \
 	@libmesh_optional_INCLUDES@
diff --git a/contrib/utils/libmesh-prof.pc.in b/contrib/utils/libmesh-prof.pc.in
@@ -13,4 +13,5 @@ Libs: -Wl,-rpath,${libdir} -L${libdir} -lmesh_prof -ltimpi_prof \
 Libs.private:
 Cflags: @CPPFLAGS_PROF@ \
         -I${includedir} \
+        @KOKKOS_CPPFLAGS@ \
 	@libmesh_optional_INCLUDES@
diff --git a/include/gpu/kokkos_fe_base.h b/include/gpu/kokkos_fe_base.h
@@ -27,7 +27,7 @@
 #ifndef LIBMESH_KOKKOS_FE_BASE_H
 #define LIBMESH_KOKKOS_FE_BASE_H
 
-#include "gpu/kokkos_scalar_types.h"
+#include "kokkos_scalar_types.h"
 #include "libmesh/libmesh_device.h"
 #include "libmesh/enum_elem_type.h"
 #include "libmesh/enum_fe_family.h"
diff --git a/include/gpu/kokkos_fe_evaluator.h b/include/gpu/kokkos_fe_evaluator.h
@@ -15,12 +15,12 @@
 #ifndef LIBMESH_KOKKOS_FE_EVALUATOR_H
 #define LIBMESH_KOKKOS_FE_EVALUATOR_H
 
-#include "gpu/kokkos_fe_base.h"
-#include "gpu/kokkos_fe_types.h"
-#include "gpu/kokkos_fe_lagrange_1d.h"
-#include "gpu/kokkos_fe_lagrange_2d.h"
-#include "gpu/kokkos_fe_lagrange_3d.h"
-#include "gpu/kokkos_fe_monomial.h"
+#include "kokkos_fe_base.h"
+#include "kokkos_fe_types.h"
+#include "kokkos_fe_lagrange_1d.h"
+#include "kokkos_fe_lagrange_2d.h"
+#include "kokkos_fe_lagrange_3d.h"
+#include "kokkos_fe_monomial.h"
 #include "libmesh/enum_elem_type.h"
 #include "libmesh/enum_fe_family.h"
 
diff --git a/include/gpu/kokkos_fe_face_map.h b/include/gpu/kokkos_fe_face_map.h
@@ -3,7 +3,7 @@
 
 #ifdef LIBMESH_HAVE_KOKKOS
 
-#include "gpu/kokkos_fe_evaluator.h"
+#include "kokkos_fe_evaluator.h"
 #include "libmesh/elem.h"
 
 namespace libMesh::Kokkos
diff --git a/include/gpu/kokkos_fe_lagrange_1d.h b/include/gpu/kokkos_fe_lagrange_1d.h
@@ -12,7 +12,7 @@
 #ifndef LIBMESH_KOKKOS_FE_LAGRANGE_1D_H
 #define LIBMESH_KOKKOS_FE_LAGRANGE_1D_H
 
-#include "gpu/kokkos_fe_base.h"
+#include "kokkos_fe_base.h"
 
 namespace libMesh::Kokkos
 {
diff --git a/include/gpu/kokkos_fe_lagrange_2d.h b/include/gpu/kokkos_fe_lagrange_2d.h
@@ -8,7 +8,7 @@
 #ifndef LIBMESH_KOKKOS_FE_LAGRANGE_2D_H
 #define LIBMESH_KOKKOS_FE_LAGRANGE_2D_H
 
-#include "gpu/kokkos_fe_base.h"
+#include "kokkos_fe_base.h"
 
 namespace libMesh::Kokkos
 {
diff --git a/include/gpu/kokkos_fe_lagrange_3d.h b/include/gpu/kokkos_fe_lagrange_3d.h
@@ -8,7 +8,7 @@
 #ifndef LIBMESH_KOKKOS_FE_LAGRANGE_3D_H
 #define LIBMESH_KOKKOS_FE_LAGRANGE_3D_H
 
-#include "gpu/kokkos_fe_base.h"
+#include "kokkos_fe_base.h"
 
 namespace libMesh::Kokkos
 {
diff --git a/include/gpu/kokkos_fe_map.h b/include/gpu/kokkos_fe_map.h
@@ -17,8 +17,8 @@
 #ifndef LIBMESH_KOKKOS_FE_MAP_H
 #define LIBMESH_KOKKOS_FE_MAP_H
 
-#include "gpu/kokkos_fe_evaluator.h"
-#include "gpu/kokkos_scalar_types.h"
+#include "kokkos_fe_evaluator.h"
+#include "kokkos_scalar_types.h"
 
 namespace libMesh::Kokkos
 {
diff --git a/include/gpu/kokkos_fe_monomial.h b/include/gpu/kokkos_fe_monomial.h
@@ -13,7 +13,7 @@
 #ifndef LIBMESH_KOKKOS_FE_MONOMIAL_H
 #define LIBMESH_KOKKOS_FE_MONOMIAL_H
 
-#include "gpu/kokkos_fe_base.h"
+#include "kokkos_fe_base.h"
 #include "libmesh/enum_elem_type.h"
 
 namespace libMesh::Kokkos
diff --git a/include/gpu/kokkos_quadrature.h b/include/gpu/kokkos_quadrature.h
@@ -14,7 +14,7 @@
 #ifndef LIBMESH_KOKKOS_QUADRATURE_H
 #define LIBMESH_KOKKOS_QUADRATURE_H
 
-#include "gpu/kokkos_scalar_types.h"
+#include "kokkos_scalar_types.h"
 #include "libmesh/enum_elem_type.h"
 #include <cmath>
 #include <vector>
diff --git a/include/gpu/kokkos_scalar_types.h b/include/gpu/kokkos_scalar_types.h
@@ -10,13 +10,81 @@
 #include "libmesh/libmesh_device.h"
 #include "libmesh/type_vector.h"
 #include "libmesh/type_tensor.h"
+
 namespace libMesh::Kokkos
 {
 
 using Real = libMesh::Real;
 using RealVector = libMesh::TypeVector<Real>;
 using RealTensor = libMesh::TypeTensor<Real>;
 
+template <typename VectorType, typename ViewType>
+LIBMESH_DEVICE_INLINE
+VectorType load_vector(const ViewType & view, const unsigned int i)
+{
+  VectorType v;
+  v.zero();
+
+  for (unsigned int d = 0; d < LIBMESH_DIM; ++d)
+    v(d) = view(i, d);
+
+  return v;
+}
+
+template <typename ViewType, typename VectorType>
+LIBMESH_DEVICE_INLINE
+void store_vector(const ViewType & view, const unsigned int i, const VectorType & v)
+{
+  for (unsigned int d = 0; d < LIBMESH_DIM; ++d)
+    view(i, d) = v(d);
+}
+
+template <typename ViewType>
+LIBMESH_DEVICE_INLINE
+Real vector_component(const ViewType & view, const unsigned int i, const unsigned int component)
+{
+  if (component < LIBMESH_DIM)
+    return view(i, component);
+
+  return Real(0);
+}
+
+template <typename TensorType, typename ViewType>
+LIBMESH_DEVICE_INLINE
+TensorType load_tensor(const ViewType & view, const unsigned int i)
+{
+  TensorType T;
+  T.zero();
+
+  for (unsigned int row = 0; row < LIBMESH_DIM; ++row)
+    for (unsigned int col = 0; col < LIBMESH_DIM; ++col)
+      T(row, col) = view(i, row, col);
+
+  return T;
+}
+
+template <typename ViewType, typename TensorType>
+LIBMESH_DEVICE_INLINE
+void store_tensor(const ViewType & view, const unsigned int i, const TensorType & T)
+{
+  for (unsigned int row = 0; row < LIBMESH_DIM; ++row)
+    for (unsigned int col = 0; col < LIBMESH_DIM; ++col)
+      view(i, row, col) = T(row, col);
+}
+
+template <typename ViewType>
+LIBMESH_DEVICE_INLINE
+Real tensor_component(const ViewType & view,
+                      const unsigned int i,
+                      const unsigned int row,
+                      const unsigned int col)
+{
+  if (row < LIBMESH_DIM && col < LIBMESH_DIM)
+    return view(i, row, col);
+
+  return Real(0);
+}
+
 LIBMESH_DEVICE_INLINE
 RealVector zero_vector()
 {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#ifndef LIBMESH_KOKKOS_FE_LAGRANGE_1D_H`
`13`	`13`	`#define LIBMESH_KOKKOS_FE_LAGRANGE_1D_H`
`14`	`14`
`15`		`-#include "gpu/kokkos_fe_base.h"`
	`15`	`+#include "kokkos_fe_base.h"`
`16`	`16`
`17`	`17`	`namespace libMesh::Kokkos`
`18`	`18`	`{`