Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- cuda-nvcc
- cuda-nvrtc-dev
- cuda-nvtx-dev
- cuda-python>=12.6.2,<13.0a0
- cuda-python>=12.9.1,<13.0a0
- cuda-sanitizer-api
- cuda-version=12.9
- cupy>=12.0.0
Expand Down Expand Up @@ -54,8 +54,8 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numba-cuda>=0.14.0,<0.15.0a0
- numba>=0.59.1,<0.62.0a0
- numba-cuda>=0.18.0,<0.19.0a0
- numba>=0.60.0,<0.62.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- nvidia-ml-py
Expand All @@ -69,7 +69,6 @@ dependencies:
- pre-commit
- pyarrow>=14.0.0,<20.0.0a0
- pydata-sphinx-theme>=0.15.4
- pynvjitlink>=0.0.0a0
- pynvml>=12.0.0,<13.0.0a0
- pytest
- pytest-benchmark
Expand Down
7 changes: 3 additions & 4 deletions conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- cuda-nvcc
- cuda-nvrtc-dev
- cuda-nvtx-dev
- cuda-python>=12.6.2,<13.0a0
- cuda-python>=12.9.1,<13.0a0
- cuda-sanitizer-api
- cuda-version=12.9
- cupy>=12.0.0
Expand Down Expand Up @@ -55,8 +55,8 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numba-cuda>=0.14.0,<0.15.0a0
- numba>=0.59.1,<0.62.0a0
- numba-cuda>=0.18.0,<0.19.0a0
- numba>=0.60.0,<0.62.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- nvidia-ml-py
Expand All @@ -70,7 +70,6 @@ dependencies:
- pre-commit
- pyarrow>=14.0.0,<20.0.0a0
- pydata-sphinx-theme>=0.15.4
- pynvjitlink>=0.0.0a0
- pynvml>=12.0.0,<13.0.0a0
- pytest
- pytest-benchmark
Expand Down
14 changes: 4 additions & 10 deletions conda/recipes/cudf/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ requirements:
- rapids-build-backend >=0.4.0,<0.5.0.dev0
- scikit-build-core >=0.10.0
- dlpack >=0.8,<1.0
- numba-cuda >=0.14.0,<0.15.0a0
- numba-cuda >=0.18.0,<0.19.0a0
- libcudf =${{ version }}
- pylibcudf =${{ version }}
- rmm =${{ minor_version }}
Expand All @@ -70,22 +70,16 @@ requirements:
- typing_extensions >=4.0.0
- pandas >=2.0,<2.4.0dev0
- cupy >=12.0.0
- numba-cuda >=0.14.0,<0.15.0a0
- numba >=0.59.1,<0.62.0a0
- numba-cuda >=0.18.0,<0.19.0a0
- numba >=0.60.0,<0.62.0a0
- numpy >=1.23,<3.0a0
- pyarrow>=14.0.0,<20.0.0a0
- libcudf =${{ version }}
- pylibcudf =${{ version }}
- ${{ pin_compatible("rmm", upper_bound="x.x") }}
- fsspec >=0.6.0
- cuda-cudart
# Needed by Numba for CUDA support
- cuda-nvcc-impl
# TODO: Add nvjitlink here
# xref: https://github.com/rapidsai/cudf/issues/12822
- cuda-nvrtc
- cuda-python >=12.6.2,<13.0a0
- pynvjitlink
- cuda-python >=12.9.1,<13.0a0
- if: linux and x86_64
then:
- libcufile
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/pylibcudf/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ requirements:
- libcudf =${{ version }}
- ${{ pin_compatible("rmm", upper_bound="x.x") }}
- fsspec >=0.6.0
- cuda-python >=12.6.2,<13.0a0
- cuda-python >=12.9.1,<13.0a0
- nvtx >=0.2.1
- packaging
ignore_run_exports:
Expand Down
39 changes: 19 additions & 20 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -486,9 +486,19 @@ dependencies:
- cython>=3.0.3
build_python_cudf:
common:
- output_types: [conda, requirements, pyproject]
- output_types: [conda]
packages:
- &numba_cuda numba-cuda>=0.14.0,<0.15.0a0
- &numba_cuda numba-cuda>=0.18.0,<0.19.0a0
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
packages:
- &numba_cuda_cu12 numba-cuda[cu12]>=0.18.0,<0.19.0a0
- matrix: # Fallback for no matrix
packages:
- *numba_cuda_cu12
pyarrow_run:
common:
- output_types: [conda]
Expand Down Expand Up @@ -646,14 +656,14 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages: &run_pylibcudf_packages_all_cu12
- cuda-python>=12.6.2,<13.0a0
- cuda-python>=12.9.1,<13.0a0
- {matrix: null, packages: *run_pylibcudf_packages_all_cu12}
run_cudf:
common:
- output_types: [conda, requirements, pyproject]
packages:
- cachetools
- &numba numba>=0.59.1,<0.62.0a0
- &numba numba>=0.60.0,<0.62.0a0
- nvtx>=0.2.1
- packaging
- rich
Expand All @@ -671,18 +681,13 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages: &run_cudf_packages_all_cu12
- cuda-python>=12.6.2,<13.0a0
- cuda-python>=12.9.1,<13.0a0
- {matrix: null, packages: *run_cudf_packages_all_cu12}
- output_types: conda
matrices:
- matrix: {cuda: "12.*"}
packages:
- &pynvjitlink_unsuffixed pynvjitlink>=0.0.0a0
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
packages:
- &numba_cuda_cu12 numba-cuda[cu12]>=0.14.0,<0.15.0a0
- *numba_cuda_cu12
- matrix: # Fallback for no matrix
packages:
- *numba_cuda_cu12
Expand All @@ -692,15 +697,9 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- pynvjitlink-cu12>=0.0.0a0
- nvidia-cuda-nvcc-cu12
- nvidia-cuda-nvrtc-cu12
- matrix:
cuda: "12.*"
cuda_suffixed: "false"
packages: &run_cudf_cu12_unsuffixed
- *pynvjitlink_unsuffixed
- {matrix: null, packages: *run_cudf_cu12_unsuffixed}
- {matrix: null, packages: []}
run_cudf_polars:
common:
- output_types: [conda, requirements, pyproject]
Expand Down Expand Up @@ -782,9 +781,9 @@ dependencies:
matrices:
- matrix: {dependencies: "oldest"}
packages:
- numba==0.59.1
- numba-cuda==0.14.0
- numba==0.60.0
- pandas==2.0.*
- numba-cuda==0.18.0
- matrix: {dependencies: "latest"}
packages:
- pandas==2.3.1
Expand Down
4 changes: 3 additions & 1 deletion python/cudf/cudf/core/udf/strings_lowering.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,9 @@ def decref_managed_udf_string(context, builder, sig, args):
context, builder, value=managed_ptr
)
fnty = ir.FunctionType(ir.VoidType(), [ir.PointerType(ir.IntType(8))])
fn = cgutils.get_or_insert_function(builder.module, fnty, "NRT_decref")
fn = cgutils.get_or_insert_function(
builder.module, fnty, "NRT_decref_managed_string"
)
builder.call(fn, (managed.meminfo,))

