Skip to content
Snippets Groups Projects
Commit f7d74f82 authored by Kay Thust's avatar Kay Thust
Browse files

merged from master

parents 0a4f22b8 fd742c57
No related branches found
No related tags found
No related merge requests found
......@@ -398,8 +398,11 @@ ssize_t nam_get_max_bytes(nam_ext_allocation_t *ext_alloc)
{
ssize_t rc;
rc = ext_alloc->max_bytes;
return rc;
}
int nam_init_extended()
......@@ -698,7 +701,7 @@ int nam_restart(nam_cp_args_t *args)
}
}
sleep(3);
MPI_Barrier(comm);
//set all memory to unactive
extoll_reset_memory();
......@@ -1166,7 +1169,7 @@ nam_ext_allocation_t *nam_alloc_cprs(int root, MPI_Comm comm)
#ifndef ATEST
MPI_Allgather(&my_rank_global, 1, MPI_INT, ext_alloc->global_ranks, 1, MPI_INT, comm_local);
#else
dummy_allgather(&my_rank_global, 1, MPI_INT, ext_alloc->global_ranks, comm);
dummy_allgather(&my_rank_global, 1, MPI_INT, ext_alloc->global_ranks, comm_local);
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment