Skip to content

Commit f28fcbe

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]>
1 parent 9a5bf88 commit f28fcbe

File tree

1 file changed

+2
-28
lines changed

1 file changed

+2
-28
lines changed

opal/mca/hwloc/hwloc1112/configure.m4

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -115,35 +115,9 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1112_CONFIG],[
115115
enable_gl=no
116116
enable_opencl=no
117117

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

148122
# Open MPI currently does not use hwloc's NVML support
149123
enable_nvml=no

0 commit comments

Comments
 (0)