Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to support cudf 2024.06 #6263

Merged
merged 1 commit into from
Jun 6, 2024
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: 6 additions & 1 deletion holoviews/core/data/cudf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import numpy as np
import pandas as pd
from pandas.api.types import is_numeric_dtype

from .. import util
from ..dimension import dimension_name
Expand Down Expand Up @@ -285,7 +286,11 @@ def aggregate(cls, dataset, dimensions, function, **kwargs):
grouped = reindexed.groupby(cols, sort=False)
if not hasattr(grouped, agg):
raise ValueError(f'{agg} aggregation is not supported on cudf DataFrame.')
df = getattr(grouped, agg)().reset_index()
numeric_cols = [
c for c, d in zip(reindexed.columns, reindexed.dtypes)
if is_numeric_dtype(d) and c not in cols
]
df = getattr(grouped[numeric_cols], agg)().reset_index()
philippjfr marked this conversation as resolved.
Show resolved Hide resolved
else:
agg_map = {'amin': 'min', 'amax': 'max', 'size': 'count'}
agg = agg_map.get(agg, agg)
Expand Down
3 changes: 2 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,10 @@ NUMBA_CUDA_LOW_OCCUPANCY_WARNINGS = "0"

[feature.test-gpu.dependencies]
cuda-version = "12.2.*"
cudf = "24.04.*"
cudf = "24.06.*"
cupy = "*"
cuspatial = "*"
librmm = { version = "*", channel = "rapidsai" }
rmm = { version = "*", channel = "rapidsai" }

[feature.test-gpu.tasks]
Expand Down
Loading