Unconditionally init CUDA architectures in Python builds since cuco r…

…equires them. (#3041)
rapidsai · Dec 5, 2022 · 0502585 · 0502585
1 parent 1cfbfd7
commit 0502585
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/python/cugraph/CMakeLists.txt b/python/cugraph/CMakeLists.txt
@@ -18,14 +18,19 @@ set(cugraph_version 22.12.00)
 
 include(../../fetch_rapids.cmake)
 
+# We always need CUDA for cuML because the raft dependency brings in a
+# header-only cuco dependency that enables CUDA unconditionally.
+include(rapids-cuda)
+rapids_cuda_init_architectures(cugraph-python)
+
 project(
   cugraph-python
   VERSION ${cugraph_version}
   LANGUAGES # TODO: Building Python extension modules via the python_extension_module requires the C
             # language to be enabled here. The test project that is built in scikit-build to verify
             # various linking options for the python library is hardcoded to build with C, so until
             # that is fixed we need to keep C.
-            C CXX
+            C CXX CUDA
 )
 
 ################################################################################
@@ -51,16 +56,6 @@ endif()
 include(rapids-cython)
 
 if(NOT cugraph_FOUND)
-  # TODO: This will not be necessary once we upgrade to CMake 3.22, which will pull in the required
-  # languages for the C++ project even if this project does not require those languges.
-  include(rapids-cuda)
-  rapids_cuda_init_architectures(cugraph-python)
-  enable_language(CUDA)
-
-  # Since cugraph only enables CUDA optionally, we need to manually include the file that
-  # rapids_cuda_init_architectures relies on `project` including.
-  include("${CMAKE_PROJECT_cugraph-python_INCLUDE}")
-
   set(BUILD_TESTS OFF)
   set(BUILD_CUGRAPH_MG_TESTS OFF)
   set(BUILD_CUGRAPH_OPS_CPP_TESTS OFF)

diff --git a/python/pylibcugraph/CMakeLists.txt b/python/pylibcugraph/CMakeLists.txt
@@ -18,14 +18,19 @@ set(pylibcugraph_version 22.12.00)
 
 include(../../fetch_rapids.cmake)
 
+# We always need CUDA for cuML because the raft dependency brings in a
+# header-only cuco dependency that enables CUDA unconditionally.
+include(rapids-cuda)
+rapids_cuda_init_architectures(pylibcugraph-python)
+
 project(
   pylibcugraph-python
   VERSION ${pylibcugraph_version}
   LANGUAGES # TODO: Building Python extension modules via the python_extension_module requires the C
             # language to be enabled here. The test project that is built in scikit-build to verify
             # various linking options for the python library is hardcoded to build with C, so until
             # that is fixed we need to keep C.
-            C CXX
+            C CXX CUDA
 )
 
 ################################################################################
@@ -51,16 +56,6 @@ endif()
 include(rapids-cython)
 
 if (NOT cugraph_FOUND)
-  # TODO: This will not be necessary once we upgrade to CMake 3.22, which will pull in the required
-  # languages for the C++ project even if this project does not require those languges.
-  include(rapids-cuda)
-  rapids_cuda_init_architectures(pylibcugraph-python)
-  enable_language(CUDA)
-
-  # Since cugraph only enables CUDA optionally, we need to manually include the file that
-  # rapids_cuda_init_architectures relies on `project` including.
-  include("${CMAKE_PROJECT_pylibcugraph-python_INCLUDE}")
-
   set(BUILD_TESTS OFF)
   set(BUILD_CUGRAPH_MG_TESTS OFF)
   set(BUILD_CUGRAPH_OPS_CPP_TESTS OFF)