d42e0968b1
This commit rewrites parts of libnbc to fix issues identified by coverity and myself. The changes are as follows: - libnbc function would return invalid error codes (internal to libnbc) to the mpi layer. These codes names are of the form NBC_. They do not match up with the error codes expected by the mpi layer. I purged the use of all these error codes with the exception of NBC_OK and NBC_CONTINUE in progress. These codes are used to identify when a request handle is complete. - Handles and schedules were leaked by all collective routines on error. A new routine was added to return a collective handle (NBC_Return_handle). - Temporary buffers containting in/out neighbors for neighborhood collectives were always leaked. - Neigborhood collectives contained code to handle MPI_IN_PLACE which is never a valid input for the send or receive buffer. Stipped this code out. - Files were inconsistently named. Most are nbc_isomething.c but one was named coll_libnbc_ireduce_scatter_block.c. - Made the NBC_Schedule "structure" and object so it can be retained/released. This may enable the use of schedule caching at a later time. More testing will be needed to ensure the caching code works. If it doesn't the code should be stripped out completely. - Added code to simply common case of scheduling send/recv + barrier. - Code cleanup for readability. The code now passes the clang static analyzer. Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
319 строки
9.9 KiB
C
319 строки
9.9 KiB
C
/* -*- Mode: C; c-basic-offset:2 ; indent-tabs-mode:nil -*- */
|
|
/*
|
|
* Copyright (c) 2006 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2006 The Technical University of Chemnitz. All
|
|
* rights reserved.
|
|
* Copyright (c) 2012 Sandia National Laboratories. All rights reserved.
|
|
* Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
|
|
* reserved.
|
|
* Copyright (c) 2014-2015 Research Organization for Information Science
|
|
* and Technology (RIST). All rights reserved.
|
|
*
|
|
* Author(s): Torsten Hoefler <htor@cs.indiana.edu>
|
|
*
|
|
*/
|
|
#include "nbc_internal.h"
|
|
|
|
/* an reduce_csttare schedule can not be cached easily because the contents
|
|
* ot the recvcount value may change, so a comparison of the address
|
|
* would not be sufficient ... we simply do not cache it */
|
|
|
|
/* binomial reduce to rank 0 followed by a linear scatter ...
|
|
*
|
|
* Algorithm:
|
|
* pairwise exchange
|
|
* round r:
|
|
* grp = rank % 2^r
|
|
* if grp == 0: receive from rank + 2^(r-1) if it exists and reduce value
|
|
* if grp == 1: send to rank - 2^(r-1) and exit function
|
|
*
|
|
* do this for R=log_2(p) rounds
|
|
*
|
|
*/
|
|
|
|
int ompi_coll_libnbc_ireduce_scatter_block(void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype,
|
|
MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request,
|
|
struct mca_coll_base_module_2_1_0_t *module) {
|
|
int peer, rank, maxr, p, res, count;
|
|
MPI_Aint ext;
|
|
char *redbuf, *sbuf, inplace;
|
|
NBC_Schedule *schedule;
|
|
NBC_Handle *handle;
|
|
ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module;
|
|
|
|
NBC_IN_PLACE(sendbuf, recvbuf, inplace);
|
|
|
|
rank = ompi_comm_rank (comm);
|
|
p = ompi_comm_size (comm);
|
|
|
|
res = MPI_Type_extent(datatype, &ext);
|
|
if (MPI_SUCCESS != res || 0 == ext) {
|
|
NBC_Error ("MPI Error in MPI_Type_extent() (%i:%i)", res, (int) ext);
|
|
return (MPI_SUCCESS == res) ? MPI_ERR_SIZE : res;
|
|
}
|
|
|
|
res = NBC_Init_handle(comm, &handle, libnbc_module);
|
|
if (OMPI_SUCCESS != res) {
|
|
return res;
|
|
}
|
|
|
|
schedule = OBJ_NEW(NBC_Schedule);
|
|
if (NULL == schedule) {
|
|
OMPI_COLL_LIBNBC_REQUEST_RETURN(handle);
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
|
|
/* make sure the schedule is released with the handle on error */
|
|
handle->schedule = schedule;
|
|
|
|
maxr = (int)ceil((log((double)p)/LOG2));
|
|
|
|
count = p * recvcount;
|
|
|
|
if (0 < count) {
|
|
handle->tmpbuf = malloc (ext*count*2);
|
|
if (NULL == handle->tmpbuf) {
|
|
OMPI_COLL_LIBNBC_REQUEST_RETURN(handle);
|
|
OBJ_RELEASE(schedule);
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
|
|
redbuf = (char *) handle->tmpbuf + ext * count;
|
|
|
|
/* copy data to redbuf if we only have a single node */
|
|
if ((p == 1) && !inplace) {
|
|
res = NBC_Copy (sendbuf, count, datatype, redbuf, count, datatype, comm);
|
|
if (OMPI_SUCCESS != res) {
|
|
NBC_Return_handle (handle);
|
|
OBJ_RELEASE(schedule);
|
|
return res;
|
|
}
|
|
|
|
*request = &ompi_request_empty;
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
for (int r = 1, firstred = 1 ; r <= maxr; ++r) {
|
|
if ((rank % (1 << r)) == 0) {
|
|
/* we have to receive this round */
|
|
peer = rank + (1 << (r - 1));
|
|
if (peer < p) {
|
|
/* we have to wait until we have the data */
|
|
res = NBC_Sched_recv (0, true, count, datatype, peer, schedule, true);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
if (firstred) {
|
|
/* take reduce data from the sendbuf in the first round -> save copy */
|
|
res = NBC_Sched_op (redbuf-(unsigned long)handle->tmpbuf, true, sendbuf, false, 0, true, count,
|
|
datatype, op, schedule, true);
|
|
firstred = 0;
|
|
} else {
|
|
/* perform the reduce in my local buffer */
|
|
res = NBC_Sched_op (redbuf-(unsigned long)handle->tmpbuf, true, redbuf-(unsigned long)handle->tmpbuf,
|
|
true, 0, true, count, datatype, op, schedule, true);
|
|
}
|
|
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
}
|
|
} else {
|
|
/* we have to send this round */
|
|
peer = rank - (1 << (r - 1));
|
|
if(firstred) {
|
|
/* we have to send the senbuf */
|
|
res = NBC_Sched_send (sendbuf, false, count, datatype, peer, schedule, true);
|
|
} else {
|
|
/* we send an already reduced value from redbuf */
|
|
res = NBC_Sched_send (redbuf-(unsigned long)handle->tmpbuf, true, count, datatype, peer, schedule, true);
|
|
}
|
|
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
/* leave the game */
|
|
break;
|
|
}
|
|
}
|
|
|
|
res = NBC_Sched_barrier(schedule);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
/* rank 0 is root and sends - all others receive */
|
|
if (rank != 0) {
|
|
res = NBC_Sched_recv (recvbuf, false, recvcount, datatype, 0, schedule, false);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
} else {
|
|
for (int r = 1, offset = 0 ; r < p ; ++r) {
|
|
offset += recvcount;
|
|
sbuf = ((char *)redbuf) + (offset*ext);
|
|
/* root sends the right buffer to the right receiver */
|
|
res = NBC_Sched_send (sbuf-(unsigned long)handle->tmpbuf, true, recvcount, datatype, r, schedule, false);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
}
|
|
|
|
res = NBC_Sched_copy (redbuf-(unsigned long)handle->tmpbuf, true, recvcount, datatype, recvbuf, false, recvcount,
|
|
datatype, schedule, false);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
}
|
|
}
|
|
|
|
res = NBC_Sched_commit (schedule);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
res = NBC_Start (handle, schedule);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
*request = (ompi_request_t *) handle;
|
|
|
|
/* tmpbuf is freed with the handle */
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
int ompi_coll_libnbc_ireduce_scatter_block_inter(void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype,
|
|
struct ompi_op_t *op, struct ompi_communicator_t *comm,
|
|
ompi_request_t **request, struct mca_coll_base_module_2_1_0_t *module) {
|
|
int rank, res, count, rsize;
|
|
MPI_Aint ext;
|
|
NBC_Schedule *schedule;
|
|
NBC_Handle *handle;
|
|
ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module;
|
|
|
|
rank = ompi_comm_rank (comm);
|
|
rsize = ompi_comm_remote_size (comm);
|
|
|
|
res = MPI_Type_extent (dtype, &ext);
|
|
if (MPI_SUCCESS != res) {
|
|
NBC_Error ("MPI Error in MPI_Type_extent() (%i)", res);
|
|
return res;
|
|
}
|
|
|
|
res = NBC_Init_handle(comm, &handle, libnbc_module);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
return res;
|
|
}
|
|
|
|
count = rcount * rsize;
|
|
|
|
if (count > 0) {
|
|
handle->tmpbuf = malloc (2 * ext * count);
|
|
if (NULL == handle->tmpbuf) {
|
|
NBC_Return_handle (handle);
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
}
|
|
|
|
schedule = OBJ_NEW(NBC_Schedule);
|
|
if (NULL == schedule) {
|
|
NBC_Return_handle (handle);
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
|
|
/* make sure the schedule is released with the handle on error */
|
|
handle->schedule = schedule;
|
|
|
|
/* send my data to the remote root */
|
|
res = NBC_Sched_send (sbuf, false, count, dtype, 0, schedule, false);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
if (0 == rank) {
|
|
res = NBC_Sched_recv ((void *) 0, true, count, dtype, 0, schedule, true);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
for (int peer = 1 ; peer < rsize ; ++peer) {
|
|
res = NBC_Sched_recv ((void *)(ext * count), true, count, dtype, peer, schedule, true);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
res = NBC_Sched_op ((void *) 0, true, (void *)(ext * count), true, (void *) 0, true, count, dtype, op,
|
|
schedule, true);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
}
|
|
|
|
/* exchange data with remote root for scatter phase (we *could* use the local communicator to do the scatter) */
|
|
res = NBC_Sched_recv ((void *)(ext * count), true, count, dtype, 0, schedule, false);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
res = NBC_Sched_send ((void *) 0, true, count, dtype, 0, schedule, true);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
/* scatter */
|
|
for (int peer = 0 ; peer < rsize ; ++peer) {
|
|
res = NBC_Sched_send ((void *)(ext * (count + peer * rcount)), true, rcount, dtype, peer, schedule, false);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* receive my block */
|
|
res = NBC_Sched_recv(rbuf, true, rcount, dtype, 0, schedule, false);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
/*NBC_PRINT_SCHED(*schedule);*/
|
|
|
|
res = NBC_Sched_commit(schedule);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
res = NBC_Start(handle, schedule);
|
|
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
|
|
NBC_Return_handle (handle);
|
|
return res;
|
|
}
|
|
|
|
*request = (ompi_request_t *) handle;
|
|
|
|
/* tmpbuf is freed with the handle */
|
|
return OMPI_SUCCESS;
|
|
}
|