Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
darshan
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
72
Issues
72
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
darshan
darshan
Commits
c904d6e0
Commit
c904d6e0
authored
Feb 08, 2015
by
Philip Carns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
attempt to detect lib name for profile confs
parent
bdbe35ed
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
2 deletions
+36
-2
darshan-runtime/configure
darshan-runtime/configure
+15
-0
darshan-runtime/configure.in
darshan-runtime/configure.in
+9
-0
darshan-runtime/share/mpi-profile/darshan-cxx.conf.in
darshan-runtime/share/mpi-profile/darshan-cxx.conf.in
+6
-1
darshan-runtime/share/mpi-profile/darshan-f.conf.in
darshan-runtime/share/mpi-profile/darshan-f.conf.in
+6
-1
No files found.
darshan-runtime/configure
View file @
c904d6e0
...
...
@@ -621,6 +621,7 @@ ac_includes_default="\
ac_subst_vars
=
'LTLIBOBJS
LIBOBJS
MPICH_LIB_OLD
DARSHAN_VERSION
DISABLE_LDPRELOAD
CP_WRAPPERS
...
...
@@ -4250,6 +4251,19 @@ $as_echo "#define __D_MPI_REQUEST MPI_Request" >>confdefs.h
fi
# attempt to detect librarly naming convention in mpi compiler script
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for old (pre-3.1.1) style MPICH library naming convention"
>
&5
$as_echo_n
"checking for old (pre-3.1.1) style MPICH library naming convention... "
>
&6
;
}
if
$CC
-show
foo.c
-o
foo |grep lmpich
>
& /dev/null
;
then
:
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: yes"
>
&5
$as_echo
"yes"
>
&6
;
}
MPICH_LIB_OLD
=
1
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$as_echo
"no"
>
&6
;
}
MPICH_LIB_OLD
=
0
fi
DARSHAN_VERSION
=
"2.3.1-pre1"
...
...
@@ -4259,6 +4273,7 @@ DARSHAN_VERSION="2.3.1-pre1"
ac_config_files
=
"
$ac_config_files
Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-config share/craype-1.x/darshan-module share/craype-2.x/darshan-module lib/pkgconfig/darshan-runtime.pc share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf"
cat
>
confcache
<<
\
_ACEOF
...
...
darshan-runtime/configure.in
View file @
c904d6e0
...
...
@@ -287,6 +287,14 @@ AC_CHECK_TYPE([MPIO_Request],
AC_DEFINE(__D_MPI_REQUEST, MPI_Request, Generalized request type for MPI-IO)
,[#include <mpi.h>])
# attempt to detect librarly naming convention in mpi compiler script
AC_MSG_CHECKING(for old (pre-3.1.1) style MPICH library naming convention)
AS_IF([$CC -show foo.c -o foo |grep lmpich >& /dev/null],
AC_MSG_RESULT(yes)
MPICH_LIB_OLD=1,
AC_MSG_RESULT(no)
MPICH_LIB_OLD=0)
DARSHAN_VERSION="AC_PACKAGE_VERSION"
AC_SUBST(darshan_lib_path)
...
...
@@ -296,6 +304,7 @@ AC_SUBST(__CP_LOG_PATH)
AC_SUBST(CP_WRAPPERS)
AC_SUBST(DISABLE_LDPRELOAD)
AC_SUBST(DARSHAN_VERSION)
AC_SUBST(MPICH_LIB_OLD)
AC_OUTPUT(Makefile
darshan-mk-log-dirs.pl
darshan-gen-cc.pl
...
...
darshan-runtime/share/mpi-profile/darshan-cxx.conf.in
View file @
c904d6e0
...
...
@@ -4,9 +4,14 @@
DARSHAN_PREFIX
=
@prefix@
MPICH_LIB_OLD
=
@MPICH_LIB_OLD@
# Libraries (and paths) to include before the MPI library
export
PROFILE_PRELIB
=
"-lmpichcxx
`
$DARSHAN_PREFIX
/bin/darshan-config
--pre-ld-flags
`
"
if
[
$MPICH_LIB_OLD
-eq
1
]
;
then
export
PROFILE_PRELIB
=
"-lmpichcxx
`
$DARSHAN_PREFIX
/bin/darshan-config
--pre-ld-flags
`
"
else
export
PROFILE_PRELIB
=
"-lmpicxx
`
$DARSHAN_PREFIX
/bin/darshan-config
--pre-ld-flags
`
"
fi
# Libraries to include after the MPI library
export
PROFILE_POSTLIB
=
`
$DARSHAN_PREFIX
/bin/darshan-config
--post-ld-flags
`
...
...
darshan-runtime/share/mpi-profile/darshan-f.conf.in
View file @
c904d6e0
...
...
@@ -4,9 +4,14 @@
DARSHAN_PREFIX
=
@prefix@
MPICH_LIB_OLD
=
@MPICH_LIB_OLD@
# Libraries (and paths) to include before the MPI library
export
PROFILE_PRELIB
=
"-lfmpich
`
$DARSHAN_PREFIX
/bin/darshan-config
--pre-ld-flags
`
"
if
[
$MPICH_LIB_OLD
-eq
1
]
;
then
export
PROFILE_PRELIB
=
"-lfmpich
`
$DARSHAN_PREFIX
/bin/darshan-config
--pre-ld-flags
`
"
else
export
PROFILE_PRELIB
=
"-lmpifort
`
$DARSHAN_PREFIX
/bin/darshan-config
--pre-ld-flags
`
"
fi
# Libraries to include after the MPI library
export
PROFILE_POSTLIB
=
`
$DARSHAN_PREFIX
/bin/darshan-config
--post-ld-flags
`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment