Patch cuDF Arrow device StringView import (#4)

Signed-off-by: Alexander Droste <alexander.droste@protonmail.com>

Author: 0ax1

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Build and Release
+name: Build
 
 on:
   pull_request:
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    name: Build and Release
+    name: Build
     runs-on: runs-on=${{ github.run_id }}/runner=gpu/tag=cudf-test-harness
     container:
       image: nvidia/cuda:13.1.0-devel-ubuntu24.04

CMakeLists.txt

@@ -17,6 +17,7 @@ set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0")
 
 include(FetchContent)
 find_package(CUDAToolkit REQUIRED)
+find_package(Git REQUIRED)
 
 if(CUDAToolkit_VERSION VERSION_LESS 13.0)
   message(FATAL_ERROR "cuDF 26.04.00 source builds require CUDA Toolkit 13.0 or newer")
@@ -37,6 +38,14 @@ FetchContent_Declare(
   GIT_REPOSITORY https://github.com/rapidsai/cudf.git
   GIT_TAG f9c3cf195768647ac39d98674a614ca414cd1baa
   SOURCE_SUBDIR cpp
+  # Temporary until cuDF imports external Arrow C Device STRING_VIEW arrays without
+  # assuming Nanoarrow-owned ArrowArray.private_data. Vortex exports producer-owned
+  # private_data, which is valid Arrow C data.
+  PATCH_COMMAND ${CMAKE_COMMAND}
+    -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
+    -DSOURCE_DIR=<SOURCE_DIR>
+    -DPATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/patches/cudf-arrow-device-string-view-variadic-buffers.patch
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/apply_patch_once.cmake
 )
 FetchContent_MakeAvailable(cudf)
 

cmake/apply_patch_once.cmake

@@ -0,0 +1,45 @@
+if(NOT DEFINED GIT_EXECUTABLE)
+  message(FATAL_ERROR "GIT_EXECUTABLE is required")
+endif()
+if(NOT DEFINED SOURCE_DIR)
+  message(FATAL_ERROR "SOURCE_DIR is required")
+endif()
+if(NOT DEFINED PATCH_FILE)
+  message(FATAL_ERROR "PATCH_FILE is required")
+endif()
+
+execute_process(
+  COMMAND "${GIT_EXECUTABLE}" -C "${SOURCE_DIR}" apply --reverse --check "${PATCH_FILE}"
+  RESULT_VARIABLE PATCH_ALREADY_APPLIED
+  OUTPUT_QUIET
+  ERROR_QUIET
+)
+
+if(PATCH_ALREADY_APPLIED EQUAL 0)
+  message(STATUS "Patch already applied: ${PATCH_FILE}")
+  return()
+endif()
+
+execute_process(
+  COMMAND "${GIT_EXECUTABLE}" -C "${SOURCE_DIR}" apply --check "${PATCH_FILE}"
+  RESULT_VARIABLE PATCH_CAN_APPLY
+  OUTPUT_VARIABLE PATCH_CHECK_OUTPUT
+  ERROR_VARIABLE PATCH_CHECK_ERROR
+)
+
+if(NOT PATCH_CAN_APPLY EQUAL 0)
+  message(FATAL_ERROR "Patch cannot be applied: ${PATCH_FILE}\n${PATCH_CHECK_OUTPUT}\n${PATCH_CHECK_ERROR}")
+endif()
+
+execute_process(
+  COMMAND "${GIT_EXECUTABLE}" -C "${SOURCE_DIR}" apply --whitespace=nowarn "${PATCH_FILE}"
+  RESULT_VARIABLE PATCH_APPLY_RESULT
+  OUTPUT_VARIABLE PATCH_APPLY_OUTPUT
+  ERROR_VARIABLE PATCH_APPLY_ERROR
+)
+
+if(NOT PATCH_APPLY_RESULT EQUAL 0)
+  message(FATAL_ERROR "Patch failed: ${PATCH_FILE}\n${PATCH_APPLY_OUTPUT}\n${PATCH_APPLY_ERROR}")
+endif()
+
+message(STATUS "Applied patch: ${PATCH_FILE}")

patches/cudf-arrow-device-string-view-variadic-buffers.patch

@@ -0,0 +1,15 @@
+diff --git a/cpp/src/interop/from_arrow_device.cu b/cpp/src/interop/from_arrow_device.cu
+index c2f45af218..1c02352558 100644
+--- a/cpp/src/interop/from_arrow_device.cu
++++ b/cpp/src/interop/from_arrow_device.cu
+@@ -176,9 +176,7 @@ dispatch_tuple_t dispatch_from_arrow_device::operator()<cudf::string_view>(
+     auto const d_items = view.buffer_views[binary_view_vector_idx].data.as_binary_view;
+     auto variadic_ptrs = std::vector<char const*>();
+     for (auto i = 0L; i < view.n_variadic_buffers; ++i) {
+-      auto variadic_buf =
+-        ArrowArrayBuffer(const_cast<ArrowArray*>(input), i + NANOARROW_BINARY_VIEW_FIXED_BUFFERS);
+-      variadic_ptrs.push_back(reinterpret_cast<char const*>(variadic_buf->data));
++      variadic_ptrs.push_back(reinterpret_cast<char const*>(view.variadic_buffers[i]));
+     }
+     auto d_variadic_ptrs = cudf::detail::make_device_uvector_async(
+       variadic_ptrs, stream, cudf::get_current_device_resource_ref());

src/main.cpp

@@ -161,7 +161,14 @@ int run_check(const char *library_path) {
 
         // convert to host array, call the verifier inside of the shared library.
         auto host_array = cudf::to_arrow_host(*table);
-        if (validate_array(&schema, &host_array->array) != 0) {
+        auto host_metadata = std::vector<cudf::column_metadata>{
+                cudf::column_metadata{"prims"},
+                cudf::column_metadata{"decimals"},
+                cudf::column_metadata{"strings"},
+                cudf::column_metadata{"dates"},
+        };
+        auto host_schema = cudf::to_arrow_schema(*table, host_metadata);
+        if (validate_array(host_schema.get(), &host_array->array) != 0) {
             std::cerr << "\nValidation failed!\n";
         }
     } catch (const std::exception &e) {