Skip to content

Commit 5f9c055

Browse files
committed
hwloc1112: always disable building CUDA support.
There is no usage of CUDA hwloc objects in the v2.0.x branch, and linking in CUDA can cause problems (per #4257 (comment)). Partially cherry-picked from c341b53. Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit f28fcbe)
1 parent 61abedd commit 5f9c055

File tree

1 file changed

+2
-28
lines changed

1 file changed

+2
-28
lines changed

opal/mca/hwloc/hwloc2a/configure.m4

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -122,35 +122,9 @@ AC_DEFUN([MCA_opal_hwloc_hwloc2a_CONFIG],[
122122
enable_gl=no
123123
enable_opencl=no
124124

125-
# Per https://github.com/open-mpi/ompi/issues/4219, if
126-
# --without-cuda was specified, be sure to disable it in hwloc,
127-
# too. Note that hwloc uses --disable-cuda (i.e., a yes or no
128-
# value), whereas we use --with-cuda here in Open MPI (i.e., a
129-
# yes, no, or path value). Need to translate appropriately.
130-
#
131-
# Set enable_cuda to yes if:
132-
#
133-
# 1. --with-cuda was specified (i.e., a human specifically asked
134-
# for it)
135-
# 2. --with-cuda=blah was specified (i.e., a human specifically
136-
# asked for it)
137-
# 3. --with-cuda was not specified, but Open MPI is building CUDA
138-
# support
139-
#
140-
# Set enable_cuda to no in all other cases. This logic could be
141-
# compressed into a smaller set of if tests, but for readability /
142-
# clarity, I left it expanded.
143-
AC_MSG_CHECKING([for hwloc --enable-cuda value])
125+
# Per https://github.com/open-mpi/ompi/pull/4257, ALWAYS
126+
# disable cuda support
144127
enable_cuda=no
145-
AS_IF([test "$with_cuda" = "yes"],
146-
[enable_cuda=yes],
147-
[AS_IF([test -n "$with_cuda" && test "$with_cuda" != "no"],
148-
[enable_cuda=yes],
149-
[AS_IF([test "$opal_check_cuda_happy" = "yes"],
150-
[enable_cuda=yes])
151-
])
152-
])
153-
AC_MSG_RESULT(["$enable_cuda"])
154128

155129
# Open MPI currently does not use hwloc's NVML support
156130
enable_nvml=no

0 commit comments

Comments
 (0)