Remove CCCL patch for PR 211. (#640)

While upgrading CCCL, we ran into a test failure in cuSpatial. We added a patch to revert some changes from CCCL but the root cause was a bug in cuSpatial. I have fixed that bug here: rapidsai/cuspatial#1402

Once that PR is merged, we can remove this CCCL patch.

See also:
- #511
- NVIDIA/cccl#1939

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Robert Maynard (https://github.com/robertmaynard)

URL: #640

rapids-cmake/cpm/versions.json

@@ -9,14 +9,7 @@
       "version": "2.5.0",
       "git_shallow": false,
       "git_url": "https://github.com/NVIDIA/cccl.git",
-      "git_tag": "e21d607157218540cd7c45461213fb96adf720b7",
-      "patches": [
-        {
-          "file": "cccl/revert_pr_211.diff",
-          "issue": "thrust::copy introduced a change in behavior that causes failures with cudaErrorInvalidValue.",
-          "fixed_in": ""
-        }
-      ]
+      "git_tag": "e21d607157218540cd7c45461213fb96adf720b7"
     },
     "cuco": {
       "version": "0.0.1",

testing/cpm/cpm_find-patch-command/CMakeLists.txt

@@ -32,19 +32,33 @@ set(cccl_dir "${deps_dir}/cccl")
 list(APPEND CMAKE_PREFIX_PATH "${cccl_dir}")
 
 include(${rapids-cmake-dir}/cpm/init.cmake)
-include(${rapids-cmake-dir}/cpm/cccl.cmake)
 rapids_cpm_init()
+
+include(${rapids-cmake-dir}/cpm/package_override.cmake)
+rapids_cpm_package_override(${CMAKE_CURRENT_SOURCE_DIR}/override.json)
+
+include(${rapids-cmake-dir}/cpm/cccl.cmake)
 rapids_cpm_cccl()
 
 if(NOT "${CCCL_ADDED}")
     message(FATAL_ERROR "The found repo was used rather than downloading and patching a new version")
 endif()
 
+# Verify that the two files that we inserted into the CCCL source tree exist
+# Which proves the patches in the override are properly applied
+if(NOT EXISTS "${CCCL_SOURCE_DIR}/git_file_1.txt")
+  message(FATAL_ERROR "failed to apply CCCL first patch")
+endif()
+
+if(NOT EXISTS "${CCCL_SOURCE_DIR}/git_file_2.txt")
+  message(FATAL_ERROR "failed to apply CCCL second patch")
+endif()
+
 execute_process(
-    COMMAND ${GIT_EXECUTABLE} diff-files --quiet
-    RESULT_VARIABLE REPO_IS_DIRTY
+    COMMAND ${GIT_EXECUTABLE} diff --quiet ${tag}
+    RESULT_VARIABLE REPO_IS_PATCHED
     WORKING_DIRECTORY "${CCCL_SOURCE_DIR}")
 
-if(NOT ${REPO_IS_DIRTY})
+if(NOT ${REPO_IS_PATCHED})
     message(FATAL_ERROR "The repo was downloaded to ${CCCL_SOURCE_DIR} but not patched.")
 endif()

testing/cpm/cpm_find-patch-command/override.json

@@ -0,0 +1,18 @@
+{
+  "packages": {
+    "CCCL": {
+      "patches": [
+        {
+          "file": "${current_json_dir}/patches/0001-move-git-sha1.patch",
+          "issue": "Move git sha1",
+          "fixed_in": ""
+        },
+        {
+          "file": "${current_json_dir}/patches/0002-move-git-sha1-a-second-time.patch",
+          "issue": "Move git sha1 a second time",
+          "fixed_in": ""
+        }
+      ]
+    }
+  }
+}

testing/cpm/cpm_find-patch-command/patches/0001-move-git-sha1.patch

@@ -0,0 +1,19 @@
+From deacd3fafd7fcfee954ae3044ae3ab60d36a9f3a Mon Sep 17 00:00:00 2001
+From: Robert Maynard <[email protected]>
+Date: Wed, 31 Jan 2024 15:00:47 -0500
+Subject: [PATCH 1/2] Move GIT SHA1
+
+---
+ git_file_1.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git_file_1.txt
+
+diff --git a/git_file_1.txt b/git_file_1.txt
+new file mode 100644
+index 00000000..b242c360
+--- /dev/null
++++ b/git_file_1.txt
+@@ -0,0 +1 @@
++added file
+--
+2.43.0

testing/cpm/cpm_find-patch-command/patches/0002-move-git-sha1-a-second-time.patch

@@ -0,0 +1,19 @@
+From 3588e151030a30661b310a876f7cc450d6ca9201 Mon Sep 17 00:00:00 2001
+From: Robert Maynard <[email protected]>
+Date: Wed, 31 Jan 2024 15:01:21 -0500
+Subject: [PATCH 2/2] Move GIT SHA1 a second time
+
+---
+ git_file_2.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git_file_2.txt
+
+diff --git a/git_file_2.txt b/git_file_2.txt
+new file mode 100644
+index 00000000..fa240558
+--- /dev/null
++++ b/git_file_2.txt
+@@ -0,0 +1 @@
++added another file
+--
+2.43.0