Commit 62564150 authored by Misbah Mubarak's avatar Misbah Mubarak

modifications to custom-dragonfly: updating header files, changing variable names in the model

parent 0ddc2e4d
...@@ -5,7 +5,7 @@ bin_PROGRAMS = ...@@ -5,7 +5,7 @@ bin_PROGRAMS =
bin_SCRIPTS = bin_SCRIPTS =
noinst_LIBRARIES = noinst_LIBRARIES =
noinst_PROGRAMS = noinst_PROGRAMS =
lib_LIBRARIES = lib_LTLIBRARIES =
noinst_HEADERS = noinst_HEADERS =
TESTS = TESTS =
check_PROGRAMS = check_PROGRAMS =
...@@ -30,7 +30,7 @@ AM_CFLAGS = ...@@ -30,7 +30,7 @@ AM_CFLAGS =
AM_CXXFLAGS = $(AM_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS)
LDADD = $(lib_LIBRARIES) $(ROSS_LIBS) LDADD = $(lib_LTLIBRARIES) $(ROSS_LIBS)
include Make.rules include Make.rules
...@@ -41,18 +41,18 @@ include $(top_srcdir)/doc/Makefile.subdir ...@@ -41,18 +41,18 @@ include $(top_srcdir)/doc/Makefile.subdir
if USE_DARSHAN if USE_DARSHAN
AM_CPPFLAGS += ${DARSHAN_CFLAGS} -DUSE_DARSHAN=1 AM_CPPFLAGS += ${DARSHAN_CFLAGS} -DUSE_DARSHAN=1
src_libcodes_a_SOURCES += src/workload/methods/codes-darshan-io-wrkld.c src_libcodes_la_SOURCES += src/workload/methods/codes-darshan-io-wrkld.c
LDADD += ${DARSHAN_LIBS} LDADD += ${DARSHAN_LIBS}
TESTS += tests/workload/darshan-dump.sh TESTS += tests/workload/darshan-dump.sh
endif endif
if USE_RECORDER if USE_RECORDER
AM_CPPFLAGS += ${RECORDER_CPPFLAGS} AM_CPPFLAGS += ${RECORDER_CPPFLAGS}
src_libcodes_a_SOURCES += src/workload/methods/codes-recorder-io-wrkld.c src_libcodes_la_SOURCES += src/workload/methods/codes-recorder-io-wrkld.c
endif endif
if USE_DUMPI if USE_DUMPI
AM_CPPFLAGS += ${DUMPI_CFLAGS} -DUSE_DUMPI=1 AM_CPPFLAGS += ${DUMPI_CFLAGS} -DUSE_DUMPI=1
src_libcodes_a_SOURCES += src/workload/methods/codes-dumpi-trace-nw-wrkld.c src_libcodes_la_SOURCES += src/workload/methods/codes-dumpi-trace-nw-wrkld.c
LDADD += ${DUMPI_LIBS} LDADD += ${DUMPI_LIBS}
endif endif
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* *
*/ */
#ifndef DRAGONFLY_H #ifndef DRAGONFLY_CUSTOM_H
#define DRAGONFLY_H #define DRAGONFLY_CUSTOM_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -13,10 +13,10 @@ extern "C" { ...@@ -13,10 +13,10 @@ extern "C" {
#include <ross.h> #include <ross.h>
typedef struct terminal_message terminal_message; typedef struct terminal_custom_message terminal_custom_message;
/* this message is used for both dragonfly compute nodes and routers */ /* this message is used for both dragonfly compute nodes and routers */
struct terminal_message struct terminal_custom_message
{ {
/* magic number */ /* magic number */
int magic; int magic;
...@@ -49,6 +49,8 @@ struct terminal_message ...@@ -49,6 +49,8 @@ struct terminal_message
short saved_channel; short saved_channel;
short saved_vc; short saved_vc;
int next_stop;
short nonmin_done; short nonmin_done;
/* Intermediate LP ID from which this message is coming */ /* Intermediate LP ID from which this message is coming */
unsigned int intm_lp_id; unsigned int intm_lp_id;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
AC_PREREQ([2.67]) AC_PREREQ([2.67])
AC_INIT([codes], [0.5.2], [http://trac.mcs.anl.gov/projects/codes/newticket],[],[http://www.mcs.anl.gov/projects/codes/]) AC_INIT([codes], [0.5.2], [http://trac.mcs.anl.gov/projects/codes/newticket],[],[http://www.mcs.anl.gov/projects/codes/])
LT_INIT
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
...@@ -25,7 +26,6 @@ AC_PROG_CC ...@@ -25,7 +26,6 @@ AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CXXCPP AC_PROG_CXXCPP
AC_PROG_RANLIB
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
......
lib_LIBRARIES += src/libcodes.a lib_LTLIBRARIES += src/libcodes.la
BUILT_SOURCES += src/modelconfig/configparser.h \ BUILT_SOURCES += src/modelconfig/configparser.h \
src/modelconfig/configlex.h src/modelconfig/configlex.h
...@@ -98,7 +98,7 @@ nobase_include_HEADERS = \ ...@@ -98,7 +98,7 @@ nobase_include_HEADERS = \
#codes/codes-nw-workload.h #codes/codes-nw-workload.h
src_libcodes_a_SOURCES = \ src_libcodes_la_SOURCES = \
src/iokernellang/codesparser.h \ src/iokernellang/codesparser.h \
src/iokernellang/codesparser.c \ src/iokernellang/codesparser.c \
src/iokernellang/codeslexer.h \ src/iokernellang/codeslexer.h \
...@@ -155,11 +155,7 @@ src_libcodes_a_SOURCES = \ ...@@ -155,11 +155,7 @@ src_libcodes_a_SOURCES = \
src/networks/model-net/model-net-lp.c \ src/networks/model-net/model-net-lp.c \
src/networks/model-net/model-net-sched.c \ src/networks/model-net/model-net-sched.c \
src/networks/model-net/model-net-sched-impl.h \ src/networks/model-net/model-net-sched-impl.h \
src/networks/model-net/model-net-sched-impl.c \ src/networks/model-net/model-net-sched-impl.c
src/network-workloads/model-net-mpi-replay.c \
src/network-workloads/model-net-synthetic.c \
src/network-workloads/model-net-synthetic-slimfly.c \
src/network-workloads/model-net-dumpi-traces-dump.c
#codes/codes-nw-workload.h #codes/codes-nw-workload.h
...@@ -184,10 +180,11 @@ bin_PROGRAMS += src/network-workloads/model-net-synthetic-slimfly ...@@ -184,10 +180,11 @@ bin_PROGRAMS += src/network-workloads/model-net-synthetic-slimfly
src_workload_codes_workload_dump_SOURCES = \ src_workload_codes_workload_dump_SOURCES = \
src/workload/codes-workload-dump.c src/workload/codes-workload-dump.c
src_network_workloads_model_net_mpi_replay_SOURCES = src/network-workloads/model-net-mpi-replay.c src_network_workloads_model_net_mpi_replay_SOURCES = src/network-workloads/model-net-mpi-replay.c
src_network_workloads_model_net_synthetic_SOURCES = src/network-workloads/model-net-synthetic.c src_network_workloads_model_net_synthetic_SOURCES = src/network-workloads/model-net-synthetic.c
src_network_workloads_model_net_synthetic_slimfly_SOURCES = src/network-workloads/model-net-synthetic-slimfly.c src_network_workloads_model_net_synthetic_slimfly_SOURCES = src/network-workloads/model-net-synthetic-slimfly.c src/network-workloads/dummy.C
src_network_workloads_model_net_dumpi_traces_dump_SOURCES = src/network-workloads/model-net-dumpi-traces-dump.c src_network_workloads_model_net_dumpi_traces_dump_SOURCES = src/network-workloads/model-net-dumpi-traces-dump.c src/network-workloads/dummy.C
#bin_PROGRAMS += src/network-workload/codes-nw-test #bin_PROGRAMS += src/network-workload/codes-nw-test
......
This diff is collapsed.
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