[Darshan-commits] [Darshan] branch, master, updated. darshan-2.3.1-pre1-16-gfa863d3

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, master has been updated
       via  fa863d34fa1ffe4944d4d8608997f54b24b2c1f9 (commit)
      from  f39548697747bea7213e00d1d09297878ef27cf9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fa863d34fa1ffe4944d4d8608997f54b24b2c1f9
Author: Phil Carns <carns at mcs.anl.gov>
Date:   Thu Feb 5 17:46:14 2015 -0500

    support libmpifort in place of libfmpich

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                 |    2 ++
 darshan-runtime/darshan-gen-fortran.pl.in |   15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)


Diff of changes:
diff --git a/ChangeLog b/ChangeLog
index cf17f29..d7c4e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@ darshan-2.3.1-pre2
   - label I/O vs. meta time more clearly
   - include unique file meta time in agg_perf_by_slowest calculation
 * added regression test script framework in darshan-test/regression/
+* update darshan-gen-fortran.pl to support new Fortran library name in 
+  MPICH 3.1.1
 
 darshan-2.3.0
 =============
diff --git a/darshan-runtime/darshan-gen-fortran.pl.in b/darshan-runtime/darshan-gen-fortran.pl.in
index e91dd7f..231d64d 100644
--- a/darshan-runtime/darshan-gen-fortran.pl.in
+++ b/darshan-runtime/darshan-gen-fortran.pl.in
@@ -275,13 +275,20 @@ print OUTPUT<<"EOF";
     grep -E \\(PMPI_File_\\)\\|\\(PMPI_Init\\)\\|\\(PMPI_Finalize\\) \$tmpfile | grep -v -E \\(mpich.*\\.a\\) |grep \\(PMPI >& /dev/null
     rc_pmpi=\$?
 
-    # normal or cnk libraries?
-    grep -E mpich\\.cnk \$tmpfile >& /dev/null
+
+    # find appropriate fortran library name for profiling
+    grep -E libmpifort \$tmpfile >& /dev/null
     rc_cnk_check=\$?
     if [ \$rc_cnk_check -eq 0 ] ; then
-        FMPICH=-lfmpich.cnk
+        FMPICH=-lmpifort
     else
-        FMPICH=-lfmpich
+        grep -E mpich\\.cnk \$tmpfile >& /dev/null
+        rc_cnk_check=\$?
+        if [ \$rc_cnk_check -eq 0 ] ; then
+            FMPICH=-lfmpich.cnk
+        else
+            FMPICH=-lfmpich
+        fi
     fi
 
     rm \$tmpfile >& /dev/null


hooks/post-receive
--