Skip to content

Commit f11c92a

Browse files
author
Rochishnu Chowdhury
committed
Regenerate Kokkos test makefile
1 parent a684d0e commit f11c92a

1 file changed

Lines changed: 109 additions & 99 deletions

File tree

‎tests/Makefile.in‎

Lines changed: 109 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -96,30 +96,32 @@ target_triplet = @target@
9696

9797
check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
9898
$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
99-
$(am__EXEEXT_7)
100-
TESTS = $(am__EXEEXT_1) $(am__append_11)
99+
$(am__EXEEXT_7) $(am__EXEEXT_8)
100+
TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__append_13)
101101
@LIBMESH_ENABLE_KOKKOS_TRUE@am__append_2 = -I$(top_srcdir)/include $(KOKKOS_CPPFLAGS)
102-
@LIBMESH_ENABLE_KOKKOS_TRUE@am__append_3 = kokkos_vector_ops_oracle_unit kokkos_tensor_ops_oracle_unit
103-
@LIBMESH_ENABLE_KOKKOS_TRUE@am__append_4 = kokkos_vector_ops_oracle_unit kokkos_tensor_ops_oracle_unit
102+
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_KOKKOS_TRUE@am__append_3 = unit_tests-kokkos-dbg
103+
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_KOKKOS_TRUE@am__append_4 = unit_tests-kokkos-dbg
104+
@LIBMESH_ENABLE_KOKKOS_TRUE@@LIBMESH_OPT_MODE_TRUE@am__append_5 = unit_tests-kokkos-opt
105+
@LIBMESH_ENABLE_KOKKOS_TRUE@@LIBMESH_OPT_MODE_TRUE@am__append_6 = unit_tests-kokkos-opt
104106

105107
# our GLIBC debugging preprocessor flags seem to potentially conflict
106108
# with libcppunit binaries. Some cppunit versions work fine for us,
107109
# others segfault and/or hang. By default we will not run
108110
# GLIBCXX-debugging builds with cppunit unless specifically
109111
# configured to.
110-
@ACSM_ENABLE_GLIBCXX_DEBUGGING_CPPUNIT_TRUE@@ACSM_ENABLE_GLIBCXX_DEBUGGING_TRUE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_5 = unit_tests-dbg
111-
@ACSM_ENABLE_GLIBCXX_DEBUGGING_FALSE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_6 = unit_tests-dbg
112-
@LIBMESH_DEVEL_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_7 = unit_tests-devel
113-
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_PROF_MODE_TRUE@am__append_8 = unit_tests-prof
114-
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPROF_MODE_TRUE@am__append_9 = unit_tests-oprof
115-
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@am__append_10 = unit_tests-opt
116-
@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_11 = run_unit_tests.sh
117-
@LIBMESH_VPATH_BUILD_TRUE@am__append_12 = .linkstamp
112+
@ACSM_ENABLE_GLIBCXX_DEBUGGING_CPPUNIT_TRUE@@ACSM_ENABLE_GLIBCXX_DEBUGGING_TRUE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_7 = unit_tests-dbg
113+
@ACSM_ENABLE_GLIBCXX_DEBUGGING_FALSE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_8 = unit_tests-dbg
114+
@LIBMESH_DEVEL_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_9 = unit_tests-devel
115+
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_PROF_MODE_TRUE@am__append_10 = unit_tests-prof
116+
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPROF_MODE_TRUE@am__append_11 = unit_tests-oprof
117+
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@am__append_12 = unit_tests-opt
118+
@LIBMESH_ENABLE_CPPUNIT_TRUE@am__append_13 = run_unit_tests.sh
119+
@LIBMESH_VPATH_BUILD_TRUE@am__append_14 = .linkstamp
118120

