Skip to content

Commit

Permalink
hwloc1112: always disable building CUDA support.
Browse files Browse the repository at this point in the history
There is no usage of CUDA hwloc objects in the v3.0.x branch, and
linking in CUDA can cause problems (per
open-mpi#4257 (comment)).

Partially cherry-picked from c341b53.

Signed-off-by: Jeff Squyres <[email protected]>
  • Loading branch information
jsquyres committed Oct 10, 2017
1 parent 7b7b01d commit 1ed8ad6
Showing 1 changed file with 2 additions and 28 deletions.
30 changes: 2 additions & 28 deletions opal/mca/hwloc/hwloc1117/configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -115,35 +115,9 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1117_CONFIG],[
enable_gl=no
enable_opencl=no

# 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 (i.e., a yes or no
# value), whereas we use --with-cuda here in Open MPI (i.e., a
# yes, no, or path value). Need to translate appropriately.
#
# Set enable_cuda to yes if:
#
# 1. --with-cuda was specified (i.e., a human specifically asked
# for it)
# 2. --with-cuda=blah was specified (i.e., a human specifically
# asked for it)
# 3. --with-cuda was not specified, but Open MPI is building CUDA
# support
#
# Set enable_cuda to no in all other cases. This logic could be
# compressed into a smaller set of if tests, but for readability /
# clarity, I left it expanded.
AC_MSG_CHECKING([for hwloc --enable-cuda value])
# Per https://github.com/open-mpi/ompi/pull/4257, ALWAYS
# disable cuda support
enable_cuda=no
AS_IF([test "$with_cuda" = "yes"],
[enable_cuda=yes],
[AS_IF([test -n "$with_cuda" && test "$with_cuda" != "no"],
[enable_cuda=yes],
[AS_IF([test "$opal_check_cuda_happy" = "yes"],
[enable_cuda=yes])
])
])
AC_MSG_RESULT(["$enable_cuda"])

# Open MPI currently does not use hwloc's NVML support
enable_nvml=no
Expand Down

0 comments on commit 1ed8ad6

Please sign in to comment.