[Darshan-commits] [Git][darshan/darshan][autoperf-mod-update] more cleanup to get apxc building
Shane Snyder
xgitlab at cels.anl.gov
Thu Mar 11 21:06:55 CST 2021
Shane Snyder pushed to branch autoperf-mod-update at darshan / darshan
Commits:
c48dae80 by Shane Snyder at 2021-03-12T03:06:23+00:00
more cleanup to get apxc building
- - - - -
4 changed files:
- darshan-log-format.h
- darshan-runtime/configure
- darshan-runtime/configure.in
- darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
Changes:
=====================================
darshan-log-format.h
=====================================
@@ -157,20 +157,20 @@ struct darshan_base_record
#endif
#define DARSHAN_MODULE_IDS \
- X(DARSHAN_NULL_MOD, "NULL", DARSHAN_NULL_VER, NULL) \
- X(DARSHAN_POSIX_MOD, "POSIX", DARSHAN_POSIX_VER, &posix_logutils) \
- X(DARSHAN_MPIIO_MOD, "MPI-IO", DARSHAN_MPIIO_VER, &mpiio_logutils) \
- X(DARSHAN_H5F_MOD, "H5F", DARSHAN_H5F_VER, &hdf5_file_logutils) \
- X(DARSHAN_H5D_MOD, "H5D", DARSHAN_H5D_VER, &hdf5_dataset_logutils) \
- X(DARSHAN_PNETCDF_MOD, "PNETCDF", DARSHAN_PNETCDF_VER, &pnetcdf_logutils) \
- X(DARSHAN_BGQ_MOD, "BG/Q", DARSHAN_BGQ_VER, &bgq_logutils) \
- X(DARSHAN_LUSTRE_MOD, "LUSTRE", DARSHAN_LUSTRE_VER, &lustre_logutils) \
- X(DARSHAN_STDIO_MOD, "STDIO", DARSHAN_STDIO_VER, &stdio_logutils) \
- X(DXT_POSIX_MOD, "DXT_POSIX", DXT_POSIX_VER, &dxt_posix_logutils) \
- X(DXT_MPIIO_MOD, "DXT_MPIIO", DXT_MPIIO_VER, &dxt_mpiio_logutils) \
- X(DARSHAN_MDHIM_MOD, "MDHIM", DARSHAN_MDHIM_VER, &mdhim_logutils) \
- X(APXC_MOD, "APXC", __APXC_VER, __apxc_logutils) \
- X(APMPI_MOD, "APMPI", __APMPI_VER, __apmpi_logutils)
+ X(DARSHAN_NULL_MOD, "NULL", DARSHAN_NULL_VER, NULL) \
+ X(DARSHAN_POSIX_MOD, "POSIX", DARSHAN_POSIX_VER, &posix_logutils) \
+ X(DARSHAN_MPIIO_MOD, "MPI-IO", DARSHAN_MPIIO_VER, &mpiio_logutils) \
+ X(DARSHAN_H5F_MOD, "H5F", DARSHAN_H5F_VER, &hdf5_file_logutils) \
+ X(DARSHAN_H5D_MOD, "H5D", DARSHAN_H5D_VER, &hdf5_dataset_logutils) \
+ X(DARSHAN_PNETCDF_MOD, "PNETCDF", DARSHAN_PNETCDF_VER, &pnetcdf_logutils) \
+ X(DARSHAN_BGQ_MOD, "BG/Q", DARSHAN_BGQ_VER, &bgq_logutils) \
+ X(DARSHAN_LUSTRE_MOD, "LUSTRE", DARSHAN_LUSTRE_VER, &lustre_logutils) \
+ X(DARSHAN_STDIO_MOD, "STDIO", DARSHAN_STDIO_VER, &stdio_logutils) \
+ X(DXT_POSIX_MOD, "DXT_POSIX", DXT_POSIX_VER, &dxt_posix_logutils) \
+ X(DXT_MPIIO_MOD, "DXT_MPIIO", DXT_MPIIO_VER, &dxt_mpiio_logutils) \
+ X(DARSHAN_MDHIM_MOD, "MDHIM", DARSHAN_MDHIM_VER, &mdhim_logutils) \
+ X(DARSHAN_APXC_MOD, "APXC", __APXC_VER, __apxc_logutils) \
+ X(DARSHAN_APMPI_MOD, "APMPI", __APMPI_VER, __apmpi_logutils)
/* unique identifiers to distinguish between available darshan modules */
/* NOTES: - valid ids range from [0...DARSHAN_MAX_MODS-1]
=====================================
darshan-runtime/configure
=====================================
@@ -630,7 +630,7 @@ DARSHAN_HDF5_LD_FLAGS
DARSHAN_HDF5_ADD_DFLUSH_LD_OPTS
DARSHAN_HDF5_LD_OPTS
BUILD_HDF5_MODULE
-AUTOPERF_APMPI_LD_OPTS
+DARSHAN_APMPI_LD_OPTS
BUILD_APMPI_MODULE
BUILD_APXC_MODULE
DARSHAN_PNETCDF_LD_OPTS
@@ -688,7 +688,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -786,7 +785,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1039,15 +1037,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1185,7 +1174,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1338,7 +1327,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -4223,7 +4211,7 @@ fi
# AUTOPERF MPI module
BUILD_APMPI_MODULE=
-AUTOPERF_APMPI_LD_OPTS=
+DARSHAN_APMPI_LD_OPTS=
# Check whether --enable-apmpi-mod was given.
if test "${enable_apmpi_mod+set}" = set; then :
enableval=$enable_apmpi_mod;
@@ -4246,7 +4234,7 @@ fi
# this last part tells it to only check for presence
BUILD_APMPI_MODULE=1
- AUTOPERF_APMPI_LD_OPTS="@${darshan_share_path}/ld-opts/autoperf-apmpi-ld-opts"
+ DARSHAN_APMPI_LD_OPTS="@${darshan_share_path}/ld-opts/autoperf-apmpi-ld-opts"
fi
=====================================
darshan-runtime/configure.in
=====================================
@@ -222,7 +222,7 @@ AS_IF([test "x$enable_mpiio_mod" = "xno" || test "x$ENABLE_MPI" = "x"],
# AUTOPERF MPI module
BUILD_APMPI_MODULE=
-AUTOPERF_APMPI_LD_OPTS=
+DARSHAN_APMPI_LD_OPTS=
AC_ARG_ENABLE(apmpi-mod,
AS_HELP_STRING([--enable-apmpi-mod], [Enables compilation and use of AUTOPERF MPI module (requires MPI)]))
AS_IF([test "x$enable_apmpi_mod" = "xyes"], [
@@ -235,7 +235,7 @@ AS_IF([test "x$enable_apmpi_mod" = "xyes"], [
[AC_MSG_ERROR([The Autoperf MPI module is not present])],
[-]) # this last part tells it to only check for presence
BUILD_APMPI_MODULE=1
- AUTOPERF_APMPI_LD_OPTS="@${darshan_share_path}/ld-opts/autoperf-apmpi-ld-opts"
+ DARSHAN_APMPI_LD_OPTS="@${darshan_share_path}/ld-opts/autoperf-apmpi-ld-opts"
])
AC_ARG_ENABLE(apmpi-coll-sync,
@@ -573,7 +573,7 @@ AC_SUBST(BUILD_PNETCDF_MODULE)
AC_SUBST(DARSHAN_PNETCDF_LD_OPTS)
AC_SUBST(BUILD_APXC_MODULE)
AC_SUBST(BUILD_APMPI_MODULE)
-AC_SUBST(AUTOPERF_APMPI_LD_OPTS)
+AC_SUBST(DARSHAN_APMPI_LD_OPTS)
AC_SUBST(BUILD_HDF5_MODULE)
AC_SUBST(DARSHAN_HDF5_LD_OPTS)
AC_SUBST(DARSHAN_HDF5_ADD_DFLUSH_LD_OPTS)
=====================================
darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
=====================================
@@ -13,4 +13,4 @@
@DARSHAN_PNETCDF_LD_OPTS@
@DARSHAN_HDF5_LD_OPTS@
@DARSHAN_MDHIM_LD_OPTS@
- at AUTOPERF_APMPI_LD_OPTS@
+ at DARSHAN_APMPI_LD_OPTS@
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/-/commit/c48dae803f8fe418c30765a0729bfcaa1d42903a
--
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/-/commit/c48dae803f8fe418c30765a0729bfcaa1d42903a
You're receiving this email because of your account on xgitlab.cels.anl.gov.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20210311/35100a48/attachment-0001.html>
More information about the Darshan-commits
mailing list