Remove patch for 64-bit dispatching.

bdice · Nov 13, 2024 · ce7e991 · ce7e991
1 parent 732040f
commit ce7e991
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 64 deletions.
diff --git a/cpp/cmake/thirdparty/get_cccl.cmake b/cpp/cmake/thirdparty/get_cccl.cmake
@@ -34,6 +34,9 @@ function(find_and_configure_cccl)
   )
 
   # Find or install CCCL with our custom set of patches
+  # TODO: Does this work correctly? Is there a better way to set this? Should
+  # CCCL be setting THRUST_DISPATCH_TYPE with "FORCE"?
+  set(THRUST_DISPATCH_TYPE "Force32bit" STRING "Thrust offset type dispatch")
   rapids_cpm_cccl(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports)
 
 endfunction()

diff --git a/cpp/cmake/thirdparty/patches/cccl_override.json b/cpp/cmake/thirdparty/patches/cccl_override.json
@@ -3,11 +3,6 @@
   "packages" : {
     "CCCL" : {
       "patches" : [
-        {
-          "file" : "${current_json_dir}/thrust_disable_64bit_dispatching.diff",
-          "issue" : "Remove 64bit dispatching as not needed by libcudf and results in compiling twice as many kernels [https://github.com/rapidsai/cudf/pull/11437]",
-          "fixed_in" : ""
-        },
         {
           "file" : "${current_json_dir}/thrust_faster_sort_compile_times.diff",
           "issue" : "Improve Thrust sort compile times by not unrolling loops for inlined comparators [https://github.com/rapidsai/cudf/pull/10577]",

diff --git a/cpp/cmake/thirdparty/patches/thrust_disable_64bit_dispatching.diff b/cpp/cmake/thirdparty/patches/thrust_disable_64bit_dispatching.diff