Commit 6c8404d2 authored by Noah Wolfe's avatar Noah Wolfe

replaced stray dragonfly labels with fattree

parent 5362acd9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
typedef struct fattree_message fattree_message; typedef struct fattree_message fattree_message;
/* this message is used for both dragonfly compute nodes and routers */ /* this message is used for both fattree compute nodes and routers */
struct fattree_message struct fattree_message
{ {
/* magic number */ /* magic number */
......
...@@ -2,10 +2,10 @@ LPGROUPS ...@@ -2,10 +2,10 @@ LPGROUPS
{ {
MODELNET_GRP MODELNET_GRP
{ {
repetitions="36"; repetitions="2";
server="2"; server="4";
modelnet_fattree="2"; modelnet_fattree="4";
fattree_switch="1"; fattree_switch="3";
} }
} }
PARAMS PARAMS
...@@ -18,15 +18,15 @@ PARAMS ...@@ -18,15 +18,15 @@ PARAMS
modelnet_order=( "fattree" ); modelnet_order=( "fattree" );
# scheduler options # scheduler options
modelnet_scheduler="fcfs"; modelnet_scheduler="fcfs";
# chunk_size="32"; chunk_size="32";
# modelnet_scheduler="round-robin"; # modelnet_scheduler="round-robin";
# num_vcs="1"; num_vcs="1";
vc_size="16384"; vc_size="16384";
cn_vc_size="16384"; cn_vc_size="16384";
link_bandwidth="5"; link_bandwidth="5";
cn_bandwidth="5"; cn_bandwidth="5";
message_size="512"; message_size="512";
# routing="minimal"; routing="minimal";
router_delay="50"; router_delay="50";
soft_delay="1000"; soft_delay="1000";
} }
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
/* /*
* The test program generates some synthetic traffic patterns for the model-net network models. * The test program generates some synthetic traffic patterns for the model-net network models.
* currently it only support the dragonfly network model uniform random and nearest neighbor traffic patterns. * currently it only support the fat tree network model uniform random and nearest neighbor traffic patterns.
*/ */
#include "codes/model-net.h" #include "codes/model-net.h"
...@@ -177,10 +177,10 @@ static void handle_kickoff_event( ...@@ -177,10 +177,10 @@ static void handle_kickoff_event(
memcpy(m_remote, m_local, sizeof(svr_msg)); memcpy(m_remote, m_local, sizeof(svr_msg));
m_remote->svr_event_type = REMOTE; m_remote->svr_event_type = REMOTE;
// assert(net_id == DRAGONFLY); /* only supported for dragonfly model right now. */ // assert(net_id == FATTREE); /* only supported for fat tree model right now. */
ns->start_ts = tw_now(lp); ns->start_ts = tw_now(lp);
printf("Kicking off events\n");
codes_mapping_get_lp_info(lp->gid, group_name, &group_index, lp_type_name, &lp_type_index, anno, &rep_id, &offset); codes_mapping_get_lp_info(lp->gid, group_name, &group_index, lp_type_name, &lp_type_index, anno, &rep_id, &offset);
/* in case of uniform random traffic, send to a random destination. */ /* in case of uniform random traffic, send to a random destination. */
if(traffic == UNIFORM) if(traffic == UNIFORM)
...@@ -316,6 +316,7 @@ int main( ...@@ -316,6 +316,7 @@ int main(
int argc, int argc,
char **argv) char **argv)
{ {
printf("program start\n");
int nprocs; int nprocs;
int rank; int rank;
int num_nets; int num_nets;
...@@ -325,7 +326,9 @@ int main( ...@@ -325,7 +326,9 @@ int main(
lp_io_handle handle; lp_io_handle handle;
tw_opt_add(app_opt); tw_opt_add(app_opt);
printf("Pre timewarp init\n");
tw_init(&argc, &argv); tw_init(&argc, &argv);
printf("Post timewarp init\n");
offset = 1; offset = 1;
if(argc < 2) if(argc < 2)
...@@ -339,20 +342,22 @@ int main( ...@@ -339,20 +342,22 @@ int main(
MPI_Comm_size(MPI_COMM_WORLD, &nprocs); MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
configuration_load(argv[2], MPI_COMM_WORLD, &config); configuration_load(argv[2], MPI_COMM_WORLD, &config);
printf("loaded configuration\n");
model_net_register(); model_net_register();
printf("Registered model-net\n");
svr_add_lp_type(); svr_add_lp_type();
printf("Added LP types\n");
codes_mapping_setup(); codes_mapping_setup();
printf("Setup Codes mapping\n");
net_ids = model_net_configure(&num_nets); net_ids = model_net_configure(&num_nets);
assert(num_nets==1); assert(num_nets==1);
net_id = *net_ids; net_id = *net_ids;
free(net_ids); free(net_ids);
if(net_id != DRAGONFLY) if(net_id != FATTREE)
{ {
printf("\n The test works with dragonfly model configuration only! "); printf("\n The test works with fat tree model configuration only! ");
MPI_Finalize(); MPI_Finalize();
return 0; return 0;
} }
......
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