Skip to content

Commit 1bfc114

Browse files
authored
Merge pull request #17395 from jakirkham/branch-25.02-merge-24.12
Forward-merge branch-24.12 into branch-25.02
2 parents e52df19 + c46e9e4 commit 1bfc114

File tree

7 files changed

+9
-1
lines changed

7 files changed

+9
-1
lines changed

ci/run_cudf_polars_polars_tests.sh

+3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ if [[ $(arch) == "aarch64" ]]; then
2828
DESELECTED_TESTS+=("tests/unit/operations/test_join.py::test_join_4_columns_with_validity")
2929
else
3030
# Ensure that we don't run dbgen when it uses newer symbols than supported by the glibc version in the CI image.
31+
# Allow errors since any of these commands could produce empty results that would cause the script to fail.
32+
set +e
3133
glibc_minor_version=$(ldd --version | head -1 | grep -o "[0-9]\.[0-9]\+" | tail -1 | cut -d '.' -f2)
3234
latest_glibc_symbol_found=$(nm py-polars/tests/benchmark/data/pdsh/dbgen/dbgen | grep GLIBC | grep -o "[0-9]\.[0-9]\+" | sort --version-sort | tail -1 | cut -d "." -f 2)
35+
set -e
3336
if [[ ${glibc_minor_version} -lt ${latest_glibc_symbol_found} ]]; then
3437
DESELECTED_TESTS+=("tests/benchmark/test_pdsh.py::test_pdsh")
3538
fi

conda/environments/all_cuda-118_arch-x86_64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ dependencies:
7171
- ptxcompiler
7272
- pyarrow>=14.0.0,<19.0.0a0
7373
- pydata-sphinx-theme!=0.14.2
74+
- pynvml>=11.4.1,<12.0.0a0
7475
- pytest-benchmark
7576
- pytest-cases>=3.8.2
7677
- pytest-cov

conda/environments/all_cuda-125_arch-x86_64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ dependencies:
6969
- pyarrow>=14.0.0,<19.0.0a0
7070
- pydata-sphinx-theme!=0.14.2
7171
- pynvjitlink>=0.0.0a0
72+
- pynvml>=11.4.1,<12.0.0a0
7273
- pytest-benchmark
7374
- pytest-cases>=3.8.2
7475
- pytest-cov

conda/recipes/dask-cudf/meta.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ requirements:
4343
run:
4444
- python
4545
- cudf ={{ version }}
46+
- pynvml >=11.4.1,<12.0.0a0
4647
- rapids-dask-dependency ={{ minor_version }}
4748
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
4849

dependencies.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,7 @@ dependencies:
758758
common:
759759
- output_types: [conda, requirements, pyproject]
760760
packages:
761+
- pynvml>=11.4.1,<12.0.0a0
761762
- rapids-dask-dependency==25.2.*,>=0.0.0a0
762763
run_custreamz:
763764
common:

python/dask_cudf/dask_cudf/io/parquet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def _get_device_size():
5555
handle = pynvml.nvmlDeviceGetHandleByIndex(int(index))
5656
return pynvml.nvmlDeviceGetMemoryInfo(handle).total
5757

58-
except (ImportError, ValueError):
58+
except ValueError:
5959
# Fall back to a conservative 8GiB default
6060
return 8 * 1024**3
6161

python/dask_cudf/pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies = [
2424
"fsspec>=0.6.0",
2525
"numpy>=1.23,<3.0a0",
2626
"pandas>=2.0,<2.2.4dev0",
27+
"pynvml>=11.4.1,<12.0.0a0",
2728
"rapids-dask-dependency==25.2.*,>=0.0.0a0",
2829
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
2930
classifiers = [

0 commit comments

Comments
 (0)