Changing the dynamic component accordingly for the modified interfaces
This commit was SVN r27545.
Этот коммит содержится в:
родитель
67463de96f
Коммит
d1fc22883a
@ -29,7 +29,7 @@
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
#define TIME_BREAKDOWN 1
|
||||
|
||||
int
|
||||
mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
@ -77,12 +77,12 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
MPI_Aint bytes_left = 0;
|
||||
MPI_Aint *total_bytes_per_process = NULL;
|
||||
|
||||
|
||||
#if TIME_BREAKDOWN
|
||||
double read_time = 0.0, start_read_time = 0.0, end_read_time = 0.0;
|
||||
double rcomm_time = 0.0, start_rcomm_time = 0.0, end_rcomm_time = 0.0;
|
||||
double read_exch = 0.0, start_rexch = 0.0, end_rexch = 0.0;
|
||||
print_entry nentry;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
if (opal_datatype_is_contiguous_memory_layout(&datatype->super,1)) {
|
||||
@ -280,8 +280,10 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
bytes_remaining = 0;
|
||||
current_index = 0;
|
||||
|
||||
if(mca_io_ompio_coll_timing_info)
|
||||
|
||||
#if TIME_BREAKDOWN
|
||||
start_rexch = MPI_Wtime();
|
||||
#endif
|
||||
|
||||
for (index = 0; index < cycles; index++) {
|
||||
int k;
|
||||
@ -511,8 +513,9 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
fh->f_io_array[i].length);
|
||||
}
|
||||
*/
|
||||
if(mca_io_ompio_coll_timing_info)
|
||||
#if TIME_BREAKDOWN
|
||||
start_read_time = MPI_Wtime();
|
||||
#endif
|
||||
|
||||
if (fh->f_num_of_io_entries) {
|
||||
if (OMPI_SUCCESS != fh->f_fbtl->fbtl_preadv (fh, NULL)) {
|
||||
@ -521,10 +524,10 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
}
|
||||
}
|
||||
|
||||
if(mca_io_ompio_coll_timing_info){
|
||||
#if TIME_BREAKDOWN
|
||||
end_read_time = MPI_Wtime();
|
||||
read_time += end_read_time - start_read_time;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
if (NULL != temp) {
|
||||
@ -536,8 +539,9 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
******************** DONE READING ************************
|
||||
*********************************************************/
|
||||
|
||||
if(mca_io_ompio_coll_timing_info)
|
||||
#if TIME_BREAKDOWN
|
||||
start_rcomm_time = MPI_Wtime();
|
||||
#endif
|
||||
|
||||
|
||||
/**********************************************************
|
||||
@ -609,10 +613,10 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
receive_buf = NULL;
|
||||
}
|
||||
}
|
||||
if(mca_io_ompio_coll_timing_info){
|
||||
#if TIME_BREAKDOWN
|
||||
end_rcomm_time = MPI_Wtime();
|
||||
rcomm_time += end_rcomm_time - start_rcomm_time;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/**********************************************************
|
||||
@ -631,7 +635,8 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
}
|
||||
}
|
||||
}
|
||||
if(mca_io_ompio_coll_timing_info){
|
||||
|
||||
#if TIME_BREAKDOWN
|
||||
end_rexch = MPI_Wtime();
|
||||
read_exch += end_rexch - start_rexch;
|
||||
nentry.time[0] = read_time;
|
||||
@ -642,11 +647,11 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh,
|
||||
else
|
||||
nentry.aggregator = 0;
|
||||
nentry.nprocs_for_coll = mca_fcoll_dynamic_num_io_procs;
|
||||
if (!ompi_io_ompio_full_print_queue(coll_read_time)){
|
||||
ompi_io_ompio_register_print_entry(coll_read_time,
|
||||
if (!ompi_io_ompio_full_print_queue(READ_PRINT_QUEUE)){
|
||||
ompi_io_ompio_register_print_entry(READ_PRINT_QUEUE,
|
||||
nentry);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
if (NULL != sorted) {
|
||||
|
@ -97,12 +97,12 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
MPI_Request *send_req=NULL, *recv_req=NULL;
|
||||
int datatype_size, recv_req_count=0;
|
||||
|
||||
|
||||
#if TIME_BREAKDOWN
|
||||
double write_time = 0.0, start_write_time = 0.0, end_write_time = 0.0;
|
||||
double comm_time = 0.0, start_comm_time = 0.0, end_comm_time = 0.0;
|
||||
double exch_write = 0.0, start_exch = 0.0, end_exch = 0.0;
|
||||
print_entry nentry;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
if (opal_datatype_is_contiguous_memory_layout(&datatype->super,1)) {
|
||||
@ -375,9 +375,10 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
|
||||
|
||||
|
||||
if(mca_io_ompio_coll_timing_info)
|
||||
start_exch = MPI_Wtime();
|
||||
|
||||
#if TIME_BREAKDOWN
|
||||
start_exch = MPI_Wtime();
|
||||
#endif
|
||||
|
||||
for (index = 0; index < cycles; index++) {
|
||||
|
||||
@ -722,8 +723,9 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
printf("%d : global_count : %ld, bytes_sent : %d\n",
|
||||
fh->f_rank,global_count, bytes_sent);
|
||||
#endif
|
||||
if (mca_io_ompio_coll_timing_info)
|
||||
#if TIME_BREAKDOWN
|
||||
start_comm_time = MPI_Wtime();
|
||||
#endif
|
||||
|
||||
|
||||
global_buf = (char *) malloc (global_count);
|
||||
@ -878,10 +880,11 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
}
|
||||
}
|
||||
|
||||
if (mca_io_ompio_coll_timing_info){
|
||||
#if TIME_BREAKDOWN
|
||||
end_comm_time = MPI_Wtime();
|
||||
comm_time += (end_comm_time - start_comm_time);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/**********************************************************
|
||||
**************** DONE GATHERING OF DATA ******************
|
||||
@ -893,9 +896,9 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
|
||||
if (fh->f_procs_in_group[fh->f_aggregator_index] == fh->f_rank) {
|
||||
|
||||
if (mca_io_ompio_coll_timing_info){
|
||||
#if TIME_BREAKDOWN
|
||||
start_write_time = MPI_Wtime();
|
||||
}
|
||||
#endif
|
||||
|
||||
fh->f_io_array = (mca_io_ompio_io_array_t *) malloc
|
||||
(entries_per_aggregator * sizeof (mca_io_ompio_io_array_t));
|
||||
@ -954,10 +957,10 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
if (mca_io_ompio_coll_timing_info){
|
||||
end_write_time = MPI_Wtime();
|
||||
write_time += end_write_time - start_write_time;
|
||||
}
|
||||
#if TIME_BREAKDOWN
|
||||
end_write_time = MPI_Wtime();
|
||||
write_time += end_write_time - start_write_time;
|
||||
#endif
|
||||
|
||||
|
||||
}
|
||||
@ -992,7 +995,7 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
|
||||
}
|
||||
|
||||
if (mca_io_ompio_coll_timing_info){
|
||||
#if TIME_BREAKDOWN
|
||||
end_exch = MPI_Wtime();
|
||||
exch_write += end_exch - start_exch;
|
||||
nentry.time[0] = write_time;
|
||||
@ -1003,11 +1006,11 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
|
||||
else
|
||||
nentry.aggregator = 0;
|
||||
nentry.nprocs_for_coll = mca_fcoll_dynamic_num_io_procs;
|
||||
if (!ompi_io_ompio_full_print_queue(coll_write_time)){
|
||||
ompi_io_ompio_register_print_entry(coll_write_time,
|
||||
if (!ompi_io_ompio_full_print_queue(WRITE_PRINT_QUEUE)){
|
||||
ompi_io_ompio_register_print_entry(WRITE_PRINT_QUEUE,
|
||||
nentry);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
exit :
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user