119121
######################################################################
120122
#
121123
# Don't leave code coverage outputs lying around
122-
@CODE_COVERAGE_ENABLED_TRUE@am__append_13 = */*.gcda */*.gcno
124+
@CODE_COVERAGE_ENABLED_TRUE@am__append_15 = */*.gcda */*.gcno
123125
subdir = tests
124126
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
125127
am__aclocal_m4_deps = \
@@ -157,8 +159,8 @@ am__aclocal_m4_deps = \
157159
$(top_srcdir)/m4/exodus.m4 $(top_srcdir)/m4/feexcept.m4 \
158160
$(top_srcdir)/m4/fparser.m4 $(top_srcdir)/m4/glpk.m4 \
159161
$(top_srcdir)/m4/gmv.m4 $(top_srcdir)/m4/gz.m4 \
160-
$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/laspack.m4 \
161-
$(top_srcdir)/m4/libhilbert.m4 \
162+
$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/kokkos.m4 \
163+
$(top_srcdir)/m4/laspack.m4 $(top_srcdir)/m4/libhilbert.m4 \
162164
$(top_srcdir)/m4/libmesh_compiler_features.m4 \
163165
$(top_srcdir)/m4/libmesh_core_features.m4 \
164166
$(top_srcdir)/m4/libmesh_metaphysicl.m4 \
@@ -188,34 +190,14 @@ mkinstalldirs = $(install_sh) -d
188190
CONFIG_HEADER = $(top_builddir)/include/libmesh_config.h.tmp
189191
CONFIG_CLEAN_FILES = run_unit_tests.sh
190192
CONFIG_CLEAN_VPATH_FILES =
191-
@LIBMESH_ENABLE_KOKKOS_TRUE@am__EXEEXT_1 = kokkos_vector_ops_oracle_unit$(EXEEXT) \
192-
@LIBMESH_ENABLE_KOKKOS_TRUE@ kokkos_tensor_ops_oracle_unit$(EXEEXT)
193-
@ACSM_ENABLE_GLIBCXX_DEBUGGING_CPPUNIT_TRUE@@ACSM_ENABLE_GLIBCXX_DEBUGGING_TRUE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__EXEEXT_2 = unit_tests-dbg$(EXEEXT)
194-
@ACSM_ENABLE_GLIBCXX_DEBUGGING_FALSE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__EXEEXT_3 = unit_tests-dbg$(EXEEXT)
195-
@LIBMESH_DEVEL_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__EXEEXT_4 = unit_tests-devel$(EXEEXT)
196-
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_PROF_MODE_TRUE@am__EXEEXT_5 = unit_tests-prof$(EXEEXT)
197-
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPROF_MODE_TRUE@am__EXEEXT_6 = unit_tests-oprof$(EXEEXT)
198-
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@am__EXEEXT_7 = unit_tests-opt$(EXEEXT)
199-
am__kokkos_tensor_ops_oracle_unit_SOURCES_DIST = \
200-
numerics/kokkos_tensor_ops_oracle_test.K
201-
am__dirstamp = $(am__leading_dot)dirstamp
202-
@LIBMESH_ENABLE_KOKKOS_TRUE@am_kokkos_tensor_ops_oracle_unit_OBJECTS = numerics/kokkos_tensor_ops_oracle_test.$(OBJEXT)
203-
kokkos_tensor_ops_oracle_unit_OBJECTS = \
204-
$(am_kokkos_tensor_ops_oracle_unit_OBJECTS)
205-
am__DEPENDENCIES_1 =
206-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_tensor_ops_oracle_unit_DEPENDENCIES = \
207-
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(top_builddir)/libmesh_opt.la \
208-
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(am__DEPENDENCIES_1) \
209-
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(am__DEPENDENCIES_1)
210-
am__kokkos_vector_ops_oracle_unit_SOURCES_DIST = \
211-
numerics/kokkos_vector_ops_oracle_test.K
212-
@LIBMESH_ENABLE_KOKKOS_TRUE@am_kokkos_vector_ops_oracle_unit_OBJECTS = numerics/kokkos_vector_ops_oracle_test.$(OBJEXT)
213-
kokkos_vector_ops_oracle_unit_OBJECTS = \
214-
$(am_kokkos_vector_ops_oracle_unit_OBJECTS)
215-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_vector_ops_oracle_unit_DEPENDENCIES = \
216-
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(top_builddir)/libmesh_opt.la \
217-
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(am__DEPENDENCIES_1) \
218-
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(am__DEPENDENCIES_1)
193+
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_KOKKOS_TRUE@am__EXEEXT_1 = unit_tests-kokkos-dbg$(EXEEXT)
194+
@LIBMESH_ENABLE_KOKKOS_TRUE@@LIBMESH_OPT_MODE_TRUE@am__EXEEXT_2 = unit_tests-kokkos-opt$(EXEEXT)
195+
@ACSM_ENABLE_GLIBCXX_DEBUGGING_CPPUNIT_TRUE@@ACSM_ENABLE_GLIBCXX_DEBUGGING_TRUE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__EXEEXT_3 = unit_tests-dbg$(EXEEXT)
196+
@ACSM_ENABLE_GLIBCXX_DEBUGGING_FALSE@@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__EXEEXT_4 = unit_tests-dbg$(EXEEXT)
197+
@LIBMESH_DEVEL_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@am__EXEEXT_5 = unit_tests-devel$(EXEEXT)
198+
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_PROF_MODE_TRUE@am__EXEEXT_6 = unit_tests-prof$(EXEEXT)
199+
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPROF_MODE_TRUE@am__EXEEXT_7 = unit_tests-oprof$(EXEEXT)
200+
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@am__EXEEXT_8 = unit_tests-opt$(EXEEXT)
219201
am__unit_tests_dbg_SOURCES_DIST = driver.C libmesh_cppunit.h \
220202
stream_redirector.h test_comm.h base/dof_object_test.h \
221203
base/dof_map_test.C base/default_coupling_test.C \
@@ -290,6 +272,7 @@ am__unit_tests_dbg_SOURCES_DIST = driver.C libmesh_cppunit.h \
290272
utils/parameters_test.C utils/point_locator_test.C \
291273
utils/rb_parameters_test.C utils/transparent_comparator.C \
292274
utils/vectormap_test.C utils/xdr_test.C fparser/autodiff.C
275+
am__dirstamp = $(am__leading_dot)dirstamp
293276
@LIBMESH_ENABLE_FPARSER_TRUE@am__objects_1 = fparser/unit_tests_dbg-autodiff.$(OBJEXT)
294277
am__objects_2 = unit_tests_dbg-driver.$(OBJEXT) \
295278
base/unit_tests_dbg-dof_map_test.$(OBJEXT) \
@@ -624,6 +607,14 @@ unit_tests_devel_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
624607
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
625608
$(unit_tests_devel_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
626609
$(LDFLAGS) -o $@
610+
am_unit_tests_kokkos_dbg_OBJECTS =
611+
am__EXTRA_unit_tests_kokkos_dbg_SOURCES_DIST = driver_kokkos.K
612+
unit_tests_kokkos_dbg_OBJECTS = $(am_unit_tests_kokkos_dbg_OBJECTS)
613+
unit_tests_kokkos_dbg_LDADD = $(LDADD)
614+
am_unit_tests_kokkos_opt_OBJECTS =
615+
am__EXTRA_unit_tests_kokkos_opt_SOURCES_DIST = driver_kokkos.K
616+
unit_tests_kokkos_opt_OBJECTS = $(am_unit_tests_kokkos_opt_OBJECTS)
617+
unit_tests_kokkos_opt_LDADD = $(LDADD)
627618
am__unit_tests_oprof_SOURCES_DIST = driver.C libmesh_cppunit.h \
628619
stream_redirector.h test_comm.h base/dof_object_test.h \
629620
base/dof_map_test.C base/default_coupling_test.C \
@@ -1887,15 +1878,19 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
18871878
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
18881879
am__v_CCLD_0 = @echo " CCLD " $@;
18891880
am__v_CCLD_1 =
1890-
SOURCES = $(kokkos_tensor_ops_oracle_unit_SOURCES) \
1891-
$(kokkos_vector_ops_oracle_unit_SOURCES) \
1892-
$(unit_tests_dbg_SOURCES) $(unit_tests_devel_SOURCES) \
1881+
SOURCES = $(unit_tests_dbg_SOURCES) $(unit_tests_devel_SOURCES) \
1882+
$(unit_tests_kokkos_dbg_SOURCES) \
1883+
$(EXTRA_unit_tests_kokkos_dbg_SOURCES) \
1884+
$(unit_tests_kokkos_opt_SOURCES) \
1885+
$(EXTRA_unit_tests_kokkos_opt_SOURCES) \
18931886
$(unit_tests_oprof_SOURCES) $(unit_tests_opt_SOURCES) \
18941887
$(unit_tests_prof_SOURCES)
1895-
DIST_SOURCES = $(am__kokkos_tensor_ops_oracle_unit_SOURCES_DIST) \
1896-
$(am__kokkos_vector_ops_oracle_unit_SOURCES_DIST) \
1897-
$(am__unit_tests_dbg_SOURCES_DIST) \
1888+
DIST_SOURCES = $(am__unit_tests_dbg_SOURCES_DIST) \
18981889
$(am__unit_tests_devel_SOURCES_DIST) \
1890+
$(unit_tests_kokkos_dbg_SOURCES) \
1891+
$(am__EXTRA_unit_tests_kokkos_dbg_SOURCES_DIST) \
1892+
$(unit_tests_kokkos_opt_SOURCES) \
1893+
$(am__EXTRA_unit_tests_kokkos_opt_SOURCES_DIST) \
18991894
$(am__unit_tests_oprof_SOURCES_DIST) \
19001895
$(am__unit_tests_opt_SOURCES_DIST) \
19011896
$(am__unit_tests_prof_SOURCES_DIST)
@@ -2490,17 +2485,18 @@ data = matrices/geom_1_extraction_op.h5 \
24902485
unit_tests_data = $(data)
24912486

24922487
# Why isn't this working automatically?
2493-
EXTRA_DIST = $(data)
2494-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_vector_ops_oracle_unit_SOURCES = numerics/kokkos_vector_ops_oracle_test.K
2495-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_vector_ops_oracle_unit_CPPFLAGS = $(AM_CPPFLAGS) $(KOKKOS_TEST_CPPFLAGS)
2496-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_vector_ops_oracle_unit_CXXFLAGS = $(AM_CXXFLAGS) $(KOKKOS_CXXFLAGS)
2497-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_vector_ops_oracle_unit_LDFLAGS = $(AM_LDFLAGS) $(KOKKOS_LDFLAGS)
2498-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_vector_ops_oracle_unit_LDADD = $(top_builddir)/libmesh_opt.la $(KOKKOS_LIBS) $(libmesh_optional_LIBS)
2499-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_tensor_ops_oracle_unit_SOURCES = numerics/kokkos_tensor_ops_oracle_test.K
2500-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_tensor_ops_oracle_unit_CPPFLAGS = $(AM_CPPFLAGS) $(KOKKOS_TEST_CPPFLAGS)
2501-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_tensor_ops_oracle_unit_CXXFLAGS = $(AM_CXXFLAGS) $(KOKKOS_CXXFLAGS)
2502-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_tensor_ops_oracle_unit_LDFLAGS = $(AM_LDFLAGS) $(KOKKOS_LDFLAGS)
2503-
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_tensor_ops_oracle_unit_LDADD = $(top_builddir)/libmesh_opt.la $(KOKKOS_LIBS) $(libmesh_optional_LIBS)
2488+
EXTRA_DIST = $(data) $(kokkos_unit_test_sources)
2489+
kokkos_unit_test_sources = \
2490+
numerics/kokkos_numerics_oracle_test_utils.h \
2491+
numerics/kokkos_tensor_ops_oracle_fixtures.h \
2492+
numerics/kokkos_tensor_ops_oracle_runners.h \
2493+
numerics/kokkos_vector_ops_oracle_fixtures.h \
2494+
numerics/kokkos_vector_ops_oracle_runners.h
2495+
2496+
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_KOKKOS_TRUE@unit_tests_kokkos_dbg_SOURCES =
2497+
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_KOKKOS_TRUE@EXTRA_unit_tests_kokkos_dbg_SOURCES = driver_kokkos.K
2498+
@LIBMESH_ENABLE_KOKKOS_TRUE@@LIBMESH_OPT_MODE_TRUE@unit_tests_kokkos_opt_SOURCES =
2499+
@LIBMESH_ENABLE_KOKKOS_TRUE@@LIBMESH_OPT_MODE_TRUE@EXTRA_unit_tests_kokkos_opt_SOURCES = driver_kokkos.K
25042500
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@unit_tests_dbg_SOURCES = $(unit_tests_sources)
25052501
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@unit_tests_dbg_CPPFLAGS = $(CPPFLAGS_DBG) $(AM_CPPFLAGS)
25062502
@LIBMESH_DBG_MODE_TRUE@@LIBMESH_ENABLE_CPPUNIT_TRUE@unit_tests_dbg_CXXFLAGS = $(CXXFLAGS_DBG)
@@ -2531,15 +2527,15 @@ EXTRA_DIST = $(data)
25312527
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@unit_tests_opt_LDADD = $(top_builddir)/libmesh_opt.la
25322528
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@unit_tests_optdir = $(datadir)
25332529
@LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@unit_tests_opt_DATA = $(data)
2534-
2535-
# Custom link rules so the Kokkos compiler drives the final link step.
2536-
kokkos_vector_ops_oracle_unit_LINK = \
2537-
$(LIBTOOL) --tag=CXX --mode=link $(KOKKOS_CXX) \
2538-
$(LDFLAGS) $(kokkos_vector_ops_oracle_unit_LDFLAGS) -o $@
2539-
2540-
kokkos_tensor_ops_oracle_unit_LINK = \
2541-
$(LIBTOOL) --tag=CXX --mode=link $(KOKKOS_CXX) \
2542-
$(LDFLAGS) $(kokkos_tensor_ops_oracle_unit_LDFLAGS) -o $@
2530+
@LIBMESH_ENABLE_KOKKOS_TRUE@driver_kokkos_src = driver_kokkos.K
2531+
@LIBMESH_ENABLE_KOKKOS_TRUE@unit_tests_kokkos_dbg_object = unit_tests_kokkos_dbg-driver_kokkos.$(OBJEXT)
2532+
@LIBMESH_ENABLE_KOKKOS_TRUE@unit_tests_kokkos_opt_object = unit_tests_kokkos_opt-driver_kokkos.$(OBJEXT)
2533+
@LIBMESH_ENABLE_KOKKOS_TRUE@unit_tests_kokkos_dbg_depfile = $(DEPDIR)/unit_tests_kokkos_dbg-driver_kokkos.d
2534+
@LIBMESH_ENABLE_KOKKOS_TRUE@unit_tests_kokkos_opt_depfile = $(DEPDIR)/unit_tests_kokkos_opt-driver_kokkos.d
2535+
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_unit_test_depfiles = $(unit_tests_kokkos_dbg_depfile) $(unit_tests_kokkos_opt_depfile)
2536+
@LIBMESH_ENABLE_KOKKOS_TRUE@kokkos_unit_test_cleanfiles = $(unit_tests_kokkos_dbg_object) $(unit_tests_kokkos_opt_object) \
2537+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(kokkos_unit_test_depfiles) \
2538+
@LIBMESH_ENABLE_KOKKOS_TRUE@ unit_tests-kokkos-dbg$(EXEEXT) unit_tests-kokkos-opt$(EXEEXT)
25432539

25442540
CLEANFILES = cube_mesh.xda slit_mesh.xda slit_solution.xda out.e \
25452541
mesh_with_soln.e elemental_from_nodal.e write_elemset_data.e \
@@ -2574,16 +2570,17 @@ CLEANFILES = cube_mesh.xda slit_mesh.xda slit_solution.xda out.e \
25742570
write_exodus_QUADSHELL9.e write_exodus_TET10.e \
25752571
write_exodus_TET14.e write_exodus_TET4.e write_exodus_TRI3.e \
25762572
write_exodus_TRI6.e write_exodus_TRI7.e \
2577-
write_exodus_TRISHELL3.e smoother.out $(am__append_12) \
2578-
$(am__append_13)
2573+
write_exodus_TRISHELL3.e smoother.out \
2574+
$(kokkos_unit_test_cleanfiles) $(am__append_14) \
2575+
$(am__append_15)
25792576

25802577
# need to link any data files for VPATH builds
25812578
@LIBMESH_VPATH_BUILD_TRUE@BUILT_SOURCES = .linkstamp
25822579
all: $(BUILT_SOURCES)
25832580
$(MAKE) $(AM_MAKEFLAGS) all-am
25842581

25852582
.SUFFIXES:
2586-
.SUFFIXES: .C .K .lo .o .obj
2583+
.SUFFIXES: .C .lo .o .obj
25872584
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
25882585
@for dep in $?; do \
25892586
case '$(am__configure_deps)' in \
@@ -2619,24 +2616,6 @@ run_unit_tests.sh: $(top_builddir)/config.status $(srcdir)/run_unit_tests.sh.in
26192616
clean-checkPROGRAMS:
26202617
$(am__rm_f) $(check_PROGRAMS)
26212618
test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
2622-
numerics/$(am__dirstamp):
2623-
@$(MKDIR_P) numerics
2624-
@: >>numerics/$(am__dirstamp)
2625-
numerics/$(DEPDIR)/$(am__dirstamp):
2626-
@$(MKDIR_P) numerics/$(DEPDIR)
2627-
@: >>numerics/$(DEPDIR)/$(am__dirstamp)
2628-
numerics/kokkos_tensor_ops_oracle_test.$(OBJEXT): \
2629-
numerics/$(am__dirstamp) numerics/$(DEPDIR)/$(am__dirstamp)
2630-
2631-
kokkos_tensor_ops_oracle_unit$(EXEEXT): $(kokkos_tensor_ops_oracle_unit_OBJECTS) $(kokkos_tensor_ops_oracle_unit_DEPENDENCIES) $(EXTRA_kokkos_tensor_ops_oracle_unit_DEPENDENCIES)
2632-
@rm -f kokkos_tensor_ops_oracle_unit$(EXEEXT)
2633-
$(AM_V_GEN)$(kokkos_tensor_ops_oracle_unit_LINK) $(kokkos_tensor_ops_oracle_unit_OBJECTS) $(kokkos_tensor_ops_oracle_unit_LDADD) $(LIBS)
2634-
numerics/kokkos_vector_ops_oracle_test.$(OBJEXT): \
2635-
numerics/$(am__dirstamp) numerics/$(DEPDIR)/$(am__dirstamp)
2636-
2637-
kokkos_vector_ops_oracle_unit$(EXEEXT): $(kokkos_vector_ops_oracle_unit_OBJECTS) $(kokkos_vector_ops_oracle_unit_DEPENDENCIES) $(EXTRA_kokkos_vector_ops_oracle_unit_DEPENDENCIES)
2638-
@rm -f kokkos_vector_ops_oracle_unit$(EXEEXT)
2639-
$(AM_V_GEN)$(kokkos_vector_ops_oracle_unit_LINK) $(kokkos_vector_ops_oracle_unit_OBJECTS) $(kokkos_vector_ops_oracle_unit_LDADD) $(LIBS)
26402619
base/$(am__dirstamp):
26412620
@$(MKDIR_P) base
26422621
@: >>base/$(am__dirstamp)
@@ -2805,6 +2784,12 @@ mesh/unit_tests_dbg-project_solution_test.$(OBJEXT): \
28052784
mesh/$(am__dirstamp) mesh/$(DEPDIR)/$(am__dirstamp)
28062785
mesh/unit_tests_dbg-xdrio_test.$(OBJEXT): mesh/$(am__dirstamp) \
28072786
mesh/$(DEPDIR)/$(am__dirstamp)
2787+
numerics/$(am__dirstamp):
2788+
@$(MKDIR_P) numerics
2789+
@: >>numerics/$(am__dirstamp)
2790+
numerics/$(DEPDIR)/$(am__dirstamp):
2791+
@$(MKDIR_P) numerics/$(DEPDIR)
2792+
@: >>numerics/$(DEPDIR)/$(am__dirstamp)
28082793
numerics/unit_tests_dbg-composite_function_test.$(OBJEXT): \
28092794
numerics/$(am__dirstamp) numerics/$(DEPDIR)/$(am__dirstamp)
28102795
numerics/unit_tests_dbg-coupling_matrix_test.$(OBJEXT): \
@@ -14789,15 +14774,40 @@ $(top_builddir)/libmesh_prof.la: FORCE
1478914774
$(top_builddir)/libmesh_oprof.la: FORCE
1479014775
(cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) libmesh_oprof.la)
1479114776

