Commit 3a44fa9e authored by Swann Perarnau's avatar Swann Perarnau
Browse files

[feature] Add excit as submodule

Add excit library as submodule of AML, add make the necessary changes
across the autoconf/automake infrastructure.

Note that clang-format is not triggered by these changes.
parent ff8c19f5
......@@ -2,6 +2,7 @@ variables:
NMC_FE1_SLURM_PARAMETERS: "--nodes=1 --partition=ecp-p9-4v100"
ANL_THETA_PROJECT_SERVICE_USER: "cscstss"
ANL_THETA_SCHEDULER_PARAMETERS: "-A CSC250STPR19 -n 1 -t 20 -q debug-flat-quad"
GIT_SUBMODULE_STRATEGY: "normal"
stages:
- build
......
variables:
ARGOPKGS : "https://xgitlab.cels.anl.gov/argo/argopkgs/-/archive/master/argopkgs-master.tar.gz"
DEFAULT_MERGE_TARGET: "origin/staging"
GIT_SUBMODULE_STRATEGY: "normal"
stages:
- style
......
[submodule "excit"]
path = excit
url = ../excit.git
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src include tests doc benchmarks
SUBDIRS = src include tests doc benchmarks excit
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = aml.pc
......
......@@ -6,5 +6,5 @@ includedir=@includedir@
Name: libaml
Description: AML: Building Blocks for Memory Management
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -laml
Libs: -L${libdir} -laml -lexcit
Cflags: -I${includedir}
AM_COLOR_TESTS = yes
AM_CFLAGS = -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(OPENMP_CFLAGS)
AM_LDFLAGS = ../src/libaml.la $(PTHREAD_LIBS) $(OPENMP_CFLAGS)
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/excit/src $(PTHREAD_CFLAGS) $(OPENMP_CFLAGS)
AM_LDFLAGS = ../src/libaml.la $(top_builddir)/excit/src/libexcit.la $(PTHREAD_LIBS) $(OPENMP_CFLAGS)
if HAVE_CUDA
# LIBS is used instead of AM_LDFLAGS on purpose
......
......@@ -180,6 +180,8 @@ AM_EXTRA_RECURSIVE_TARGETS([check-programs])
# Output
########
AC_CONFIG_SUBDIRS([excit])
AC_CONFIG_HEADERS([include/config.h])
AC_CONFIG_FILES([Makefile
......
AM_COLOR_TESTS = yes
AM_CFLAGS = -I$(top_srcdir)/include $(PTHREAD_CFLAGS)
AM_LDFLAGS = $(top_builddir)/src/libaml.la $(PTHREAD_LIBS)
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/excit/src $(PTHREAD_CFLAGS)
AM_LDFLAGS = $(top_builddir)/src/libaml.la $(top_builddir)/excit/src/libexcit.la $(PTHREAD_LIBS)
if HAVE_CUDA
# LIBS is used instead of AM_LDFLAGS on purpose
......
Subproject commit c314d5c006f6d5d5340a037e4b39d04d1b21938a
......@@ -20,6 +20,7 @@
#include <assert.h>
#include <errno.h>
#include <excit.h>
#include <inttypes.h>
#include <numa.h>
#include <numaif.h>
......@@ -33,14 +34,14 @@
#include <sys/mman.h>
#include <unistd.h>
#include "aml/utils/async.h"
#include "aml/utils/bitmap.h"
#include "aml/utils/error.h"
#include "aml/utils/features.h"
#include "aml/utils/inner-malloc.h"
#include "aml/utils/vector.h"
#include "aml/utils/queue.h"
#include "aml/utils/async.h"
#include "aml/utils/vector.h"
#include "aml/utils/version.h"
#include "aml/utils/features.h"
////////////////////////////////////////////////////////////////////////////////
......
SUFFIXES=.c .cu
AM_CPPFLAGS = -I$(top_srcdir)/include $(PTHREAD_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/excit/src $(PTHREAD_CFLAGS)
AM_LDFLAGS = $(PTHREAD_LIBS)
noinst_LTLIBRARIES=
......
AM_COLOR_TESTS = yes
AM_CFLAGS = -I$(top_srcdir)/include $(PTHREAD_CFLAGS)
AM_LDFLAGS = ../src/libaml.la $(PTHREAD_LIBS)
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/excit/src $(PTHREAD_CFLAGS)
AM_LDFLAGS = ../src/libaml.la $(top_builddir)/excit/src/libexcit.la $(PTHREAD_LIBS)
if HAVE_CUDA
# LIBS is used instead of AM_LDFLAGS on purpose
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment