From f5d51dc2f5f373503dc099ee8fa52e1e34507cfd Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 21 Sep 2017 08:06:29 -0700 Subject: [PATCH] hwloc: do not build hwloc CUDA support if --without-cuda used Signed-off-by: Jeff Squyres --- opal/mca/hwloc/hwloc2a/configure.m4 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/opal/mca/hwloc/hwloc2a/configure.m4 b/opal/mca/hwloc/hwloc2a/configure.m4 index d53fb10dc6..482151db29 100644 --- a/opal/mca/hwloc/hwloc2a/configure.m4 +++ b/opal/mca/hwloc/hwloc2a/configure.m4 @@ -118,6 +118,13 @@ AC_DEFUN([MCA_opal_hwloc_hwloc2a_CONFIG],[ # ensure we are in "embedded" mode hwloc_mode=embedded + # Per https://github.com/open-mpi/ompi/issues/4219, if + # --without-cuda was specified, be sure to disable it in hwloc, + # too. Note that hwloc uses --disable-cuda, so just set + # enable_cuda=$with_cuda to get the same value that was passed in + # via the top-level --with-cuda CLI option. + enable_cuda=$with_cuda + # Disable NVML support if CUDA support is not built AS_IF([test "$opal_check_cuda_happy" != "yes"], [enable_nvml=no])