Commit 54b9fd75 authored by Philip Carns's avatar Philip Carns

make margo benchmarks show mercury addr

parent 875506df
...@@ -98,6 +98,9 @@ int main(int argc, char **argv) ...@@ -98,6 +98,9 @@ int main(int argc, char **argv)
ABT_xstream *bw_worker_xstreams = NULL; ABT_xstream *bw_worker_xstreams = NULL;
ABT_sched *bw_worker_scheds = NULL; ABT_sched *bw_worker_scheds = NULL;
struct hg_init_info hii; struct hg_init_info hii;
char ssg_self_str[128] = {0};
hg_size_t ssg_self_str_len = 128;
hg_addr_t self_addr;
MPI_Init(&argc, &argv); MPI_Init(&argc, &argv);
...@@ -110,8 +113,6 @@ int main(int argc, char **argv) ...@@ -110,8 +113,6 @@ int main(int argc, char **argv)
} }
MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Get_processor_name(processor_name,&namelen); MPI_Get_processor_name(processor_name,&namelen);
printf("Process %d of %d is on %s\n",
rank, nranks, processor_name);
ret = parse_args(argc, argv, &g_opts); ret = parse_args(argc, argv, &g_opts);
if(ret < 0) if(ret < 0)
...@@ -187,6 +188,15 @@ int main(int argc, char **argv) ...@@ -187,6 +188,15 @@ int main(int argc, char **argv)
self = ssg_get_group_self_id(gid); self = ssg_get_group_self_id(gid);
self_addr = ssg_get_addr(gid, self);
assert(self_addr != HG_ADDR_NULL);
ret = margo_addr_to_string(mid, ssg_self_str, &ssg_self_str_len, self_addr);
assert(ret == 0);
printf("Process %d of %d is on host %s, advertising Hg address %s\n",
rank, nranks, processor_name, ssg_self_str);
if(self == 1) if(self == 1)
{ {
/* server side: prep everything before letting the client initiate /* server side: prep everything before letting the client initiate
......
...@@ -52,6 +52,9 @@ int main(int argc, char **argv) ...@@ -52,6 +52,9 @@ int main(int argc, char **argv)
int namelen; int namelen;
char processor_name[MPI_MAX_PROCESSOR_NAME]; char processor_name[MPI_MAX_PROCESSOR_NAME];
struct hg_init_info hii; struct hg_init_info hii;
char ssg_self_str[128] = {0};
hg_size_t ssg_self_str_len = 128;
hg_addr_t self_addr;
MPI_Init(&argc, &argv); MPI_Init(&argc, &argv);
...@@ -64,8 +67,6 @@ int main(int argc, char **argv) ...@@ -64,8 +67,6 @@ int main(int argc, char **argv)
} }
MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Get_processor_name(processor_name,&namelen); MPI_Get_processor_name(processor_name,&namelen);
printf("Process %d of %d is on %s\n",
rank, nranks, processor_name);
ret = parse_args(argc, argv, &g_opts); ret = parse_args(argc, argv, &g_opts);
if(ret < 0) if(ret < 0)
...@@ -122,6 +123,14 @@ int main(int argc, char **argv) ...@@ -122,6 +123,14 @@ int main(int argc, char **argv)
printf("MPI rank %d has SSG ID %lu\n", rank, self); printf("MPI rank %d has SSG ID %lu\n", rank, self);
#endif #endif
self_addr = ssg_get_addr(gid, self);
assert(self_addr != HG_ADDR_NULL);
ret = margo_addr_to_string(mid, ssg_self_str, &ssg_self_str_len, self_addr);
assert(ret == 0);
printf("Process %d of %d is on host %s, advertising Hg address %s\n",
rank, nranks, processor_name, ssg_self_str);
if(self == 0) if(self == 0)
{ {
/* ssg id 0 runs benchmark */ /* ssg id 0 runs benchmark */
......
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