configure: cleanup cuda/cudart variables

libhwloc uses cudart only. cuda is for tests/hwloc/cuda. Rename configure/Makefile variables properly. Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
open-mpi · Feb 26, 2021 · 6a55ae4 · 6a55ae4
1 parent 5f32f45
commit 6a55ae4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/config/hwloc.m4 b/config/hwloc.m4
@@ -1002,6 +1002,7 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
     hwloc_have_cuda=no
     hwloc_have_cudart=no
     if test "x$enable_io" != xno && test "x$enable_cuda" != "xno"; then
+      # Look for CUDA first, for our test only
       HWLOC_CUDA_CPPFLAGS="$HWLOC_CUDA_COMMON_CPPFLAGS"
       HWLOC_CUDA_LDFLAGS="$HWLOC_CUDA_COMMON_LDFLAGS"
       tmp_save_CPPFLAGS="$CPPFLAGS"
@@ -1018,11 +1019,28 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
 #error CUDA_VERSION too old
 #endif]], [[int i = 3;]])],
          [AC_MSG_RESULT(yes)
-          AC_CHECK_LIB([cuda], [cuInit],
-                       [AC_DEFINE([HAVE_CUDA], 1, [Define to 1 if we have -lcuda])
-                        hwloc_have_cuda=yes])],
+          AC_CHECK_LIB([cuda], [cuInit], [
+            HWLOC_CUDA_LIBS="-lcuda"
+            hwloc_have_cuda=yes
+          ])
+         ],
          [AC_MSG_RESULT(no)])])
+      CPPFLAGS="$tmp_save_CPPFLAGS"
+      LDFLAGS="$tmp_save_LDFLAGS"
+      if test x$hwloc_have_cuda = xyes; then
+        AC_SUBST(HWLOC_CUDA_CPPFLAGS)
+        AC_SUBST(HWLOC_CUDA_LIBS)
+        AC_SUBST(HWLOC_CUDA_LDFLAGS)
+        AC_DEFINE([HAVE_CUDA], 1, [Define to 1 if we have -lcuda])
+      fi
 