14792-
# Compile .K translation units with the Kokkos device compiler.
14793-
# If KOKKOS_CXX is not the MPI wrapper, configure populates
14794-
# $(KOKKOS_MPI_CPPFLAGS) from the wrapper's compile flags so mpi.h and
14795-
# any wrapper-provided defines remain visible.
14796-
.K.o:
14797-
$(KOKKOS_CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
14798-
$(KOKKOS_MPI_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(KOKKOS_TEST_CPPFLAGS) \
14799-
$(AM_CXXFLAGS) $(CXXFLAGS) $(KOKKOS_CXXFLAGS) \
14800-
-c $< -o $@
14777+
# Build the Kokkos tests with the same mode-suffixed naming as the
14778+
# original libMesh unit test executables, while still compiling with
14779+
# the Kokkos device compiler and mode-specific flags.
14780+
@LIBMESH_ENABLE_KOKKOS_TRUE@$(unit_tests_kokkos_dbg_object): $(driver_kokkos_src)
14781+
@LIBMESH_ENABLE_KOKKOS_TRUE@ @$(MKDIR_P) $(DEPDIR)
14782+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(KOKKOS_CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
14783+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(KOKKOS_MPI_CPPFLAGS) $(CPPFLAGS_DBG) $(AM_CPPFLAGS) $(CPPFLAGS) $(KOKKOS_TEST_CPPFLAGS) \
14784+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS_DBG) $(CXXFLAGS) $(KOKKOS_CXXFLAGS) \
14785+
@LIBMESH_ENABLE_KOKKOS_TRUE@ -MMD -MP -MF $(unit_tests_kokkos_dbg_depfile) \
14786+
@LIBMESH_ENABLE_KOKKOS_TRUE@ -c $< -o $@
14787+
14788+
@LIBMESH_ENABLE_KOKKOS_TRUE@$(unit_tests_kokkos_opt_object): $(driver_kokkos_src)
14789+
@LIBMESH_ENABLE_KOKKOS_TRUE@ @$(MKDIR_P) $(DEPDIR)
14790+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(KOKKOS_CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
14791+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(KOKKOS_MPI_CPPFLAGS) $(CPPFLAGS_OPT) $(AM_CPPFLAGS) $(CPPFLAGS) $(KOKKOS_TEST_CPPFLAGS) \
14792+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS_OPT) $(CXXFLAGS) $(KOKKOS_CXXFLAGS) \
14793+
@LIBMESH_ENABLE_KOKKOS_TRUE@ -MMD -MP -MF $(unit_tests_kokkos_opt_depfile) \
14794+
@LIBMESH_ENABLE_KOKKOS_TRUE@ -c $< -o $@
14795+
14796+
@LIBMESH_ENABLE_KOKKOS_TRUE@unit_tests-kokkos-dbg$(EXEEXT): $(unit_tests_kokkos_dbg_object) $(top_builddir)/libmesh_dbg.la
14797+
@LIBMESH_ENABLE_KOKKOS_TRUE@ @rm -f $@
14798+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(AM_V_GEN)$(LIBTOOL) --tag=CXX --mode=link $(KOKKOS_CXX) \
14799+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(LDFLAGS) $(AM_LDFLAGS) $(KOKKOS_LDFLAGS) -o $@ \
14800+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(unit_tests_kokkos_dbg_object) \
14801+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(top_builddir)/libmesh_dbg.la $(KOKKOS_LIBS) $(libmesh_optional_LIBS) $(LIBS)
14802+
14803+
@LIBMESH_ENABLE_KOKKOS_TRUE@unit_tests-kokkos-opt$(EXEEXT): $(unit_tests_kokkos_opt_object) $(top_builddir)/libmesh_opt.la
14804+
@LIBMESH_ENABLE_KOKKOS_TRUE@ @rm -f $@
14805+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(AM_V_GEN)$(LIBTOOL) --tag=CXX --mode=link $(KOKKOS_CXX) \
14806+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(LDFLAGS) $(AM_LDFLAGS) $(KOKKOS_LDFLAGS) -o $@ \
14807+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(unit_tests_kokkos_opt_object) \
14808+
@LIBMESH_ENABLE_KOKKOS_TRUE@ $(top_builddir)/libmesh_opt.la $(KOKKOS_LIBS) $(libmesh_optional_LIBS) $(LIBS)
14809+
14810+
@LIBMESH_ENABLE_KOKKOS_TRUE@-include $(kokkos_unit_test_depfiles)
1480114811

1480214812
@LIBMESH_VPATH_BUILD_TRUE@.linkstamp:
1480314813
@LIBMESH_VPATH_BUILD_TRUE@ -rm -f solutions && $(LN_S) -f $(srcdir)/solutions .

0 commit comments

Comments
 (0)