From c1bcd962ff38b7eef126209d9a22b07abb1bb0ee Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Jul 2026 00:07:38 -0500 Subject: [PATCH] Revert "Update DLPack to 1.0 (#2354)" (#2366) This reverts commit 350a3b0ffd48eba860d48a7fb564bb9fe77580cb. This update introduced conflicts with cuDF, which is already in code freeze for 26.08. I have a proposal in https://github.com/rapidsai/build-planning/issues/308 to update to DLPack 1.x, which can occur in 26.10 or later because it is not an ABI breaking change (which was the original reason this targeted 26.08, because 26.08 is allowed to break ABI). Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Paul Taylor (https://github.com/trxcllnt) - Robert Maynard (https://github.com/robertmaynard) - James Lamb (https://github.com/jameslamb) URL: https://github.com/NVIDIA/cuvs/pull/2366 --- conda/environments/all_cuda-129_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-129_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-133_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-133_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-129_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-129_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-133_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-133_arch-x86_64.yaml | 2 +- conda/environments/go_cuda-129_arch-aarch64.yaml | 2 +- conda/environments/go_cuda-129_arch-x86_64.yaml | 2 +- conda/environments/go_cuda-133_arch-aarch64.yaml | 2 +- conda/environments/go_cuda-133_arch-x86_64.yaml | 2 +- cpp/cmake/thirdparty/get_dlpack.cmake | 2 +- dependencies.yaml | 4 ++-- examples/cmake/thirdparty/get_dlpack.cmake | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index c02eee06c7..5ac1fc363a 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -19,7 +19,7 @@ dependencies: - cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-aarch64=14.* - go - libclang==20.1.8 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 888b8cab73..55ae0a47de 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -19,7 +19,7 @@ dependencies: - cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-64=14.* - go - libclang==20.1.8 diff --git a/conda/environments/all_cuda-133_arch-aarch64.yaml b/conda/environments/all_cuda-133_arch-aarch64.yaml index 210b078ec5..b22f353fce 100644 --- a/conda/environments/all_cuda-133_arch-aarch64.yaml +++ b/conda/environments/all_cuda-133_arch-aarch64.yaml @@ -19,7 +19,7 @@ dependencies: - cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-aarch64=14.* - go - libclang==20.1.8 diff --git a/conda/environments/all_cuda-133_arch-x86_64.yaml b/conda/environments/all_cuda-133_arch-x86_64.yaml index 05fbd70f44..a17ac5e358 100644 --- a/conda/environments/all_cuda-133_arch-x86_64.yaml +++ b/conda/environments/all_cuda-133_arch-x86_64.yaml @@ -19,7 +19,7 @@ dependencies: - cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-64=14.* - go - libclang==20.1.8 diff --git a/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml index f9bc17d434..d495ad32ed 100644 --- a/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml @@ -20,7 +20,7 @@ dependencies: - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-aarch64=14.* - glog>=0.6.0 - h5py>=3.8.0 diff --git a/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml index faa76612dd..651a372dc1 100644 --- a/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml @@ -20,7 +20,7 @@ dependencies: - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-64=14.* - glog>=0.6.0 - h5py>=3.8.0 diff --git a/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml index b196d54e35..05b0429254 100644 --- a/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml @@ -20,7 +20,7 @@ dependencies: - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-aarch64=14.* - glog>=0.6.0 - h5py>=3.8.0 diff --git a/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml index b3cff75235..398c612088 100644 --- a/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml @@ -20,7 +20,7 @@ dependencies: - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-64=14.* - glog>=0.6.0 - h5py>=3.8.0 diff --git a/conda/environments/go_cuda-129_arch-aarch64.yaml b/conda/environments/go_cuda-129_arch-aarch64.yaml index 5a5d59d8f1..eb6ae9f5f7 100644 --- a/conda/environments/go_cuda-129_arch-aarch64.yaml +++ b/conda/environments/go_cuda-129_arch-aarch64.yaml @@ -17,7 +17,7 @@ dependencies: - cuda-profiler-api - cuda-version=12.9 - cxx-compiler -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-aarch64=14.* - go - libclang==20.1.8 diff --git a/conda/environments/go_cuda-129_arch-x86_64.yaml b/conda/environments/go_cuda-129_arch-x86_64.yaml index 0835c2aaa5..e99615ab2c 100644 --- a/conda/environments/go_cuda-129_arch-x86_64.yaml +++ b/conda/environments/go_cuda-129_arch-x86_64.yaml @@ -17,7 +17,7 @@ dependencies: - cuda-profiler-api - cuda-version=12.9 - cxx-compiler -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-64=14.* - go - libclang==20.1.8 diff --git a/conda/environments/go_cuda-133_arch-aarch64.yaml b/conda/environments/go_cuda-133_arch-aarch64.yaml index caab41e675..eeb5511537 100644 --- a/conda/environments/go_cuda-133_arch-aarch64.yaml +++ b/conda/environments/go_cuda-133_arch-aarch64.yaml @@ -17,7 +17,7 @@ dependencies: - cuda-profiler-api - cuda-version=13.3 - cxx-compiler -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-aarch64=14.* - go - libclang==20.1.8 diff --git a/conda/environments/go_cuda-133_arch-x86_64.yaml b/conda/environments/go_cuda-133_arch-x86_64.yaml index bc96704f08..5fd2153ffa 100644 --- a/conda/environments/go_cuda-133_arch-x86_64.yaml +++ b/conda/environments/go_cuda-133_arch-x86_64.yaml @@ -17,7 +17,7 @@ dependencies: - cuda-profiler-api - cuda-version=13.3 - cxx-compiler -- dlpack>=1.0,<1.1 +- dlpack>=0.8,<1.0 - gcc_linux-64=14.* - go - libclang==20.1.8 diff --git a/cpp/cmake/thirdparty/get_dlpack.cmake b/cpp/cmake/thirdparty/get_dlpack.cmake index c46171bdf3..df00968288 100644 --- a/cpp/cmake/thirdparty/get_dlpack.cmake +++ b/cpp/cmake/thirdparty/get_dlpack.cmake @@ -29,6 +29,6 @@ function(find_and_configure_dlpack VERSION) endif() endfunction() -set(CUVS_MIN_VERSION_dlpack 1.0) +set(CUVS_MIN_VERSION_dlpack 0.8) find_and_configure_dlpack(${CUVS_MIN_VERSION_dlpack}) diff --git a/dependencies.yaml b/dependencies.yaml index d5ba9f117f..8faea8d8ed 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -287,7 +287,7 @@ dependencies: common: - output_types: [conda] packages: - - dlpack>=1.0,<1.1 + - dlpack>=0.8,<1.0 checks: common: - output_types: [conda, requirements] @@ -513,7 +513,7 @@ dependencies: packages: - go - _go_select *=cgo - - dlpack>=1.0,<1.1 + - dlpack>=0.8,<1.0 build_wheels: common: - output_types: [requirements, pyproject] diff --git a/examples/cmake/thirdparty/get_dlpack.cmake b/examples/cmake/thirdparty/get_dlpack.cmake index c46171bdf3..df00968288 100644 --- a/examples/cmake/thirdparty/get_dlpack.cmake +++ b/examples/cmake/thirdparty/get_dlpack.cmake @@ -29,6 +29,6 @@ function(find_and_configure_dlpack VERSION) endif() endfunction() -set(CUVS_MIN_VERSION_dlpack 1.0) +set(CUVS_MIN_VERSION_dlpack 0.8) find_and_configure_dlpack(${CUVS_MIN_VERSION_dlpack})