Skip to content

Commit

Permalink
Fixes to tests and adding disable options
Browse files Browse the repository at this point in the history
  • Loading branch information
valleydlr authored and tom95858 committed Feb 18, 2024
1 parent e80fbc2 commit 5c88137
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
8 changes: 5 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ AS_IF([test "x$enable_papi" != xno],[
])
AM_CONDITIONAL([HAVE_LIBPAPI], [test "x$HAVE_LIBPAPI" = xyes])
AM_CONDITIONAL([HAVE_LIBPFM], [test "x$HAVE_LIBPFM" = xyes])
AM_CONDITIONAL([ENABLE_PAPI], [test "x$enable_papi" != no -a "x$HAVE_LIBPAPI" = xyes -a "x$HAVE_LIBPFM" = xyes])

AC_LIB_HAVE_LINKFLAGS([ibmad], [], [#include <infiniband/mad.h>])
AM_CONDITIONAL([HAVE_LIBIBMAD], [test "x$HAVE_LIBIBMAD" = xyes])
Expand Down Expand Up @@ -466,8 +467,7 @@ AC_ARG_ENABLE([ibnet],
[],
[enable_ibnet="check"])
AM_CONDITIONAL([ENABLE_IBNET], [test "x$enable_ibnet" != xno])
AS_IF([test "$enable_ibnet" = xyes],[
AC_MSG_NOTICE([Disable ibnet module NOT requested])
AS_IF([test "x$enable_ibnet" = xyes],[
AS_IF([test "x$HAVE_LIBIBMAD" = xno],
[AC_MSG_ERROR([ibnet required libibmad or <infiniband/mad.h> not found])])
AS_IF([test "x$HAVE_LIBIBUMAD" = xno],
Expand Down Expand Up @@ -650,7 +650,7 @@ AC_ARG_WITH([slurm],
[with_slurm=check])
have_slurm=no
AC_SUBST([SLURM_CFLAGS])
AS_IF([test "x$with_slurm" != no],[
AS_IF([test "x$with_slurm" != xno],[
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $SLURM_CFLAGS"
AC_CHECK_HEADER([slurm/spank.h], [have_slurm=yes], [have_slurm=no])
Expand All @@ -663,6 +663,8 @@ AS_IF([test "x$with_slurm" != no],[
])
AM_CONDITIONAL([HAVE_SLURM], [test "x$have_slurm" = xyes])

OPTION_DEFAULT_ENABLE([spank_subscriber], [ENABLE_SPANK_SUBSCRIBER], [Builds sampler that subscribes to spank plugin])

AC_CHECK_HEADER([linux/netlink.h], [have_netlink=yes], [have_netlink=no])
AM_CONDITIONAL([HAVE_NETLINK], [test "x$have_netlink" = xyes])

Expand Down
3 changes: 1 addition & 2 deletions ldms/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ SUBDIRS += third-plugins
SUBDIRS += core
SUBDIRS += ldmsd

SUBDIRS += decomp

if ENABLE_OVIS_AUTH
SUBDIRS += auth
endif

if ENABLE_STORE
SUBDIRS += store
SUBDIRS += decomp
endif

if ENABLE_SAMPLER
Expand Down
8 changes: 8 additions & 0 deletions ldms/src/sampler/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@ ldmssamplerincludedir = $(includedir)/ldms/sampler
ldmssamplerinclude_HEADERS = sampler_base.h

SUBDIRS += netlink

if ENABLE_LUSTRE
SUBDIRS += lustre_client
SUBDIRS += lustre_mdt
SUBDIRS += lustre_ost
SUBDIRS += lustre_mdc
endif

if HAVE_DCGM
SUBDIRS += dcgm_sampler
Expand Down Expand Up @@ -131,8 +134,10 @@ SUBDIRS += job_info_slurm
SUBDIRS += spank
endif

if ENABLE_SPANK_SUBSCRIBER
# This slurm sampler does not have a slurm build dependency
SUBDIRS += slurm
endif

if ENABLE_LUSTRE
SUBDIRS += lustre
Expand Down Expand Up @@ -200,8 +205,10 @@ if ENABLE_MPI_SAMPLER
SUBDIRS += shm
endif

if ENABLE_PAPI
if HAVE_LIBPAPI
SUBDIRS += papi

if HAVE_LIBPFM
SUBDIRS += syspapi

Expand All @@ -218,6 +225,7 @@ librapl_la_LIBADD = $(COMMON_LIBADD) $(LTLIBPAPI) $(LTLIBPFM) -lm
pkglib_LTLIBRARIES += librapl.la
endif
endif
endif

if ENABLE_PROCDISKSTATS
SUBDIRS += procdiskstats
Expand Down

0 comments on commit 5c88137

Please sign in to comment.