+      # Look for CUDART now, for library and tests
+      HWLOC_CUDART_CPPFLAGS="$HWLOC_CUDA_COMMON_CPPFLAGS"
+      HWLOC_CUDART_LDFLAGS="$HWLOC_CUDA_COMMON_LDFLAGS"
+      tmp_save_CPPFLAGS="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $HWLOC_CUDART_CPPFLAGS"
+      tmp_save_LDFLAGS="$LDFLAGS"
+      LDFLAGS="$LDFLAGS $HWLOC_CUDART_LDFLAGS"
       AC_CHECK_HEADERS([cuda_runtime_api.h], [
         AC_MSG_CHECKING(if CUDART_VERSION >= 3020)
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -1034,17 +1052,19 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
 #endif]], [[int i = 3;]])],
          [AC_MSG_RESULT(yes)
           AC_CHECK_LIB([cudart], [cudaGetDeviceProperties], [
-            HWLOC_CUDA_LIBS="-lcudart"
-            AC_SUBST(HWLOC_CUDA_LIBS)
-            AC_SUBST(HWLOC_CUDA_LDFLAGS)
-            AC_SUBST(HWLOC_CUDA_CPPFLAGS)
+            HWLOC_CUDART_LIBS="-lcudart"
             hwloc_have_cudart=yes
-            AC_DEFINE([HWLOC_HAVE_CUDART], [1], [Define to 1 if you have the `cudart' SDK.])
           ])
         ])
       ])
       CPPFLAGS="$tmp_save_CPPFLAGS"
       LDFLAGS="$tmp_save_LDFLAGS"
+      if test x$hwloc_have_cudart = xyes; then
+        AC_SUBST(HWLOC_CUDART_CPPFLAGS)
+        AC_SUBST(HWLOC_CUDART_LIBS)
+        AC_SUBST(HWLOC_CUDART_LDFLAGS)
+        AC_DEFINE([HWLOC_HAVE_CUDART], [1], [Define to 1 if you have the `cudart' SDK.])
+      fi
 
       AS_IF([test "$enable_cuda" = "yes" -a "$hwloc_have_cudart" = "no"],
             [AC_MSG_WARN([Specified --enable-cuda switch, but could not])
@@ -1374,10 +1394,10 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
            HWLOC_CFLAGS="$HWLOC_CFLAGS $HWLOC_OPENCL_CPPFLAGS"
            HWLOC_REQUIRES="$HWLOC_OPENCL_REQUIRES $HWLOC_REQUIRES"])
     AS_IF([test "$hwloc_cuda_component" = "static"],
-          [HWLOC_LIBS="$HWLOC_LIBS $HWLOC_CUDA_LIBS"
-           HWLOC_LDFLAGS="$HWLOC_LDFLAGS $HWLOC_CUDA_LDFLAGS"
-           HWLOC_CFLAGS="$HWLOC_CFLAGS $HWLOC_CUDA_CPPFLAGS"
-           HWLOC_REQUIRES="$HWLOC_CUDA_REQUIRES $HWLOC_REQUIRES"])
+          [HWLOC_LIBS="$HWLOC_LIBS $HWLOC_CUDART_LIBS"
+           HWLOC_LDFLAGS="$HWLOC_LDFLAGS $HWLOC_CUDART_LDFLAGS"
+           HWLOC_CFLAGS="$HWLOC_CFLAGS $HWLOC_CUDART_CPPFLAGS"
+           HWLOC_REQUIRES="$HWLOC_CUDART_REQUIRES $HWLOC_REQUIRES"])
     AS_IF([test "$hwloc_nvml_component" = "static"],
           [HWLOC_LIBS="$HWLOC_LIBS $HWLOC_NVML_LIBS"
            HWLOC_LDFLAGS="$HWLOC_LDFLAGS $HWLOC_NVML_LDFLAGS"

diff --git a/hwloc/Makefile.am b/hwloc/Makefile.am
@@ -88,8 +88,8 @@ sources += topology-cuda.c
 else
 plugins_LTLIBRARIES += hwloc_cuda.la
 hwloc_cuda_la_SOURCES = topology-cuda.c
-hwloc_cuda_la_CFLAGS = $(AM_CFLAGS) $(HWLOC_CUDA_CPPFLAGS) -DHWLOC_INSIDE_PLUGIN
-hwloc_cuda_la_LDFLAGS = $(plugins_ldflags) $(HWLOC_CUDA_LIBS) $(HWLOC_CUDA_LDFLAGS)
+hwloc_cuda_la_CFLAGS = $(AM_CFLAGS) $(HWLOC_CUDART_CPPFLAGS) -DHWLOC_INSIDE_PLUGIN
+hwloc_cuda_la_LDFLAGS = $(plugins_ldflags) $(HWLOC_CUDART_LIBS) $(HWLOC_CUDART_LDFLAGS)
 endif
 endif HWLOC_HAVE_CUDART
 

diff --git a/tests/hwloc/Makefile.am b/tests/hwloc/Makefile.am
@@ -124,8 +124,8 @@ linux_libnuma_CFLAGS = $(AM_CFLAGS) $(HWLOC_NUMA_CFLAGS)
 linux_libnuma_LDADD = $(LDADD) $(HWLOC_NUMA_LIBS)
 openfabrics_verbs_LDADD = $(LDADD) -libverbs
 opencl_LDADD = $(LDADD) $(HWLOC_OPENCL_LIBS) $(HWLOC_OPENCL_LDFLAGS)
-cuda_LDADD = $(LDADD) -lcuda
-cudart_LDADD = $(LDADD) -lcuda -lcudart
+cuda_LDADD = $(LDADD) $(HWLOC_CUDA_LIBS)
+cudart_LDADD = $(LDADD) $(HWLOC_CUDART_LIBS)
 nvml_LDADD = $(LDADD) -lnvidia-ml
 rsmi_LDADD = $(LDADD) -lrocm_smi64
 hwloc_bind_LDADD = $(LDADD)