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

coll/base: fix ompi_coll_base_{gather,scatter}_intra_binomial

Просмотр исходного кода 
receive type is only relevant for root with gather,
send type is only relevant for root with scatter,
so do not access these types on a non root task
Этот коммит содержится в:
Gilles Gouaillardet 2016-10-19 14:05:22 +09:00
родитель cb76d93b4e
Коммит e78fcc4db9
2 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
ompi/mca/coll/base/coll_base_gather.c
Просмотреть файл

@ -12,7 +12,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All Rights * Copyright (c) 2013 Los Alamos National Security, LLC. All Rights
* reserved. * reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -65,13 +65,13 @@ ompi_coll_base_gather_intra_binomial(const void *sbuf, int scount,
bmtree = data->cached_in_order_bmtree; bmtree = data->cached_in_order_bmtree;
ompi_datatype_type_extent(sdtype, &sextent); ompi_datatype_type_extent(sdtype, &sextent);
ompi_datatype_type_extent(rdtype, &rextent);
ssize = opal_datatype_span(&sdtype->super, (int64_t)scount * size, &sgap); ssize = opal_datatype_span(&sdtype->super, (int64_t)scount * size, &sgap);
rsize = opal_datatype_span(&rdtype->super, (int64_t)rcount * size, &rgap);
vrank = (rank - root + size) % size; vrank = (rank - root + size) % size;
if (rank == root) { if (rank == root) {
ompi_datatype_type_extent(rdtype, &rextent);
rsize = opal_datatype_span(&rdtype->super, (int64_t)rcount * size, &rgap);
if (0 == root){ if (0 == root){
/* root on 0, just use the recv buffer */ /* root on 0, just use the recv buffer */
ptmp = (char *) rbuf; ptmp = (char *) rbuf;

6
ompi/mca/coll/base/coll_base_scatter.c
Просмотреть файл

@ -12,7 +12,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights * Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -62,16 +62,16 @@ ompi_coll_base_scatter_intra_binomial( const void *sbuf, int scount,
COLL_BASE_UPDATE_IN_ORDER_BMTREE( comm, base_module, root ); COLL_BASE_UPDATE_IN_ORDER_BMTREE( comm, base_module, root );
bmtree = data->cached_in_order_bmtree; bmtree = data->cached_in_order_bmtree;
ompi_datatype_type_extent(sdtype, &sextent);
ompi_datatype_type_extent(rdtype, &rextent); ompi_datatype_type_extent(rdtype, &rextent);
ssize = opal_datatype_span(&sdtype->super, (int64_t)scount * size, &sgap);
rsize = opal_datatype_span(&rdtype->super, (int64_t)rcount * size, &rgap); rsize = opal_datatype_span(&rdtype->super, (int64_t)rcount * size, &rgap);
vrank = (rank - root + size) % size; vrank = (rank - root + size) % size;
ptmp = (char *) rbuf; /* by default suppose leaf nodes, just use rbuf */ ptmp = (char *) rbuf; /* by default suppose leaf nodes, just use rbuf */
if (rank == root) { if (rank == root) {
ompi_datatype_type_extent(sdtype, &sextent);
ssize = opal_datatype_span(&sdtype->super, (int64_t)scount * size, &sgap);
if (0 == root) { if (0 == root) {
/* root on 0, just use the send buffer */ /* root on 0, just use the send buffer */
ptmp = (char *) sbuf; ptmp = (char *) sbuf;