upgrade dlpack to 0.5

conda/environments/cudf_dev_cuda11.0.yml

@@ -44,7 +44,7 @@ dependencies:
   - dask==2021.4.0
   - distributed>=2.22.0,<=2021.4.0
   - streamz
-  - dlpack
+  - dlpack>=0.5,<0.6.0a0
   - arrow-cpp=1.0.1
   - arrow-cpp-proc * cuda
   - double-conversion

conda/environments/cudf_dev_cuda11.2.yml

@@ -44,7 +44,7 @@ dependencies:
   - dask==2021.4.0
   - distributed>=2.22.0,<=2021.4.0
   - streamz
-  - dlpack
+  - dlpack>=0.5,<0.6.0a0
   - arrow-cpp=1.0.1
   - arrow-cpp-proc * cuda
   - double-conversion

conda/recipes/cudf/meta.yaml

@@ -26,7 +26,7 @@ requirements:
     - cython >=0.29,<0.30
     - setuptools
     - numba >=0.53.1
-    - dlpack
+    - dlpack>=0.5,<0.6.0a0
     - pyarrow 1.0.1
     - libcudf {{ version }}
     - rmm {{ minor_version }}

conda/recipes/libcudf/meta.yaml

@@ -39,7 +39,7 @@ requirements:
     - cudatoolkit {{ cuda_version }}.*
     - arrow-cpp 1.0.1
     - arrow-cpp-proc * cuda
-    - dlpack
+    - dlpack>=0.5,<0.6.0a0
   run:
     - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
     - arrow-cpp-proc * cuda

cpp/cmake/thirdparty/CUDF_GetDLPack.cmake

@@ -36,6 +36,6 @@ function(find_and_configure_dlpack VERSION)
     set(DLPACK_INCLUDE_DIR "${dlpack_SOURCE_DIR}/include" PARENT_SCOPE)
 endfunction()
 
-set(CUDF_MIN_VERSION_dlpack 0.3)
+set(CUDF_MIN_VERSION_dlpack 0.5)
 
 find_and_configure_dlpack(${CUDF_MIN_VERSION_dlpack})

cpp/src/interop/dlpack.cpp

@@ -137,15 +137,15 @@ std::unique_ptr<table> from_dlpack(DLManagedTensor const* managed_tensor,
   auto const& tensor = managed_tensor->dl_tensor;
 
   // We can copy from host or device pointers
-  CUDF_EXPECTS(kDLGPU == tensor.ctx.device_type || kDLCPU == tensor.ctx.device_type ||
-                 kDLCPUPinned == tensor.ctx.device_type,
-               "DLTensor must be GPU, CPU, or pinned type");
+  CUDF_EXPECTS(tensor.device.device_type == kDLCPU || tensor.device.device_type == kDLCUDA ||
+                 tensor.device.device_type == kDLCUDAHost,
+               "DLTensor device type must be CPU, CUDA or CUDAHost");
 
   // Make sure the current device ID matches the Tensor's device ID
-  if (tensor.ctx.device_type != kDLCPU) {
+  if (tensor.device.device_type != kDLCPU) {
     int device_id = 0;
     CUDA_TRY(cudaGetDevice(&device_id));
-    CUDF_EXPECTS(tensor.ctx.device_id == device_id, "DLTensor device ID must be current device");
+    CUDF_EXPECTS(tensor.device.device_id == device_id, "DLTensor device ID must be current device");
   }
 
   // Currently only 1D and 2D tensors are supported
@@ -234,8 +234,8 @@ DLManagedTensor* to_dlpack(table_view const& input,
     tensor.strides[1] = num_rows;
   }
 
-  CUDA_TRY(cudaGetDevice(&tensor.ctx.device_id));
-  tensor.ctx.device_type = kDLGPU;
+  CUDA_TRY(cudaGetDevice(&tensor.device.device_id));
+  tensor.device.device_type = kDLCUDA;
 
   // If there is only one column, then a 1D tensor can just copy the pointer
   // to the data in the column, and the deleter should not delete the original

cpp/tests/CMakeLists.txt

@@ -330,7 +330,7 @@ ConfigureTest(STRINGS_TEST
     strings/chars_types_tests.cpp
     strings/combine/concatenate_list_elements_tests.cpp
     strings/combine/concatenate_tests.cpp
-    strings/combine/join_strings_tests
+    strings/combine/join_strings_tests.cpp
     strings/concatenate_tests.cpp
     strings/contains_tests.cpp
     strings/datetime_tests.cpp