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

fix the data size counter for large ops for the static fcoll component

Просмотр исходного кода
Этот коммит содержится в:
Edgar Gabriel 2016-02-23 07:10:01 -06:00
родитель d6fb56af29
Коммит 45003ef78d
2 изменённых файлов: 13 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
ompi/mca/fcoll/static/fcoll_static_file_read_all.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved. * Copyright (c) 2008-2016 University of Houston. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
@ -482,15 +482,15 @@ mca_fcoll_static_file_read_all (mca_io_ompio_file_t *fh,
} }
} }
if (local_cycles > index) { if (index < local_cycles ) {
if ((index == local_cycles-1) && (max_data % bytes_per_cycle)) { if ((index == local_cycles-1) && (max_data % (bytes_per_cycle/fh->f_procs_per_group))) {
bytes_to_read_in_cycle = max_data % bytes_per_cycle; bytes_to_read_in_cycle = max_data - position;
} }
else if (max_data <= bytes_per_cycle) { else if (max_data <= bytes_per_cycle/fh->f_procs_per_group) {
bytes_to_read_in_cycle = max_data; bytes_to_read_in_cycle = max_data;
} }
else { else {
bytes_to_read_in_cycle = bytes_per_cycle; bytes_to_read_in_cycle = bytes_per_cycle/fh->f_procs_per_group;
} }
} }
else { else {

14
ompi/mca/fcoll/static/fcoll_static_file_write_all.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved. * Copyright (c) 2008-2016 University of Houston. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -469,15 +469,15 @@ mca_fcoll_static_file_write_all (mca_io_ompio_file_t *fh,
} }
} }
if (local_cycles > index) { if ( index < local_cycles ) {
if ((index == local_cycles-1) && (max_data % bytes_per_cycle)) { if ((index == local_cycles-1) && (max_data % (bytes_per_cycle/fh->f_procs_per_group)) ) {
bytes_to_write_in_cycle = max_data % bytes_per_cycle; bytes_to_write_in_cycle = max_data - total_bytes_written;
} }
else if (max_data <= bytes_per_cycle) { else if (max_data <= bytes_per_cycle/fh->f_procs_per_group) {
bytes_to_write_in_cycle = max_data; bytes_to_write_in_cycle = max_data;
} }
else { else {
bytes_to_write_in_cycle = bytes_per_cycle; bytes_to_write_in_cycle = bytes_per_cycle/ fh->f_procs_per_group;
} }
} }
else { else {
@ -527,8 +527,6 @@ mca_fcoll_static_file_write_all (mca_io_ompio_file_t *fh,
*/ */
if (my_aggregator == fh->f_rank) { if (my_aggregator == fh->f_rank) {
for (i=0;i<fh->f_procs_per_group; i++){ for (i=0;i<fh->f_procs_per_group; i++){
/* printf("bytes_per_process[%d]: %d\n", i, bytes_per_process[i]);
*/
#if DEBUG_ON #if DEBUG_ON
printf ("%d : bytes_per_process : %d\n", printf ("%d : bytes_per_process : %d\n",