From 3d7091ef1aa6ebc811c73c68eb3592f320135950 Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Wed, 4 May 2022 15:20:17 -0700
Subject: [PATCH 01/14] Switch build to use rapids-cython.

---
 python/CMakeLists.txt           | 16 ++++++----------
 python/rmm/_cuda/CMakeLists.txt | 10 ++++++----
 python/rmm/_lib/CMakeLists.txt  |  9 ++++++---
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index cb12813f9..6868e8159 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -16,9 +16,10 @@ cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)
 
 set(rmm_version 22.06.00)
 
-set(CYTHON_FLAGS
-    "--directive binding=True,embedsignature=True,always_allow_keywords=True"
-    CACHE STRING "The directives for Cython compilation.")
+# TODO: This link needs to be changed back to the mainline branch of rapids-cmake before the PR is merged.
+file(DOWNLOAD https://raw.githubusercontent.com/vyasr/rapids-cmake/cf54c7d6e215c1188e1b9eb660565bdf42b83b64/RAPIDS.cmake
+        ${CMAKE_BINARY_DIR}/RAPIDS.cmake)
+include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 
 project(
   rmm-python
@@ -38,12 +39,6 @@ project(
 option(FIND_RMM_CPP "Search for existing RMM C++ installations before defaulting to local files"
        OFF)
 
-find_package(PythonExtensions REQUIRED)
-find_package(Cython REQUIRED)
-
-# Ignore unused variable warning.
-set(ignored_variable "${SKBUILD}")
-
 # If the user requested it we attempt to find RMM. TODO: Should we allow the user to specify a path
 # instead of just searching? This version assumes that the installation has been appropriately
 # configured for CMake discovery.
@@ -59,6 +54,7 @@ if(NOT RMM_FOUND)
   add_subdirectory(../ rmm-cpp)
 endif()
 
-add_subdirectory(cmake)
+include(rapids-cython)
+rapids_cython_init()
 add_subdirectory(rmm/_cuda)
 add_subdirectory(rmm/_lib)
diff --git a/python/rmm/_cuda/CMakeLists.txt b/python/rmm/_cuda/CMakeLists.txt
index 16489dde5..ab84b791c 100644
--- a/python/rmm/_cuda/CMakeLists.txt
+++ b/python/rmm/_cuda/CMakeLists.txt
@@ -12,8 +12,10 @@
 # the License.
 # =============================================================================
 
-# Set the list of Cython files to build
-set(cython_modules stream)
+set(cython_sources stream.pyx)
+set(linked_libraries rmm::rmm)
 
-# Build all of the Cython targets
-add_cython_modules("${cython_modules}")
+rapids_cython_create_modules(
+    SOURCE_FILES "${cython_sources}"
+    LINKED_LIBRARIES "${linked_libraries}"
+    CXX)
diff --git a/python/rmm/_lib/CMakeLists.txt b/python/rmm/_lib/CMakeLists.txt
index 954af9331..435cc00fa 100644
--- a/python/rmm/_lib/CMakeLists.txt
+++ b/python/rmm/_lib/CMakeLists.txt
@@ -12,8 +12,11 @@
 # the License.
 # =============================================================================
 
-# Set the list of Cython files to build
-set(cython_modules device_buffer lib memory_resource cuda_stream)
+set(cython_sources device_buffer.pyx lib.pyx memory_resource.pyx cuda_stream.pyx)
+set(linked_libraries rmm::rmm)
 
 # Build all of the Cython targets
-add_cython_modules("${cython_modules}")
+rapids_cython_create_modules(
+    SOURCE_FILES "${cython_sources}"
+    LINKED_LIBRARIES "${linked_libraries}"
+    CXX)

From 879217a5f69a193eb81dacb3cf8540d8d0eed64b Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Wed, 4 May 2022 15:20:38 -0700
Subject: [PATCH 02/14] Remove now obsolete cmake directory.

---
 python/cmake/CMakeLists.txt           | 16 ---------
 python/cmake/rmm_python_helpers.cmake | 48 ---------------------------
 python/cmake/skbuild_patches.cmake    | 48 ---------------------------
 3 files changed, 112 deletions(-)
 delete mode 100644 python/cmake/CMakeLists.txt
 delete mode 100644 python/cmake/rmm_python_helpers.cmake
 delete mode 100644 python/cmake/skbuild_patches.cmake

diff --git a/python/cmake/CMakeLists.txt b/python/cmake/CMakeLists.txt
deleted file mode 100644
index 9469891ae..000000000
--- a/python/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# =============================================================================
-# Copyright (c) 2022, NVIDIA CORPORATION.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
-# =============================================================================
-
-include(rmm_python_helpers.cmake)
-include(skbuild_patches.cmake)
diff --git a/python/cmake/rmm_python_helpers.cmake b/python/cmake/rmm_python_helpers.cmake
deleted file mode 100644
index 91f0a5a17..000000000
--- a/python/cmake/rmm_python_helpers.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# =============================================================================
-# Copyright (c) 2022, NVIDIA CORPORATION.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
-# =============================================================================
-
-#[=======================================================================[.rst:
-add_cython_modules
-------------------
-
-Generate C(++) from Cython and create Python modules.
-
-.. code-block:: cmake
-
-  add_cython_modules(<ModuleName...>)
-
-Creates a Cython target for a module, then adds a corresponding Python
-extension module.
-
-``ModuleName``
-  The list of modules to build.
-
-#]=======================================================================]
-function(add_cython_modules cython_modules)
-  foreach(cython_module ${cython_modules})
-    add_cython_target(${cython_module} CXX PY3)
-    add_library(${cython_module} MODULE ${cython_module})
-    python_extension_module(${cython_module})
-
-    # To avoid libraries being prefixed with "lib".
-    set_target_properties(${cython_module} PROPERTIES PREFIX "")
-    target_link_libraries(${cython_module} rmm::rmm)
-
-    # Compute the install directory relative to the source and rely on installs being relative to
-    # the CMAKE_PREFIX_PATH for e.g. editable installs.
-    cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR BASE_DIRECTORY ${rmm-python_SOURCE_DIR}
-               OUTPUT_VARIABLE install_dst)
-    install(TARGETS ${cython_module} DESTINATION ${install_dst})
-  endforeach(cython_module ${cython_sources})
-endfunction()
diff --git a/python/cmake/skbuild_patches.cmake b/python/cmake/skbuild_patches.cmake
deleted file mode 100644
index 6302e9e2f..000000000
--- a/python/cmake/skbuild_patches.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# =============================================================================
-# Copyright (c) 2022, NVIDIA CORPORATION.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
-# =============================================================================
-
-#[=======================================================================[.rst:
-_set_python_extension_symbol_visibility
----------------------------------------
-
-The original version of this function in scikit-build runs a linker script to
-modify the visibility of symbols. This version is a patch to avoid overwriting
-the visibility of symbols because RMM specifically overrides some symbol
-visibility in order to share certain functional-local static variables.
-
-#]=======================================================================]
-# TODO: Should we guard this based on a scikit-build version? Override this function to avoid
-# scikit-build clobbering symbol visibility.
-function(_set_python_extension_symbol_visibility _target)
-  if(PYTHON_VERSION_MAJOR VERSION_GREATER 2)
-    set(_modinit_prefix "PyInit_")
-  else()
-    set(_modinit_prefix "init")
-  endif()
-  message("_modinit_prefix:${_modinit_prefix}")
-  if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
-    set_target_properties(${_target} PROPERTIES LINK_FLAGS "/EXPORT:${_modinit_prefix}${_target}")
-  elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(_script_path ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${_target}-version-script.map)
-    file(
-      WRITE ${_script_path}
-      # Note: The change is to this script, which does not indiscriminately mark all non PyInit
-      # symbols as local.
-      "{global: ${_modinit_prefix}${_target}; };")
-    set_property(
-      TARGET ${_target}
-      APPEND_STRING
-      PROPERTY LINK_FLAGS " -Wl,--version-script=\"${_script_path}\"")
-  endif()
-endfunction()

From 6c3f9015fd3dd0d0cd1c5f28d5a08ee30b525043 Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Wed, 4 May 2022 15:22:46 -0700
Subject: [PATCH 03/14] Remove inaccurate TODO, discovery is configurable using
 standard CMake variables.

---
 python/CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 6868e8159..7bd9c8fa1 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -39,9 +39,7 @@ project(
 option(FIND_RMM_CPP "Search for existing RMM C++ installations before defaulting to local files"
        OFF)
 
-# If the user requested it we attempt to find RMM. TODO: Should we allow the user to specify a path
-# instead of just searching? This version assumes that the installation has been appropriately
-# configured for CMake discovery.
+# If the user requested it we attempt to find RMM.
 if(FIND_RMM_CPP)
   find_package(RMM ${rmm_version})
 else()

From 62feb05324594aa630840caa5011190cae16d3de Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Wed, 4 May 2022 15:36:41 -0700
Subject: [PATCH 04/14] Update RAPIDS.cmake link.

---
 python/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 7bd9c8fa1..9214d6d60 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -16,8 +16,7 @@ cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)
 
 set(rmm_version 22.06.00)
 
-# TODO: This link needs to be changed back to the mainline branch of rapids-cmake before the PR is merged.
-file(DOWNLOAD https://raw.githubusercontent.com/vyasr/rapids-cmake/cf54c7d6e215c1188e1b9eb660565bdf42b83b64/RAPIDS.cmake
+file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.06/RAPIDS.cmake
         ${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 

From a2351e22624e3a694079519581895a90206fc242 Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Wed, 4 May 2022 15:53:36 -0700
Subject: [PATCH 05/14] Fix style.

---
 python/CMakeLists.txt           | 2 +-
 python/rmm/_cuda/CMakeLists.txt | 6 ++----
 python/rmm/_lib/CMakeLists.txt  | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 9214d6d60..0108ac505 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)
 set(rmm_version 22.06.00)
 
 file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.06/RAPIDS.cmake
-        ${CMAKE_BINARY_DIR}/RAPIDS.cmake)
+     ${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 
 project(
diff --git a/python/rmm/_cuda/CMakeLists.txt b/python/rmm/_cuda/CMakeLists.txt
index ab84b791c..00d140436 100644
--- a/python/rmm/_cuda/CMakeLists.txt
+++ b/python/rmm/_cuda/CMakeLists.txt
@@ -15,7 +15,5 @@
 set(cython_sources stream.pyx)
 set(linked_libraries rmm::rmm)
 
-rapids_cython_create_modules(
-    SOURCE_FILES "${cython_sources}"
-    LINKED_LIBRARIES "${linked_libraries}"
-    CXX)
+rapids_cython_create_modules(SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES
+                             "${linked_libraries}" CXX)
diff --git a/python/rmm/_lib/CMakeLists.txt b/python/rmm/_lib/CMakeLists.txt
index 435cc00fa..5eed7b603 100644
--- a/python/rmm/_lib/CMakeLists.txt
+++ b/python/rmm/_lib/CMakeLists.txt
@@ -16,7 +16,5 @@ set(cython_sources device_buffer.pyx lib.pyx memory_resource.pyx cuda_stream.pyx
 set(linked_libraries rmm::rmm)
 
 # Build all of the Cython targets
-rapids_cython_create_modules(
-    SOURCE_FILES "${cython_sources}"
-    LINKED_LIBRARIES "${linked_libraries}"
-    CXX)
+rapids_cython_create_modules(SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES
+                             "${linked_libraries}" CXX)

From 0e04fa991449e083f92da5dc1110ecf993ba5e0c Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Wed, 4 May 2022 16:18:54 -0700
Subject: [PATCH 06/14] Remove cython from install_requires.

---
 python/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/setup.py b/python/setup.py
index 106a22f90..7cbc92638 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -34,6 +34,6 @@
         )
     },
     cmdclass=versioneer.get_cmdclass(),
-    install_requires=["numba", "cython", "cuda-python"],
+    install_requires=["numba", "cuda-python"],
     zip_safe=False,
 )

From 7f392b2f31c9337b1f45d891bcc4f1d80de904ac Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Thu, 5 May 2022 17:53:55 -0700
Subject: [PATCH 07/14] Apply cmake-format.

---
 python/rmm/_cuda/CMakeLists.txt | 4 ++--
 python/rmm/_lib/CMakeLists.txt  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/rmm/_cuda/CMakeLists.txt b/python/rmm/_cuda/CMakeLists.txt
index 00d140436..1f17b0d2c 100644
--- a/python/rmm/_cuda/CMakeLists.txt
+++ b/python/rmm/_cuda/CMakeLists.txt
@@ -15,5 +15,5 @@
 set(cython_sources stream.pyx)
 set(linked_libraries rmm::rmm)
 
-rapids_cython_create_modules(SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES
-                             "${linked_libraries}" CXX)
+rapids_cython_create_modules(SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}"
+                                                                               CXX)
diff --git a/python/rmm/_lib/CMakeLists.txt b/python/rmm/_lib/CMakeLists.txt
index 5eed7b603..44f4513b2 100644
--- a/python/rmm/_lib/CMakeLists.txt
+++ b/python/rmm/_lib/CMakeLists.txt
@@ -16,5 +16,5 @@ set(cython_sources device_buffer.pyx lib.pyx memory_resource.pyx cuda_stream.pyx
 set(linked_libraries rmm::rmm)
 
 # Build all of the Cython targets
-rapids_cython_create_modules(SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES
-                             "${linked_libraries}" CXX)
+rapids_cython_create_modules(SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}"
+                                                                               CXX)

