move files, enable Ariel MPI testing

plavin · Jul 31, 2024 · e0840a3 · e0840a3
1 parent 37a83be
commit e0840a3
Show file tree

Hide file tree

Showing 12 changed files with 918 additions and 324 deletions.
diff --git a/src/sst/elements/ariel/Makefile.am b/src/sst/elements/ariel/Makefile.am
@@ -1,5 +1,9 @@
+SUBDIRS = api
+if SST_USE_ARIEL_MPI
+SUBDIRS += mpi
+endif
+
 AM_CPPFLAGS += \
-        $(MPI_CPPFLAGS) \
 	-I$(top_srcdir)/src
 
 if HAVE_SET_PTRACER
@@ -104,7 +108,7 @@ endif
 
 libariel_la_CPPFLAGS = \
 	-DARIEL_TRACE_LIB=$(libdir)/sst \
-        -DARIEL_TOOL_DIR="$(libexecdir)" \
+	-DARIEL_TOOL_DIR="$(libexecdir)" \
 	-DPINTOOL_EXECUTABLE="$(PINTOOL_RUNTIME)" \
 	-DMPILAUNCHER_EXECUTABLE="$(CURDIR)/mpi/mpilauncher" \
 	$(AM_CPPFLAGS) $(CPPFLAGS)

diff --git a/src/sst/elements/ariel/api/Makefile b/src/sst/elements/ariel/api/Makefile
diff --git a/src/sst/elements/ariel/api/Makefile.am b/src/sst/elements/ariel/api/Makefile.am
@@ -0,0 +1,7 @@
+CC=$(ARIEL_MPICC)
+CXX=$(ARIEL_MPICXX)
+CFLAGS+=-fopenmp
+CXXFLAGS+=fopenmp
+lib_LTLIBRARIES = libarielapi.la
+libarielapi_la_SOURCES = arielapi.c arielapi.h
+include_HEADERS = arielapi.h
diff --git a/src/sst/elements/ariel/configure.m4 b/src/sst/elements/ariel/configure.m4
@@ -4,6 +4,8 @@ AC_DEFUN([SST_ariel_CONFIG], [
   sst_check_ariel="yes"
 
   SST_CHECK_PINTOOL([have_pin=1],[have_pin=0],[AC_MSG_ERROR([PIN was requested but not found])])
+dnl SST_CHECK_ARIEL_MPI([], [AC_MSG_ERROR([Can't enable Ariel MPI])])
+
   SST_CHECK_PTRACE_SET_TRACER()
   SST_CHECK_SHM()
 
@@ -13,5 +15,13 @@ AC_DEFUN([SST_ariel_CONFIG], [
   # Use LIBZ
   SST_CHECK_LIBZ()
 
+  AC_SUBST([ARIEL_MPICC])
+  AC_SUBST([ARIEL_MPICXX])
+  AC_SUBST([ARIEL_CFLAGS])
+  AC_SUBST([ARIEL_CXXFLAGS])
+
+  AC_CONFIG_FILES([src/sst/elements/ariel/api/Makefile])
+  AC_CONFIG_FILES([src/sst/elements/ariel/mpi/Makefile])
+
   AS_IF([test "$sst_check_ariel" = "yes"], [$1], [$2])
 ])