Commit 62299210 authored by Rob Latham's avatar Rob Latham

another merge with trunk


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/branches/more-pnetcdf@316 3b7491f3-a168-0410-bf4b-c445ed680a29
parents c11168eb 343685dc
...@@ -207,12 +207,10 @@ enum f_darshan_indices ...@@ -207,12 +207,10 @@ enum f_darshan_indices
CP_F_MPI_WRITE_TIME, /* cumulative mpi-io write time */ CP_F_MPI_WRITE_TIME, /* cumulative mpi-io write time */
CP_F_MAX_READ_TIME, CP_F_MAX_READ_TIME,
CP_F_MAX_WRITE_TIME, CP_F_MAX_WRITE_TIME,
CP_F_FASTEST_RANK_TIME, CP_F_FASTEST_RANK_TIME,
CP_F_SLOWEST_RANK_TIME, CP_F_SLOWEST_RANK_TIME,
CP_F_VARIANCE_RANK_TIME, CP_F_VARIANCE_RANK_TIME,
CP_F_VARIANCE_RANK_BYTES, CP_F_VARIANCE_RANK_BYTES,
CP_F_NC_READ_TIME, CP_F_NC_READ_TIME,
CP_F_NC_WRITE_TIME, CP_F_NC_WRITE_TIME,
......
...@@ -228,6 +228,7 @@ void darshan_shutdown(int timing_flag) ...@@ -228,6 +228,7 @@ void darshan_shutdown(int timing_flag)
void* pointers[CP_MAX_MEM_SEGMENTS]; void* pointers[CP_MAX_MEM_SEGMENTS];
int ret; int ret;
double red1=0, red2=0, gz1=0, gz2=0, write1=0, write2=0, tm_end=0; double red1=0, red2=0, gz1=0, gz2=0, write1=0, write2=0, tm_end=0;
double bcst1=0, bcst2=0, bcst3=0;
int nprocs; int nprocs;
char* trailing_data = NULL; char* trailing_data = NULL;
int i, j; int i, j;
...@@ -310,10 +311,14 @@ void darshan_shutdown(int timing_flag) ...@@ -310,10 +311,14 @@ void darshan_shutdown(int timing_flag)
memcpy(mnt_id_array_root, mnt_id_array, memcpy(mnt_id_array_root, mnt_id_array,
CP_MAX_MNTS*sizeof(int64_t)); CP_MAX_MNTS*sizeof(int64_t));
} }
bcst1=MPI_Wtime();
MPI_Bcast(mnt_id_array_root, CP_MAX_MNTS*sizeof(int64_t), MPI_BYTE, 0, MPI_Bcast(mnt_id_array_root, CP_MAX_MNTS*sizeof(int64_t), MPI_BYTE, 0,
MPI_COMM_WORLD); MPI_COMM_WORLD);
MPI_Bcast(mnt_hash_array_root, CP_MAX_MNTS*sizeof(uint64_t), MPI_BYTE, 0, MPI_Bcast(mnt_hash_array_root, CP_MAX_MNTS*sizeof(uint64_t), MPI_BYTE, 0,
MPI_COMM_WORLD); MPI_COMM_WORLD);
bcst2=MPI_Wtime();
/* identify any common mount points that have different device ids on /* identify any common mount points that have different device ids on
* non-root processes * non-root processes
*/ */
...@@ -400,6 +405,7 @@ void darshan_shutdown(int timing_flag) ...@@ -400,6 +405,7 @@ void darshan_shutdown(int timing_flag)
} }
/* broadcast log file name */ /* broadcast log file name */
bcst3=MPI_Wtime();
MPI_Bcast(logfile_name, PATH_MAX, MPI_CHAR, 0, MPI_COMM_WORLD); MPI_Bcast(logfile_name, PATH_MAX, MPI_CHAR, 0, MPI_COMM_WORLD);
final_job->log_job.end_time = time(NULL); final_job->log_job.end_time = time(NULL);
...@@ -466,9 +472,11 @@ void darshan_shutdown(int timing_flag) ...@@ -466,9 +472,11 @@ void darshan_shutdown(int timing_flag)
double gz_tm, gz_slowest; double gz_tm, gz_slowest;
double write_tm, write_slowest; double write_tm, write_slowest;
double all_tm, all_slowest; double all_tm, all_slowest;
double bcst_tm, bcst_slowest;
tm_end = MPI_Wtime(); tm_end = MPI_Wtime();
bcst_tm=(bcst2-bcst1)+(red1-bcst3);
red_tm = red2-red1; red_tm = red2-red1;
gz_tm = gz2-gz1; gz_tm = gz2-gz1;
write_tm = write2-write1; write_tm = write2-write1;
...@@ -482,11 +490,14 @@ void darshan_shutdown(int timing_flag) ...@@ -482,11 +490,14 @@ void darshan_shutdown(int timing_flag)
MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD); MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD);
MPI_Allreduce(&all_tm, &all_slowest, 1, MPI_Allreduce(&all_tm, &all_slowest, 1,
MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD); MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD);
MPI_Allreduce(&bcst_tm, &bcst_slowest, 1,
MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD);
if(rank == 0) if(rank == 0)
{ {
MPI_Comm_size(MPI_COMM_WORLD, &nprocs); MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
printf("#<op>\t<nprocs>\t<time>\n"); printf("#<op>\t<nprocs>\t<time>\n");
printf("bcst\t%d\t%f\n", nprocs, bcst_slowest);
printf("reduce\t%d\t%f\n", nprocs, red_slowest); printf("reduce\t%d\t%f\n", nprocs, red_slowest);
printf("gzip\t%d\t%f\n", nprocs, gz_slowest); printf("gzip\t%d\t%f\n", nprocs, gz_slowest);
printf("write\t%d\t%f\n", nprocs, write_slowest); printf("write\t%d\t%f\n", nprocs, write_slowest);
......
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/intrepid-fs0/logs/darshan/
#darshan # darshan job summary
cd ../ cd ../
install -d $PREFIX install -d $PREFIX
install -d $PREFIX/bin install -d $PREFIX/bin
...@@ -16,6 +17,10 @@ install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/ ...@@ -16,6 +17,10 @@ install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/
install -m 644 util/lib/Number/Bytes/Human.pm $PREFIX/lib/Number/Bytes install -m 644 util/lib/Number/Bytes/Human.pm $PREFIX/lib/Number/Bytes
install -m 644 util/share/* $PREFIX/share/ install -m 644 util/share/* $PREFIX/share/
# we also need to build darshan-parser in 2.0.0
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make darshan-parser
install -m 755 darshan-parser $PREFIX/bin/
#gnuplot (new version with additional histogram support) #gnuplot (new version with additional histogram support)
cd extern cd extern
tar -xvzf gnuplot-4.2.4.tar.gz tar -xvzf gnuplot-4.2.4.tar.gz
......
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/pvfs-surveyor/logs/darshan
#darshan # darshan job summary
cd ../ cd ../
install -d $PREFIX install -d $PREFIX
install -d $PREFIX/bin install -d $PREFIX/bin
...@@ -16,6 +17,10 @@ install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/ ...@@ -16,6 +17,10 @@ install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/
install -m 644 util/lib/Number/Bytes/Human.pm $PREFIX/lib/Number/Bytes install -m 644 util/lib/Number/Bytes/Human.pm $PREFIX/lib/Number/Bytes
install -m 644 util/share/* $PREFIX/share/ install -m 644 util/share/* $PREFIX/share/
# we also need to build darshan-parser in 2.0.0
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make darshan-parser
install -m 755 darshan-parser $PREFIX/bin/
#gnuplot (new version with additional histogram support) #gnuplot (new version with additional histogram support)
cd extern cd extern
tar -xvzf gnuplot-4.2.4.tar.gz tar -xvzf gnuplot-4.2.4.tar.gz
......
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/pvfs-surveyor/darshan_logs LOGDIR=/intrepid-fs0/logs/darshan/
#darshan #darshan
cd ../ cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ CFLAGS="-O2" && make && make install ./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
mkdir -p $LOGDIR mkdir -p $LOGDIR
$PREFIX/bin/darshan-mk-log-dirs.pl $PREFIX/bin/darshan-mk-log-dirs.pl
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/pvfs-surveyor/darshan_logs LOGDIR=/pvfs-surveyor/logs/darshan
#darshan #darshan
cd ../ cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ CFLAGS="-O2" && make && make install ./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
mkdir -p $LOGDIR mkdir -p $LOGDIR
$PREFIX/bin/darshan-mk-log-dirs.pl $PREFIX/bin/darshan-mk-log-dirs.pl
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/intrepid-fs0/logs/darshan/
#darshan # darshan job summary
cd ../ cd ../
install -d $PREFIX install -d $PREFIX
install -d $PREFIX/bin install -d $PREFIX/bin
install -d $PREFIX/lib install -d $PREFIX/lib
install -d $PREFIX/lib/TeX install -d $PREFIX/lib/TeX
install -d $PREFIX/lib/Number
install -d $PREFIX/lib/Number/Bytes
install -d $PREFIX/share install -d $PREFIX/share
install -m 755 util/bin/darshan-job-summary.pl $PREFIX/bin/ install -m 755 util/bin/darshan-job-summary.pl $PREFIX/bin/
install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/ install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/
install -m 644 util/lib/Number/Bytes/Human.pm $PREFIX/lib/Number/Bytes
install -m 644 util/share/* $PREFIX/share/ install -m 644 util/share/* $PREFIX/share/
# we also need to build darshan-parser in 2.0.0
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make darshan-parser
install -m 755 darshan-parser $PREFIX/bin/
#gnuplot (new version with additional histogram support) #gnuplot (new version with additional histogram support)
cd extern cd extern
tar -xvzf gnuplot-4.2.4.tar.gz tar -xvzf gnuplot-4.2.4.tar.gz
......
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/pvfs-surveyor/logs/darshan
#darshan # darshan job summary
cd ../ cd ../
install -d $PREFIX install -d $PREFIX
install -d $PREFIX/bin install -d $PREFIX/bin
install -d $PREFIX/lib install -d $PREFIX/lib
install -d $PREFIX/lib/TeX install -d $PREFIX/lib/TeX
install -d $PREFIX/lib/Number
install -d $PREFIX/lib/Number/Bytes
install -d $PREFIX/share install -d $PREFIX/share
install -m 755 util/bin/darshan-job-summary.pl $PREFIX/bin/ install -m 755 util/bin/darshan-job-summary.pl $PREFIX/bin/
install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/ install -m 644 util/lib/TeX/Encode.pm $PREFIX/lib/TeX/
install -m 644 util/lib/Number/Bytes/Human.pm $PREFIX/lib/Number/Bytes
install -m 644 util/share/* $PREFIX/share/ install -m 644 util/share/* $PREFIX/share/
# we also need to build darshan-parser in 2.0.0
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make darshan-parser
install -m 755 darshan-parser $PREFIX/bin/
#gnuplot (new version with additional histogram support) #gnuplot (new version with additional histogram support)
cd extern cd extern
tar -xvzf gnuplot-4.2.4.tar.gz tar -xvzf gnuplot-4.2.4.tar.gz
......
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/pvfs-surveyor/darshan_logs LOGDIR=/intrepid-fs0/logs/darshan/
#darshan #darshan
cd ../ cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ CFLAGS="-O2" && make && make install ./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
# log dir already exists # log dir already exists
#mkdir -p $LOGDIR #mkdir -p $LOGDIR
......
#!/bin/bash #!/bin/bash
PREFIX=/soft/apps/darshan-1.1.14 PREFIX=/soft/apps/darshan-2.0.0
LOGDIR=/pvfs-surveyor/darshan_logs LOGDIR=/pvfs-surveyor/logs/darshan
#darshan #darshan
cd ../ cd ../
./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ CFLAGS="-O2" && make && make install ./configure --with-mem-align=16 --with-log-path=$LOGDIR --prefix=$PREFIX --with-zlib-for-mpi=/soft/apps/zlib-1.2.3/ --with-jobid-env=COBALT_JOBID CFLAGS="-O2" && make && make install
# log dir already exists # log dir already exists
#mkdir -p $LOGDIR #mkdir -p $LOGDIR
......
#!/bin/bash
#
# Test darshan-parser/darshan-job-summary.pl on the previous versions
# of the darshan log format.
#
LOGS=../example-output
RUNLOG=/tmp/run.log
PATH=../:${PATH}
namelist=()
for log in $(ls ${LOGS});
do
if [ $log = 'README.txt' ];
then
continue;
fi
name=${log/.gz/.pdf}
namelist=(${namelist[*]} $name)
../util/bin/darshan-job-summary.pl --output=${LOGS}/$name ${LOGS}/$log >> $RUNLOG 2>&1
rc=$?
if [ $rc -ne 0 ];
then
echo "failed: $rc : $log";
fi
done
for name in ${namelist[*]};
do
if [ -f ${LOGS}/$name ];
then
xpdf ${LOGS}/$name;
rm ${LOGS}/$name;
else
echo "summary not found: $name";
fi
done
This diff is collapsed.
...@@ -87,6 +87,14 @@ ...@@ -87,6 +87,14 @@
} }
\end{figure*} \end{figure*}
\begin{figure*}[!h]
\centering
\subfigure
{
\input{variance-table}
}
\end{figure*}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment