Commit 53120592 authored by Philip Carns's avatar Philip Carns
Browse files

some reorganization to make it possible to separate craype 1.x and 2.x files


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@850 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 65db9baa
...@@ -100,8 +100,8 @@ endif ...@@ -100,8 +100,8 @@ endif
install -m 755 darshan-gen-cxx.pl $(bindir) install -m 755 darshan-gen-cxx.pl $(bindir)
install -m 755 darshan-gen-fortran.pl $(bindir) install -m 755 darshan-gen-fortran.pl $(bindir)
install -m 755 darshan-config $(bindir) install -m 755 darshan-config $(bindir)
install -d $(datarootdir)/cray/modulefiles/darshan install -d $(datarootdir)/craype-1.x/modulefiles/darshan
install -m 755 share/cray/darshan-module $(datarootdir)/cray/modulefiles/darshan/$(DARSHAN_VERSION) install -m 755 share/craype-1.x/darshan-module $(datarootdir)/craype-1.x/modulefiles/darshan/$(DARSHAN_VERSION)
clean:: clean::
rm -f *.o *.a lib/*.o lib/*.po lib/*.a lib/*.so rm -f *.o *.a lib/*.o lib/*.po lib/*.a lib/*.so
......
...@@ -3606,6 +3606,8 @@ fi ...@@ -3606,6 +3606,8 @@ fi
$as_echo_n "checking zlib in ${ZLIB_HOME}... " >&6; } $as_echo_n "checking zlib in ${ZLIB_HOME}... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; } $as_echo "ok" >&6; }
__CP_ZLIB_LINK_FLAGS="-L${ZLIB_HOME}/lib"
__CP_ZLIB_INCLUDE_FLAGS="-I${ZLIB_HOME}/include"
else else
# #
# If either header or library was not found, revert and bomb # If either header or library was not found, revert and bomb
...@@ -4345,7 +4347,7 @@ DARSHAN_VERSION="2.2.9-pre1" ...@@ -4345,7 +4347,7 @@ DARSHAN_VERSION="2.2.9-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/cray/darshan-module" 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"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
...@@ -5045,7 +5047,7 @@ do ...@@ -5045,7 +5047,7 @@ do
"darshan-gen-cxx.pl") CONFIG_FILES="$CONFIG_FILES darshan-gen-cxx.pl" ;; "darshan-gen-cxx.pl") CONFIG_FILES="$CONFIG_FILES darshan-gen-cxx.pl" ;;
"darshan-gen-fortran.pl") CONFIG_FILES="$CONFIG_FILES darshan-gen-fortran.pl" ;; "darshan-gen-fortran.pl") CONFIG_FILES="$CONFIG_FILES darshan-gen-fortran.pl" ;;
"darshan-config") CONFIG_FILES="$CONFIG_FILES darshan-config" ;; "darshan-config") CONFIG_FILES="$CONFIG_FILES darshan-config" ;;
"share/cray/darshan-module") CONFIG_FILES="$CONFIG_FILES share/cray/darshan-module" ;; "share/craype-1.x/darshan-module") CONFIG_FILES="$CONFIG_FILES share/craype-1.x/darshan-module" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac
......
...@@ -302,5 +302,5 @@ darshan-gen-cc.pl ...@@ -302,5 +302,5 @@ darshan-gen-cc.pl
darshan-gen-cxx.pl darshan-gen-cxx.pl
darshan-gen-fortran.pl darshan-gen-fortran.pl
darshan-config darshan-config
share/cray/darshan-module share/craype-1.x/darshan-module
) )
...@@ -249,7 +249,7 @@ described earlier in this document to produce darshan-enabled MPI compilers. ...@@ -249,7 +249,7 @@ described earlier in this document to produce darshan-enabled MPI compilers.
This method has been widely used and tested with both the GNU and IBM XL This method has been widely used and tested with both the GNU and IBM XL
compilers. compilers.
=== Cray XE6 (or similar) === Cray platforms (XE, XC, or similar)
The Cray programming environment produces static executables by default, The Cray programming environment produces static executables by default,
which means that Darshan instrumentation must be inserted at compile which means that Darshan instrumentation must be inserted at compile
...@@ -309,14 +309,15 @@ Note that Darshan is not currently capable of detecting the stripe size ...@@ -309,14 +309,15 @@ Note that Darshan is not currently capable of detecting the stripe size
If a Lustre file system is detected, then Darshan assumes an optimal If a Lustre file system is detected, then Darshan assumes an optimal
file alignment of 1 MiB. file alignment of 1 MiB.
==== Enabling Darshan instrumentation ==== Enabling Darshan instrumentation with Cray Programming Environment
(craype) 1.x
Darshan will automatically install an example software module file in the Darshan will automatically install an example software module file in the
following location (depending on how you specified the --prefix option in following location (depending on how you specified the --prefix option in
the previous section): the previous section):
---- ----
/soft/darshan-2.2.3/share/cray/modulefiles/darshan /soft/darshan-2.2.3/share/craype-1.x/modulefiles/darshan
---- ----
This file must be modified before it is used, however. Please see the This file must be modified before it is used, however. Please see the
...@@ -330,7 +331,7 @@ install location can be added to your local module path with the following ...@@ -330,7 +331,7 @@ install location can be added to your local module path with the following
command: command:
---- ----
module use /soft/darshan-2.2.3/share/cray/modulefiles module use /soft/darshan-2.2.3/share/craype-1.x/modulefiles
---- ----
From this point, Darshan instrumenation can be enabled for all future From this point, Darshan instrumenation can be enabled for all future
......
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