Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

External TW_STIME #178

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

External TW_STIME #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c76dc8e
hotfix: some fixes for TW_STIME API
gonsie Sep 30, 2020
108d7e2
USE_EXTERNAL_STIME cmake option
gonsie Sep 30, 2020
73c7bc9
remove tw_opt type stime if external stime is in use
gonsie Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,15 @@ if (USE_DAMARIS)
SET(ross_srcs ${ross_srcs} ${ROSS_Damaris_SOURCE_DIR}/core/damaris.h)
ENDIF(USE_DAMARIS)

OPTION(USE_EXTERNAL_STIME "Use model-specific tw_stime implementation" OFF)
IF(USE_EXTERNAL_STIME)
#SET(ross_srcs ${ross_srcs} ${MODEL_STIME_SRC} ${MODEL_STIME_HDR})
#GET_FILENAME_COMPONENT(${stime_header_path} ${MODEL_STIME_HDR} DIRECTORY)
#INCLUDE_DIRECTORIES(${stime_header_path})
SET(ross_srcs ${ross_srcs} ${MODEL_STIME_SRC})
INCLUDE_DIRECTORIES(${MODEL_STIME_HDR})
ENDIF(USE_EXTERNAL_STIME)

# Use debugging-friendly memory allocation
OPTION(ROSS_ALLOC_DEBUG "Use naive allocator to be more friendly to memory debugging tools" OFF)

Expand Down
5 changes: 5 additions & 0 deletions core/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@
#cmakedefine ROSS_ALLOC_DEBUG
#cmakedefine USE_RIO
#cmakedefine USE_DAMARIS

#cmakedefine USE_EXTERNAL_STIME
#ifdef USE_EXTERNAL_STIME
#include "${MODEL_STIME_HDR}"
#endif
23 changes: 18 additions & 5 deletions core/gvt/mpi_allreduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ tw_gvt_step2(tw_pe *me)
tw_stime pq_min = TW_STIME_MAX;
tw_stime net_min = TW_STIME_MAX;

tw_stime lvt;
tw_stime gvt;

tw_stime lvt;
tw_stime gvt;

tw_clock net_start;
tw_clock start = tw_clock_read();
Expand Down Expand Up @@ -148,15 +149,27 @@ tw_gvt_step2(tw_pe *me)

all_reduce_cnt++;

// Note for TW_STIME API
// lvt is cast to double when going into the allreduce
// thus, the gvt that comes out is a double
// and needs to be cast back to an tw_stime object
//
// must continue to use MPI_DOUBLE type... or reimplement allreduce

double lvtd = TW_STIME_DBL(lvt);
double gvtd;

if(MPI_Allreduce(
&lvt,
&gvt,
&lvtd,
&gvtd,
1,
MPI_TYPE_TW_STIME,
MPI_DOUBLE,
MPI_MIN,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "MPI_Allreduce for GVT failed");

gvt = TW_STIME_CRT(gvtd);

if(TW_STIME_CMP(gvt, me->GVT_prev) < 0)
{
g_tw_gvt_no_change = 0;
Expand Down
5 changes: 3 additions & 2 deletions core/ross.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,20 @@ extern "C" {
# define free(b) must_not_use_free
#endif

// #include "config.h" -- moved to individual files that need them -- e.g., tw-setup.c

/* tw_peid -- Processing Element "PE" id */
typedef unsigned long tw_peid;

/* tw_stime -- Simulation time value for sim clock (NOT wall!) */
/* Model stime header included by config.h */
#ifndef USE_EXTERNAL_STIME
typedef double tw_stime;
#define MPI_TYPE_TW_STIME MPI_DOUBLE
#define TW_STIME_CRT(x) (x)
#define TW_STIME_DBL(x) (x)
#define TW_STIME_CMP(x, y) (((x) < (y)) ? -1 : ((x) > (y)))
#define TW_STIME_ADD(x, y) ((x) + (y))
#define TW_STIME_MAX DBL_MAX
#endif

/* tw_lpid -- Logical Process "LP" id */
//typedef unsigned long long tw_lpid;
Expand Down
14 changes: 12 additions & 2 deletions core/tw-opts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@ show_help(void)
pos += fprintf(stderr, "=dbl");
break;

#ifndef USE_EXTERNAL_STIME
case TWOPTTYPE_STIME:
pos += fprintf(stderr, "=ts");
break;
#endif

case TWOPTTYPE_CHAR:
pos += fprintf(stderr, "=str");
Expand Down Expand Up @@ -104,9 +106,11 @@ show_help(void)
fprintf(stderr, " (default %.2f)", *((double*)def->value));
break;

#ifndef USE_EXTERNAL_STIME
case TWOPTTYPE_STIME:
fprintf(stderr, " (default %.2f)", *((tw_stime*)def->value));
fprintf(stderr, " (default %.2f)", *((tw_stime*)def->value));
break;
#endif

case TWOPTTYPE_CHAR:
fprintf(stderr, " (default %s)", (char *) def->value);
Expand Down Expand Up @@ -184,9 +188,11 @@ void tw_opt_settings(FILE *outfile) {
fprintf(outfile, "%.2f", *((double*)def->value));
break;

#ifndef USE_EXTERNAL_STIME
case TWOPTTYPE_STIME:
fprintf(outfile, "%.2f", *((tw_stime*)def->value));
break;
#endif

case TWOPTTYPE_CHAR:
fprintf(outfile, "%s", (char *) def->value);
Expand Down Expand Up @@ -249,9 +255,11 @@ tw_opt_print(void)
fprintf(f, "%.2f,", *((double*)def->value));
break;

#ifndef USE_EXTERNAL_STIME
case TWOPTTYPE_STIME:
fprintf(f, "%.2f,", *((tw_stime*)def->value));
fprintf(f, "%.2f,", *((tw_stime*)def->value));
break;
#endif

case TWOPTTYPE_CHAR:
fprintf(f, "%s,", (char *)def->value);
Expand Down Expand Up @@ -332,6 +340,7 @@ apply_opt(const tw_optdef *def, const char *value)
break;
}

#ifndef USE_EXTERNAL_STIME
case TWOPTTYPE_STIME:
{
tw_stime v;
Expand All @@ -347,6 +356,7 @@ apply_opt(const tw_optdef *def, const char *value)
*((tw_stime*)def->value) = v;
break;
}
#endif

case TWOPTTYPE_CHAR:
{
Expand Down
6 changes: 5 additions & 1 deletion core/tw-opts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ enum tw_opttype
TWOPTTYPE_ULONG, /**< value must be an "unsigned long*" */
TWOPTTYPE_ULONGLONG, /**< value must be an "unsigned long long*" */
TWOPTTYPE_UINT, /**< value must be an "unsigned int*" */
#ifndef USE_EXTERNAL_STIME
TWOPTTYPE_STIME, /**< value must be a "tw_stime*" */
#endif
TWOPTTYPE_DOUBLE, /**< value must be a "double *" */
TWOPTTYPE_CHAR, /**< value must be a "char *" */
TWOPTTYPE_FLAG, /**< value must be an "unsigned int*" */
Expand All @@ -28,7 +30,9 @@ struct tw_optdef
#define TWOPT_ULONG(n,v,h) { TWOPTTYPE_ULONG, (n), (h), &(v) }
#define TWOPT_ULONGLONG(n,v,h) { TWOPTTYPE_ULONGLONG, (n), (h), &(v) }
#define TWOPT_UINT(n,v,h) { TWOPTTYPE_UINT, (n), (h), &(v) }
#define TWOPT_STIME(n,v,h) { TWOPTTYPE_STIME, (n), (h), &(v) }
#ifndef USE_EXTERNAL_STIME
#define TWOPT_STIME(n,v,h) { TWOPTTYPE_STIME, (n), (h), &(v) }
#endif
#define TWOPT_DOUBLE(n,v,h) { TWOPTTYPE_DOUBLE, (n), (h), &(v) }
#define TWOPT_CHAR(n,v,h) { TWOPTTYPE_CHAR, (n), (h), &(v) }
#define TWOPT_FLAG(n,v,h) { TWOPTTYPE_FLAG, (n), (h), &(v) }
Expand Down
2 changes: 1 addition & 1 deletion core/tw-pe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tw_pe_init(void)
memset(&no_type, 0, sizeof(no_type));
tw_pe_settype(&no_type);

g_tw_pe->trans_msg_ts = DBL_MAX;
g_tw_pe->trans_msg_ts = TW_STIME_MAX;
g_tw_pe->gvt_status = 0;

// TODO is the PE RNG ever actually used?
Expand Down