diff --git a/src/network-workloads/conf/modelnet-synthetic-fattree.conf b/src/network-workloads/conf/modelnet-synthetic-fattree.conf index b3956005a1f5bc1511aec9e19b0c268418e434d2..fcc74d01be7e595dbf4e5be1007766683a73ef5f 100644 --- a/src/network-workloads/conf/modelnet-synthetic-fattree.conf +++ b/src/network-workloads/conf/modelnet-synthetic-fattree.conf @@ -2,15 +2,15 @@ LPGROUPS { MODELNET_GRP { - repetitions="2"; - server="4"; - modelnet_fattree="4"; - fattree_switch="3"; + repetitions="4"; #Number of leaf level switches + server="2"; + modelnet_fattree="2"; + fattree_switch="2"; } } PARAMS { - ft_type="0"; # Only appears to be one type (type=0) in fattree.c + ft_type="1"; # Only appears to be one type (type=0) in fattree.c num_levels="2"; # Must be 1 < num_levels < 4 switch_count="2,4"; # Some sort of csv string. I'm thinking it's the number of switches per level switch_radix="4,4"; # Another csv string. I'm thinking it's the radix of the switches per level. All switches within same level have same radix diff --git a/src/network-workloads/conf/tracer-fattree-type2.conf b/src/network-workloads/conf/tracer-fattree-type2.conf new file mode 100644 index 0000000000000000000000000000000000000000..f17d67c976ed2fe90bb5b6b0876467a5821d0bda --- /dev/null +++ b/src/network-workloads/conf/tracer-fattree-type2.conf @@ -0,0 +1,28 @@ +LPGROUPS +{ + MODELNET_GRP + { + repetitions="16"; + server="4"; + modelnet_fattree="4"; + fattree_switch="3"; + } +} +PARAMS +{ + ft_type="1"; + packet_size="1024"; + message_size="512"; + modelnet_scheduler="fcfs"; + #modelnet_scheduler="round-robin"; + modelnet_order=( "fattree" ); + num_levels="3"; + switch_count="16"; + switch_radix="8"; + router_delay="60"; + soft_delay="1000"; + vc_size="65536"; + cn_vc_size="65536"; + link_bandwidth="4.7"; + cn_bandwidth="5.25"; +} diff --git a/src/network-workloads/model-net-synthetic-fattree.c b/src/network-workloads/model-net-synthetic-fattree.c index b7564c9b84d10ba665da56ad87574e6276a14f50..ea76c1402d76c891b6b6bbc6f30de6647faf1e5c 100644 --- a/src/network-workloads/model-net-synthetic-fattree.c +++ b/src/network-workloads/model-net-synthetic-fattree.c @@ -180,7 +180,7 @@ static void handle_kickoff_event( // assert(net_id == FATTREE); /* only supported for fat tree model right now. */ 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); /* in case of uniform random traffic, send to a random destination. */ if(traffic == UNIFORM) @@ -198,9 +198,11 @@ static void handle_kickoff_event( local_dest = (rep_id * 2 + offset + 2) % num_nodes; // printf("\n LP %ld sending to %ld num nodes %d ", rep_id * 2 + offset, local_dest, num_nodes); } -*/ assert(local_dest < num_nodes); - codes_mapping_get_lp_id(group_name, lp_type_name, anno, 1, local_dest / num_servers_per_rep, local_dest % num_servers_per_rep, &global_dest); - +*/// assert(local_dest < num_nodes); +// codes_mapping_get_lp_id(group_name, lp_type_name, anno, 1, local_dest / num_servers_per_rep, local_dest % num_servers_per_rep, &global_dest); + +global_dest = codes_mapping_get_lpid_from_relative(local_dest, group_name, lp_type_name, NULL, 0); +printf("global_dest:%d local_dest:%d\n",(int)global_dest,(int)local_dest); ns->msg_sent_count++; model_net_event(net_id, "test", global_dest, PAYLOAD_SZ, 0.0, sizeof(svr_msg), (const void*)m_remote, sizeof(svr_msg), (const void*)m_local, lp); issue_event(ns, lp); @@ -316,7 +318,7 @@ int main( int argc, char **argv) { -printf("program start\n"); + int nprocs; int rank; int num_nets; @@ -326,9 +328,9 @@ printf("program start\n"); lp_io_handle handle; tw_opt_add(app_opt); -printf("Pre timewarp init\n"); + tw_init(&argc, &argv); -printf("Post timewarp init\n"); + offset = 1; if(argc < 2) @@ -342,13 +344,13 @@ printf("Post timewarp init\n"); MPI_Comm_size(MPI_COMM_WORLD, &nprocs); configuration_load(argv[2], MPI_COMM_WORLD, &config); -printf("loaded configuration\n"); + model_net_register(); -printf("Registered model-net\n"); + svr_add_lp_type(); -printf("Added LP types\n"); + codes_mapping_setup(); -printf("Setup Codes mapping\n"); + net_ids = model_net_configure(&num_nets); assert(num_nets==1); @@ -369,6 +371,10 @@ printf("Setup Codes mapping\n"); num_nodes = num_groups * num_routers_per_grp * (num_routers_per_grp / 2); num_nodes_per_grp = num_routers_per_grp * (num_routers_per_grp / 2); + num_nodes = codes_mapping_get_lp_count("MODELNET_GRP", 0, "server", NULL, 1); + + + if(lp_io_prepare("modelnet-test", LP_IO_UNIQ_SUFFIX, &handle, MPI_COMM_WORLD) < 0) { return(-1);