ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

No more warnings plus some code reordering.

Просмотр исходного кода 
This commit was SVN r12919.
Этот коммит содержится в:
George Bosilca 2006-12-21 22:42:15 +00:00
родитель dc532577db
Коммит b1725e02d4
3 изменённых файлов: 6 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
ompi/mca/coll/tuned/coll_tuned_allgather.c
Просмотреть файл

@ -89,7 +89,7 @@ int ompi_coll_tuned_allgather_intra_bruck(void *sbuf, int scount,
int rank, size; int rank, size;
int sendto, recvfrom, distance, blockcount; int sendto, recvfrom, distance, blockcount;
int err = 0; int err = 0;
ptrdiff_t slb, rlb, true_extent, sext, rext; ptrdiff_t slb, rlb, sext, rext;
char *tmpsend = NULL, *tmprecv = NULL; char *tmpsend = NULL, *tmprecv = NULL;
ompi_request_t *reqs[2] = {NULL, NULL}; ompi_request_t *reqs[2] = {NULL, NULL};
@ -385,7 +385,7 @@ int ompi_coll_tuned_allgather_intra_ring(void *sbuf, int scount,
int rank, size; int rank, size;
int sendto, recvfrom, i, recvdatafrom, senddatafrom; int sendto, recvfrom, i, recvdatafrom, senddatafrom;
int err = 0; int err = 0;
ptrdiff_t slb, rlb, true_extent, sext, rext; ptrdiff_t slb, rlb, sext, rext;
char *tmpsend = NULL, *tmprecv = NULL; char *tmpsend = NULL, *tmprecv = NULL;
ompi_request_t *reqs[2] = {NULL, NULL}; ompi_request_t *reqs[2] = {NULL, NULL};
@ -523,7 +523,7 @@ ompi_coll_tuned_allgather_intra_neighborexchange(void *sbuf, int scount,
int neighbor[2], offset_at_step[2], recv_data_from[2], send_data_from; int neighbor[2], offset_at_step[2], recv_data_from[2], send_data_from;
int i, even_rank; int i, even_rank;
int err = 0; int err = 0;
ptrdiff_t slb, rlb, true_extent, sext, rext; ptrdiff_t slb, rlb, sext, rext;
char *tmpsend = NULL, *tmprecv = NULL; char *tmpsend = NULL, *tmprecv = NULL;
ompi_request_t *reqs[2] = {NULL, NULL}; ompi_request_t *reqs[2] = {NULL, NULL};
@ -648,6 +648,7 @@ int ompi_coll_tuned_allgather_intra_two_procs(void *sbuf, int scount,
int remote; int remote;
char *tmpsend = NULL, *tmprecv = NULL; char *tmpsend = NULL, *tmprecv = NULL;
ptrdiff_t sext, rext, lb; ptrdiff_t sext, rext, lb;
ompi_request_t *reqs[2] = {NULL, NULL};
rank = ompi_comm_rank(comm); rank = ompi_comm_rank(comm);
@ -671,8 +672,6 @@ int ompi_coll_tuned_allgather_intra_two_procs(void *sbuf, int scount,
tmpsend = (char*)rbuf + rank * rcount * rext; tmpsend = (char*)rbuf + rank * rcount * rext;
} }
tmprecv = (char*)rbuf + remote * rcount * rext; tmprecv = (char*)rbuf + remote * rcount * rext;
ompi_request_t *reqs[2] = {NULL, NULL};
err = MCA_PML_CALL(irecv(tmprecv, rcount, rdtype, remote, err = MCA_PML_CALL(irecv(tmprecv, rcount, rdtype, remote,
MCA_COLL_BASE_TAG_ALLGATHER, comm, &reqs[0])); MCA_COLL_BASE_TAG_ALLGATHER, comm, &reqs[0]));

7
ompi/mca/coll/tuned/coll_tuned_alltoall.c
Просмотреть файл

@ -213,11 +213,6 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount,
} }
} }
if (err<0) {
line = __LINE__; err = -1; goto err_hndl;
}
/* Step 4 - clean up */ /* Step 4 - clean up */
if (tmpbuf != NULL) free(tmpbuf); if (tmpbuf != NULL) free(tmpbuf);
if (packbuf != NULL) free(packbuf); if (packbuf != NULL) free(packbuf);
@ -225,7 +220,6 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount,
if (displs != NULL) free(displs); if (displs != NULL) free(displs);
if (blen != NULL) free(blen); if (blen != NULL) free(blen);
} }
return OMPI_SUCCESS; return OMPI_SUCCESS;
err_hndl: err_hndl:
@ -237,7 +231,6 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount,
if (blen != NULL) free(blen); if (blen != NULL) free(blen);
} }
return err; return err;
} }

4
ompi/mca/coll/tuned/coll_tuned_decision_fixed.c
Просмотреть файл

@ -392,7 +392,7 @@ int ompi_coll_tuned_allgather_intra_dec_fixed(void *sbuf, int scount,
} }
} }
#if USE_MPICH2_DECISION #if defined(USE_MPICH2_DECISION)
/* Decision as in MPICH-2 /* Decision as in MPICH-2
presented in Thakur et.al. "Optimization of Collective Communication presented in Thakur et.al. "Optimization of Collective Communication
Operations in MPICH", International Journal of High Performance Computing Operations in MPICH", International Journal of High Performance Computing
@ -412,5 +412,5 @@ int ompi_coll_tuned_allgather_intra_dec_fixed(void *sbuf, int scount,
} }
return ompi_coll_tuned_allgather_intra_ring(sbuf, scount, sdtype, return ompi_coll_tuned_allgather_intra_ring(sbuf, scount, sdtype,
rbuf, rcount, rdtype, comm); rbuf, rcount, rdtype, comm);
#endif #endif /* defined(USE_MPICH2_DECISION) */
} }