GitLab maintenance scheduled for Today, 2019-12-05, from 17:00 to 18:00 CT - Services will be unavailable during this time.

Commit 29d0c545 authored by Misbah Mubarak's avatar Misbah Mubarak

adapting vc count in dragonfly-custom for dally configuration

parent 0a984024
......@@ -2019,9 +2019,6 @@ void nw_test_init(nw_state* s, tw_lp* lp)
void nw_test_event_handler(nw_state* s, tw_bf * bf, nw_message * m, tw_lp * lp)
{
if(s->app_id < 0)
printf("\n msg type %d ", m->msg_type);
assert(s->app_id >= 0 && s->local_rank >= 0);
//*(int *)bf = (int)0;
......
......@@ -605,9 +605,9 @@ if(DF_DALLY == 0)
else
{
if(routing == PROG_ADAPTIVE)
p->num_vcs = 4;
p->num_vcs = 5;
else
p->num_vcs = 3;
p->num_vcs = 4;
}
rc = configuration_get_value_int(&config, "PARAMS", "num_groups", anno, &p->num_groups);
if(rc) {
......@@ -2946,18 +2946,18 @@ router_packet_receive( router_state * s,
}
else {
if(cur_chunk->msg.my_g_hop == 1) {
if(routing == PROG_ADAPTIVE && cur_chunk->msg.my_l_hop != 2){
if(routing == PROG_ADAPTIVE && cur_chunk->msg.my_l_hop < 2){
cur_chunk->msg.my_l_hop = 2;
} else if(cur_chunk->msg.my_l_hop != 1){
} else if(cur_chunk->msg.my_l_hop < 1){
cur_chunk->msg.my_l_hop = 1;
}
}
else if (cur_chunk->msg.my_g_hop == 2) {
if(routing == PROG_ADAPTIVE && cur_chunk->msg.my_l_hop != 3) {
cur_chunk->msg.my_l_hop = 3;
if(routing == PROG_ADAPTIVE && cur_chunk->msg.my_l_hop < 4) {
cur_chunk->msg.my_l_hop = 4;
}
else if(cur_chunk->msg.my_l_hop != 2)
cur_chunk->msg.my_l_hop = 2;
else if(cur_chunk->msg.my_l_hop < 3)
cur_chunk->msg.my_l_hop = 3;
}
}
output_chan = cur_chunk->msg.my_l_hop;
......
......@@ -44,9 +44,9 @@ long num_recvs = 0;
long num_sendrecv = 0;
long num_waitalls = 0;
std::map<int64_t, int> send_count;
std::map<int64_t, int> isend_count;
std::map<int64_t, int> allreduce_count;
//std::map<int64_t, int> send_count;
//std::map<int64_t, int> isend_count;
//std::map<int64_t, int> allreduce_count;
struct shared_context {
int my_rank;
......@@ -100,7 +100,7 @@ void SWM_Send(SWM_PEER peer,
wrkld_per_rank.u.send.dest_rank = peer;
#ifdef DBG_COMM
if(tag != 1235 && tag != 1234)
/* if(tag != 1235 && tag != 1234)
{
auto it = send_count.find(bytes);
if(it == send_count.end())
......@@ -111,7 +111,7 @@ void SWM_Send(SWM_PEER peer,
{
it->second = it->second + 1;
}
}
}*/
#endif
/* Retreive the shared context state */
ABT_thread prod;
......@@ -220,7 +220,7 @@ void SWM_Isend(SWM_PEER peer,
wrkld_per_rank.u.send.dest_rank = peer;
#ifdef DBG_COMM
if(tag != 1235 && tag != 1234)
/* if(tag != 1235 && tag != 1234)
{
auto it = isend_count.find(bytes);
if(it == isend_count.end())
......@@ -231,7 +231,7 @@ void SWM_Isend(SWM_PEER peer,
{
it->second = it->second + 1;
}
}
}*/
#endif
/* Retreive the shared context state */
ABT_thread prod;
......@@ -437,7 +437,7 @@ void SWM_Sendrecv(
recv_op.u.recv.num_bytes = 0;
#ifdef DBG_COMM
if(sendtag != 1235 && sendtag != 1234)
/* if(sendtag != 1235 && sendtag != 1234)
{
auto it = send_count.find(sendbytes);
if(it == send_count.end())
......@@ -448,7 +448,7 @@ void SWM_Sendrecv(
{
it->second = it->second + 1;
}
}
}*/
#endif
/* Retreive the shared context state */
ABT_thread prod;
......@@ -714,7 +714,7 @@ void SWM_Finalize()
sctx->fifo.push_back(&wrkld_per_rank);
#ifdef DBG_COMM
auto it = allreduce_count.begin();
/* auto it = allreduce_count.begin();
for(; it != allreduce_count.end(); it++)
{
cout << "\n Allreduce " << it->first << " " << it->second;
......@@ -730,7 +730,7 @@ void SWM_Finalize()
for(; it != isend_count.end(); it++)
{
cout << "\n isend " << it->first << " " << it->second;
}
}*/
#endif
//#ifdef DBG_COMM
// printf("\n finalize workload for rank %d ", sctx->my_rank);
......
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