return
Expand Down
9 changes: 4 additions & 5 deletions python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@ license = { text = "Apache-2.0" }
requires-python = ">=3.10"
dependencies = [
"cachetools",
"cuda-python>=12.6.2,<13.0a0",
"cuda-python>=12.9.1,<13.0a0",
"cupy-cuda12x>=12.0.0",
"fsspec>=0.6.0",
"libcudf==25.10.*,>=0.0.0a0",
"numba-cuda[cu12]>=0.14.0,<0.15.0a0",
"numba>=0.59.1,<0.62.0a0",
"numba-cuda[cu12]>=0.18.0,<0.19.0a0",
"numba>=0.60.0,<0.62.0a0",
"numpy>=1.23,<3.0a0",
"nvtx>=0.2.1",
"packaging",
"pandas>=2.0,<2.4.0dev0",
"pyarrow>=14.0.0,<20.0.0a0,!=17.0.0; platform_machine=='aarch64'",
"pyarrow>=14.0.0,<20.0.0a0; platform_machine=='x86_64'",
"pylibcudf==25.10.*,>=0.0.0a0",
"pynvjitlink>=0.0.0a0",
"rich",
"rmm==25.10.*,>=0.0.0a0",
"typing_extensions>=4.0.0",
Expand Down Expand Up @@ -126,7 +125,7 @@ requires = [
"libcudf==25.10.*,>=0.0.0a0",
"librmm==25.10.*,>=0.0.0a0",
"ninja",
"numba-cuda>=0.14.0,<0.15.0a0",
"numba-cuda[cu12]>=0.18.0,<0.19.0a0",
"pylibcudf==25.10.*,>=0.0.0a0",
"rmm==25.10.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down
8 changes: 8 additions & 0 deletions python/cudf/udf_cpp/shim.cu
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ __device__ NRT_MemInfo* make_meminfo_for_new_udf_string(udf_string* udf_str)
}
}

// Special decref called only by python after transferring ownership of output strings
// Must reset dtor with one that is part of the current module
extern "C" __device__ void NRT_decref_managed_string(NRT_MemInfo* mi)
{
mi->dtor = udf_str_dtor;
NRT_decref(mi);
}

extern "C" __device__ int len(int* nb_retval, void const* str)
{
auto sv = reinterpret_cast<cudf::string_view const*>(str);
Expand Down
2 changes: 1 addition & 1 deletion python/pylibcudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ authors = [
license = { text = "Apache-2.0" }
requires-python = ">=3.10"
dependencies = [
"cuda-python>=12.6.2,<13.0a0",
"cuda-python>=12.9.1,<13.0a0",
"libcudf==25.10.*,>=0.0.0a0",
"nvtx>=0.2.1",
"packaging",
Expand Down