Kokkos support for Lagrange and Monomial elements

Makefile.am

@@ -5,6 +5,7 @@ SUBDIRS = include #src
 
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS  = -I m4 -I m4/autoconf-submodule
+AM_CXXFLAGS      = $(libmesh_CXXFLAGS)
 AM_CFLAGS        = $(libmesh_CFLAGS)
 AM_LDFLAGS       = $(libmesh_LDFLAGS) $(libmesh_contrib_LDFLAGS)
 
@@ -43,6 +44,26 @@ AM_CPPFLAGS      = -DLIBMESH_IS_COMPILING_ITSELF \
                    $(libmesh_contrib_INCLUDES) \
                    $(libmesh_optional_INCLUDES) \
                    -I$(top_builddir)/include # required for libmesh_version.h
+AM_CPPFLAGS      += $(LIBMESH_KOKKOS_BUILD_CPPFLAGS)
+AM_CXXFLAGS      += $(LIBMESH_KOKKOS_BUILD_CXXFLAGS)
+AM_LDFLAGS       += $(LIBMESH_KOKKOS_BUILD_LDFLAGS)
+
+SUFFIXES = .C .K .lo .o .obj
+
+if LIBMESH_ENABLE_KOKKOS
+.K.o:
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	  $(AM_CPPFLAGS) $(CPPFLAGS) \
+	  $(AM_CXXFLAGS) $(CXXFLAGS) \
+	  -c $< -o $@
+
+.K.lo:
+	$(LIBTOOL) $(AM_V_lt) --tag=CXX --mode=compile $(CXX) \
+	  $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	  $(AM_CPPFLAGS) $(CPPFLAGS) \
+	  $(AM_CXXFLAGS) $(CXXFLAGS) \
+	  -c $< -o $@
+endif
 
 LIBS             = $(libmesh_optional_LIBS) $(libmesh_precision_LIBS)
 
@@ -468,6 +489,28 @@ calculator_dbg_CPPFLAGS   = $(CPPFLAGS_DBG) $(AM_CPPFLAGS)
 calculator_dbg_CXXFLAGS   = $(CXXFLAGS_DBG)
 calculator_dbg_LDADD      = libmesh_dbg.la
 
+# hilbert_kokkos_benchmark
+opt_programs += hilbert_kokkos_benchmark-opt
+hilbert_kokkos_benchmark_opt_SOURCES  = src/apps/hilbert_kokkos_benchmark.C
+hilbert_kokkos_benchmark_opt_SOURCES += src/apps/L2system.C src/apps/L2system.h
+hilbert_kokkos_benchmark_opt_CPPFLAGS = $(CPPFLAGS_OPT) $(AM_CPPFLAGS)
+hilbert_kokkos_benchmark_opt_CXXFLAGS = $(CXXFLAGS_OPT)
+hilbert_kokkos_benchmark_opt_LDADD    = libmesh_opt.la
+
+devel_programs += hilbert_kokkos_benchmark-devel
+hilbert_kokkos_benchmark_devel_SOURCES  = src/apps/hilbert_kokkos_benchmark.C
+hilbert_kokkos_benchmark_devel_SOURCES += src/apps/L2system.C src/apps/L2system.h
+hilbert_kokkos_benchmark_devel_CPPFLAGS = $(CPPFLAGS_DEVEL) $(AM_CPPFLAGS)
+hilbert_kokkos_benchmark_devel_CXXFLAGS = $(CXXFLAGS_DEVEL)
+hilbert_kokkos_benchmark_devel_LDADD    = libmesh_devel.la
+
+dbg_programs += hilbert_kokkos_benchmark-dbg
+hilbert_kokkos_benchmark_dbg_SOURCES  = src/apps/hilbert_kokkos_benchmark.C
+hilbert_kokkos_benchmark_dbg_SOURCES += src/apps/L2system.C src/apps/L2system.h
+hilbert_kokkos_benchmark_dbg_CPPFLAGS = $(CPPFLAGS_DBG) $(AM_CPPFLAGS)
+hilbert_kokkos_benchmark_dbg_CXXFLAGS = $(CXXFLAGS_DBG)
+hilbert_kokkos_benchmark_dbg_LDADD    = libmesh_dbg.la
+
 # compare
 opt_programs          += compare-opt
 compare_opt_SOURCES    = src/apps/compare.C

build-aux/libmesh_nvcc_wrapper

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# Wrapper around Kokkos' nvcc_wrapper to smooth over Automake dependency
+# tracking flags that nvcc_wrapper does not fully understand.
+#
+# In particular:
+# - Automake commonly passes -MP, which is meaningful to GCC dependency
+#   generation but ends up leaking to the host compiler without -M/-MM through
+#   nvcc_wrapper's split dependency path.
+# - -MQ is the quoted-target form of -MT; nvcc_wrapper only understands -MT.
+
+set -euo pipefail
+
+if [[ $# -lt 1 ]]; then
+  echo "Usage: $0 REAL_NVCC_WRAPPER [ARGS...]" >&2
+  exit 2
+fi
+
+real_nvcc_wrapper=$1
+shift
+
+forwarded_args=()
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -MP)
+      shift
+      ;;
+    -MQ)
+      if [[ $# -lt 2 ]]; then
+        echo "$0: -MQ requires an argument" >&2
+        exit 2
+      fi
+      forwarded_args+=(-MT "$2")
+      shift 2
+      ;;
+    *)
+      forwarded_args+=("$1")
+      shift
+      ;;
+  esac
+done
+
+exec "$real_nvcc_wrapper" "${forwarded_args[@]}"