[Darshan-commits] [Git][darshan/darshan][dev-no-mpi] don't build disabled modules
Philip Carns
xgitlab at cels.anl.gov
Tue Aug 6 11:09:19 CDT 2019
Philip Carns pushed to branch dev-no-mpi at darshan / darshan
Commits:
157643db by Phil Carns at 2019-08-06T16:08:58Z
don't build disabled modules
- also add option to disable "null" module for now
- - - - -
3 changed files:
- darshan-runtime/Makefile.in
- darshan-runtime/configure
- darshan-runtime/configure.in
Changes:
=====================================
darshan-runtime/Makefile.in
=====================================
@@ -1,4 +1,4 @@
-all: lib/libdarshan.a lib/libdarshan-stubs.a lib/darshan-null.o
+all: lib/libdarshan.a lib/libdarshan-stubs.a
#TODO: each module provides own makefile with module-specific objects, build options, etc.
@@ -24,7 +24,7 @@ DARSHAN_LOG_FORMAT = $(srcdir)/../darshan-log-format.h
DARSHAN_VERSION = @DARSHAN_VERSION@
ifndef DISABLE_LDPRELOAD
-all: lib/libdarshan.so lib/darshan-null.po
+all: lib/libdarshan.so
endif
VPATH = $(srcdir)
@@ -37,15 +37,51 @@ LIBS = -lz @LIBBZ2@
BUILD_HDF5_MODULE = @BUILD_HDF5_MODULE@
BUILD_MDHIM_MODULE = @BUILD_MDHIM_MODULE@
+BUILD_POSIX_MODULE = @BUILD_POSIX_MODULE@
+BUILD_MPIIO_MODULE = @BUILD_MPIIO_MODULE@
+BUILD_PNETCDF_MODULE = @BUILD_PNETCDF_MODULE@
+BUILD_STDIO_MODULE = @BUILD_STDIO_MODULE@
+BUILD_DXT_MODULE = @BUILD_DXT_MODULE@
+BUILD_NULL_MODULE = @BUILD_NULL_MODULE@
+
+DARSHAN_STATIC_MOD_OBJS =
+DARSHAN_DYNAMIC_MOD_OBJS =
+
+ifdef BUILD_POSIX_MODULE
+DARSHAN_STATIC_MOD_OBJS += lib/darshan-posix.o
+DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-posix.po
+endif
+
+ifdef BUILD_MPIIO_MODULE
+DARSHAN_STATIC_MOD_OBJS += lib/darshan-mpiio.o
+DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-mpiio.po
+endif
+
+ifdef BUILD_PNETCDF_MODULE
+DARSHAN_STATIC_MOD_OBJS += lib/darshan-pnetcdf.o
+DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-pnetcdf.po
+endif
-DARSHAN_STATIC_MOD_OBJS = lib/darshan-posix.o lib/darshan-mpiio.o lib/darshan-pnetcdf.o lib/darshan-stdio.o lib/darshan-dxt.o
-DARSHAN_DYNAMIC_MOD_OBJS = lib/darshan-posix.po lib/darshan-mpiio.po lib/darshan-pnetcdf.po lib/darshan-stdio.po lib/darshan-dxt.po
+ifdef BUILD_STDIO_MODULE
+DARSHAN_STATIC_MOD_OBJS += lib/darshan-stdio.o
+DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-stdio.po
+endif
+
+ifdef BUILD_DXT_MODULE
+DARSHAN_STATIC_MOD_OBJS += lib/darshan-dxt.o
+DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-dxt.po
+endif
ifdef BUILD_HDF5_MODULE
DARSHAN_STATIC_MOD_OBJS += lib/darshan-hdf5.o
DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-hdf5.po
endif
+ifdef BUILD_NULL_MODULE
+DARSHAN_STATIC_MOD_OBJS += lib/darshan-null.o
+DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-null.po
+endif
+
ifdef DARSHAN_USE_BGQ
DARSHAN_STATIC_MOD_OBJS += lib/darshan-bgq.o
DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-bgq.po
=====================================
darshan-runtime/configure
=====================================
@@ -621,6 +621,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
+BUILD_NULL_MODULE
DARSHAN_MDHIM_LD_OPTS
BUILD_MDHIM_MODULE
BUILD_DXT_MODULE
@@ -708,6 +709,7 @@ enable_posix_mod
enable_mpiio_mod
enable_stdio_mod
enable_pnetcdf_mod
+enable_null_mod
enable_dxt_mod
enable_bgq_mod
enable_lustre_mod
@@ -1361,6 +1363,7 @@ Optional Features:
--disable-stdio-mod Disables compilation and use of STDIO module
--disable-pnetcdf-mod Disables compilation and use of PnetCDF module
(requires MPI)
+ --disable-null-mod Disables compilation and use of NULL module
--disable-dxt-mod Disables compilation and use of DXT module
--disable-bgq-mod Disables compilation and use of BG/Q module (for BG/Q systems)
--disable-lustre-mod Disables compilation and use of the Lustre module
@@ -3692,6 +3695,17 @@ if test "x$enable_pnetcdf_mod" = "xno"; then :
DARSHAN_PNETCDF_LD_OPTS=
fi
+# NULL module
+BUILD_NULL_MODULE=1
+# Check whether --enable-null-mod was given.
+if test "${enable_null_mod+set}" = set; then :
+ enableval=$enable_null_mod;
+fi
+
+if test "x$enable_null_mod" = "xno"; then :
+ BUILD_NULL_MODULE=
+fi
+
# DXT module
BUILD_DXT_MODULE=1
# Check whether --enable-dxt-mod was given.
@@ -4574,6 +4588,7 @@ DARSHAN_VERSION="3.1.7"
+
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 share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf share/ld-opts/darshan-base-ld-opts"
@@ -5876,6 +5891,20 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Building Darshan with the following features:" >&5
$as_echo "$as_me: Building Darshan with the following features:" >&6;}
+if test "x$BUILD_NULL_MODULE" = "x"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: NULL module support: no" >&5
+$as_echo "$as_me: NULL module support: no" >&6;}
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: NULL module support: yes" >&5
+$as_echo "$as_me: NULL module support: yes" >&6;}
+fi
+if test "x$BUILD_MPIIO_MODULE" = "x"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: MPIIO module support: no" >&5
+$as_echo "$as_me: MPIIO module support: no" >&6;}
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: MPIIO module support: yes" >&5
+$as_echo "$as_me: MPIIO module support: yes" >&6;}
+fi
if test "x$BUILD_POSIX_MODULE" = "x"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: POSIX module support: no" >&5
$as_echo "$as_me: POSIX module support: no" >&6;}
=====================================
darshan-runtime/configure.in
=====================================
@@ -96,6 +96,13 @@ AS_IF([test "x$enable_pnetcdf_mod" = "xno"],
BUILD_PNETCDF_MODULE=
DARSHAN_PNETCDF_LD_OPTS=)
+# NULL module
+BUILD_NULL_MODULE=1
+AC_ARG_ENABLE(null-mod,
+ AS_HELP_STRING([--disable-null-mod], [Disables compilation and use of NULL module]))
+AS_IF([test "x$enable_null_mod" = "xno"],
+ BUILD_NULL_MODULE=)
+
# DXT module
BUILD_DXT_MODULE=1
AC_ARG_ENABLE(dxt-mod,
@@ -475,6 +482,7 @@ AC_SUBST(DARSHAN_STDIO_LD_OPTS)
AC_SUBST(BUILD_DXT_MODULE)
AC_SUBST(BUILD_MDHIM_MODULE)
AC_SUBST(DARSHAN_MDHIM_LD_OPTS)
+AC_SUBST(BUILD_NULL_MODULE)
AC_OUTPUT(Makefile
darshan-mk-log-dirs.pl
darshan-gen-cc.pl
@@ -494,6 +502,8 @@ share/ld-opts/darshan-base-ld-opts
)
AC_MSG_NOTICE(Building Darshan with the following features:)
+AS_IF([test "x$BUILD_NULL_MODULE" = "x"], [AC_MSG_NOTICE(NULL module support: no)], [AC_MSG_NOTICE(NULL module support: yes)])
+AS_IF([test "x$BUILD_MPIIO_MODULE" = "x"], [AC_MSG_NOTICE(MPIIO module support: no)], [AC_MSG_NOTICE(MPIIO module support: yes)])
AS_IF([test "x$BUILD_POSIX_MODULE" = "x"], [AC_MSG_NOTICE(POSIX module support: no)], [AC_MSG_NOTICE(POSIX module support: yes)])
AS_IF([test "x$BUILD_MPIIO_MODULE" = "x"], [AC_MSG_NOTICE(MPIIO module support: no)], [AC_MSG_NOTICE(MPIIO module support: yes)])
AS_IF([test "x$BUILD_STDIO_MODULE" = "x"], [AC_MSG_NOTICE(STDIO module support: no)], [AC_MSG_NOTICE(STDIO module support: yes)])
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/157643db4c5aaf7677fe42370eebd318a092974f
--
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/157643db4c5aaf7677fe42370eebd318a092974f
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/20190806/d767e30f/attachment-0001.html>
More information about the Darshan-commits
mailing list