Commit ce3a7294 authored by Xin Wang's avatar Xin Wang

update configure and makefile

parent 0b26c309
......@@ -60,17 +60,17 @@ src_libcodes_la_SOURCES += src/workload/methods/codes-recorder-io-wrkld.c
endif
if USE_ONLINE
AM_CPPFLAGS += ${ARGOBOTS_CFLAGS} ${SWM_CFLAGS} -DUSE_ONLINE=1
AM_CPPFLAGS += ${ARGOBOTS_CFLAGS} -DUSE_ONLINE=1
LDADD += ${ARGOBOTS_LIBS}
if USE_SWM
AM_CPPFLAGS += -DUSE_SWM=1
AM_CPPFLAGS += ${SWM_CFLAGS} -DUSE_SWM=1
LDADD += ${SWM_LIBS}
src_libcodes_la_SOURCES += src/workload/methods/codes-online-comm-wrkld.C
endif
if USE_CONC
if USE_COWG
src_libcodes_la_SOURCES += src/workload/methods/codes-conc-online-comm-wrkld.C
AM_CPPFLAGS += ${CONCEPTUAL_CFLAGS} ${COWG_CFLAGS} -DUSE_CONC=1
LDADD += ${CONCEPTUAL_LIBS} ${COWG_LIBS}
AM_CPPFLAGS += ${COWG_CFLAGS} ${SWM_CFLAGS} -DUSE_COWG=1
LDADD += ${COWG_LIBS} ${SWM_LIBS}
endif
endif
......
......@@ -145,29 +145,26 @@ else
AM_CONDITIONAL(USE_SWM, false)
fi
#check for Conceptual
AC_ARG_WITH([conceptual],[AS_HELP_STRING([--with-conceptual@<:@=DIR@:>@],
[location of Conceptual installation])])
if test "x${with_conceptual}" != "x" ; then
AC_CHECK_FILES([${with_conceptual}/lib/libncptl.a],
AM_CONDITIONAL(USE_CONC, true),
AC_MSG_ERROR(Could not find Conceptual libraries libncptl.a))
CONCEPTUAL_CFLAGS="-I${with_conceptual}/include"
CONCEPTUAL_LIBS="-L${with_conceptual}/lib/ -lncptl"
AC_SUBST(CONCEPTUAL_LIBS)
AC_SUBST(CONCEPTUAL_CFLAGS)
#check for COWG
AC_ARG_WITH([cowg],[AS_HELP_STRING([--with-cowg@<:@=DIR@:>@],
[location of COWG installation])])
if test "x${with_cowg}" != "x" ; then
AM_CONDITIONAL(USE_COWG, true)
PKG_CHECK_MODULES_STATIC([COWG], [cowg], [],
[AC_MSG_ERROR([Could not find working cowg installation via pkg-config])])
PKG_CHECK_VAR([COWG_DATADIR], [cowg], [datadir], [],
PKG_CHECK_VAR([COWG_DATADIR], [cowg], [datarootdir], [],
[AC_MSG_ERROR[Could not find shared directory in COWG]])
AC_DEFINE_UNQUOTED([COWG_DATADIR], ["$COWG_DATADIR"], [if using json
AC_DEFINE_UNQUOTED([COWG_DATADIR], ["$COWG_DATADIR"], [if using json data files])
PKG_CHECK_MODULES_STATIC([SWM], [swm], [],
[AC_MSG_ERROR([Could not find working swm installation via pkg-config])])
PKG_CHECK_VAR([SWM_DATAROOTDIR], [swm], [datarootdir], [],
[AC_MSG_ERROR[Could not find shared directory in SWM]])
AC_DEFINE_UNQUOTED([SWM_DATAROOTDIR], ["$SWM_DATAROOTDIR"], [if using json
data files])
else
AM_CONDITIONAL(USE_CONC, false)
AM_CONDITIONAL(USE_COWG, false)
fi
# check for Recorder
AM_CONDITIONAL(USE_RECORDER, true)
RECORDER_CPPFLAGS="-DUSE_RECORDER=1"
......
......@@ -38,7 +38,7 @@ extern struct codes_workload_method recorder_io_workload_method;
#ifdef USE_SWM
extern struct codes_workload_method swm_online_comm_workload_method;
#endif
#ifdef USE_CONC
#ifdef USE_COWG
extern struct codes_workload_method conc_online_comm_workload_method;
#endif
......@@ -66,7 +66,7 @@ static struct codes_workload_method const * method_array_default[] =
#ifdef USE_SWM
&swm_online_comm_workload_method,
#endif
#ifdef USE_CONC
#ifdef USE_COWG
&conc_online_comm_workload_method,
#endif
#ifdef USE_RECORDER
......
......@@ -35,17 +35,17 @@ using namespace std;
static struct qhash_table *rank_tbl = NULL;
static int rank_tbl_pop = 0;
static int total_rank_cnt = 0;
ABT_thread global_prod_thread = NULL;
ABT_xstream self_es;
double cpu_freq = 1.0;
long num_allreduce = 0;
long num_isends = 0;
long num_irecvs = 0;
long num_barriers = 0;
long num_sends = 0;
long num_recvs = 0;
long num_sendrecv = 0;
long num_waitalls = 0;
static ABT_thread global_prod_thread = NULL;
static ABT_xstream self_es;
static double cpu_freq = 1.0;
static long num_allreduce = 0;
static long num_isends = 0;
static long num_irecvs = 0;
static long num_barriers = 0;
static long num_sends = 0;
static long num_recvs = 0;
static long num_sendrecv = 0;
static long num_waitalls = 0;
//std::map<int64_t, int> send_count;
//std::map<int64_t, int> isend_count;
......
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