From 4883df247bffb5e42b85d921e60c9e9e1115d4e0 Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Fri, 6 May 2022 15:32:43 -0700
Subject: [PATCH 08/14] Change find_package name to lowercase rmm.

---
 python/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 0108ac505..f892ddd49 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -40,7 +40,7 @@ option(FIND_RMM_CPP "Search for existing RMM C++ installations before defaulting
 
 # If the user requested it we attempt to find RMM.
 if(FIND_RMM_CPP)
-  find_package(RMM ${rmm_version})
+  find_package(rmm ${rmm_version})
 else()
   set(RMM_FOUND OFF)
 endif()

From e1af8309dd4f3e3a65238c2d8a28fca831d41f3b Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Fri, 6 May 2022 15:34:05 -0700
Subject: [PATCH 09/14] Fix case of rmm_FOUND.

---
 python/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index f892ddd49..c8d0659d5 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -42,10 +42,10 @@ option(FIND_RMM_CPP "Search for existing RMM C++ installations before defaulting
 if(FIND_RMM_CPP)
   find_package(rmm ${rmm_version})
 else()
-  set(RMM_FOUND OFF)
+  set(rmm_FOUND OFF)
 endif()
 
-if(NOT RMM_FOUND)
+if(NOT rmm_FOUND)
   set(BUILD_TESTS OFF)
   set(BUILD_BENCHMARKS OFF)
   add_subdirectory(../ rmm-cpp)

From f4345223b495be090efb8513a11aaa8149d678b1 Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Fri, 6 May 2022 17:23:31 -0700
Subject: [PATCH 10/14] update-version.sh needs to also update the rapids-cmake
 download.

---
 ci/release/update-version.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index fcc52922f..d6a834633 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -32,6 +32,7 @@ function sed_runner() {
 sed_runner 's/'"  VERSION .*"'/'"  VERSION ${NEXT_FULL_TAG}"'/g' CMakeLists.txt
 sed_runner 's/'"rmm_version .*)"'/'"rmm_version ${NEXT_FULL_TAG})"'/g' python/CMakeLists.txt
 sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' CMakeLists.txt
+sed_runner 's/'"rmm_version .*)"'/'"rmm_version ${NEXT_FULL_TAG})"'/g' python/CMakeLists.txt
 
 sed_runner 's/'"PROJECT_NUMBER         = .*"'/'"PROJECT_NUMBER         = ${NEXT_SHORT_TAG}"'/g' doxygen/Doxyfile
 

From f2e53ffdedaef73df71ce6420e3fb6d866d24d0a Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Fri, 6 May 2022 17:24:02 -0700
Subject: [PATCH 11/14] Add newline for readability.

---
 python/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index c8d0659d5..9ce30c5a6 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -53,5 +53,6 @@ endif()
 
 include(rapids-cython)
 rapids_cython_init()
+
 add_subdirectory(rmm/_cuda)
 add_subdirectory(rmm/_lib)

From c8c9a4e0f5270285b6189ac4488b75cb7793714e Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Fri, 6 May 2022 17:25:05 -0700
Subject: [PATCH 12/14] Fix regex.

---
 ci/release/update-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index d6a834633..01450d8bf 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -32,7 +32,7 @@ function sed_runner() {
 sed_runner 's/'"  VERSION .*"'/'"  VERSION ${NEXT_FULL_TAG}"'/g' CMakeLists.txt
 sed_runner 's/'"rmm_version .*)"'/'"rmm_version ${NEXT_FULL_TAG})"'/g' python/CMakeLists.txt
 sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' CMakeLists.txt
-sed_runner 's/'"rmm_version .*)"'/'"rmm_version ${NEXT_FULL_TAG})"'/g' python/CMakeLists.txt
+sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' python/CMakeLists.txt
 
 sed_runner 's/'"PROJECT_NUMBER         = .*"'/'"PROJECT_NUMBER         = ${NEXT_SHORT_TAG}"'/g' doxygen/Doxyfile
 

From 89076029c6d968cacf30cb66d028d514d3b80008 Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Fri, 6 May 2022 22:33:42 -0700
Subject: [PATCH 13/14] Only enable CUDA conditionally when building the CPP
 library.

---
 python/CMakeLists.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 9ce30c5a6..09fb9f566 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -28,12 +28,7 @@ project(
             # 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
-            # TODO: The C++ RMM CMake configuration targets cuda_std_17 features, which prior to
-            # CMake 3.22 will also pull in the corresponding required languages even if this project
-            # does not actually require those languages. As a result, we need to include CUDA here.
-            # We can remove CUDA once we upgrade the minimum required CMake version to 3.22.
-            CUDA)
+            CXX)
 
 option(FIND_RMM_CPP "Search for existing RMM C++ installations before defaulting to local files"
        OFF)
@@ -46,6 +41,10 @@ else()
 endif()
 
 if(NOT rmm_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.
+  enable_language(CUDA)
   set(BUILD_TESTS OFF)
   set(BUILD_BENCHMARKS OFF)
   add_subdirectory(../ rmm-cpp)

From 502f68ac2dd9d06410e3d5087b16c3a6371b3b08 Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyas.ramasubramani@gmail.com>
Date: Fri, 6 May 2022 23:44:25 -0700
Subject: [PATCH 14/14] cmake-format.

---
 python/CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 09fb9f566..8caafd917 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -27,8 +27,7 @@ project(
             # 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)
 
 option(FIND_RMM_CPP "Search for existing RMM C++ installations before defaulting to local files"
        OFF)
@@ -41,9 +40,8 @@ else()
 endif()
 
 if(NOT rmm_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.
+  # 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.
   enable_language(CUDA)
   set(BUILD_TESTS OFF)
   set(BUILD_BENCHMARKS OFF)