Skip to content

Commit

Permalink
Merge branch 'branch-24.12' into fea/cudf-polars/report-all-unsupport…
Browse files Browse the repository at this point in the history
…ed-ops
  • Loading branch information
Matt711 authored Nov 7, 2024
2 parents 349309a + 57900de commit 588b21f
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 14 deletions.
1 change: 1 addition & 0 deletions ci/build_wheel_cudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export PIP_CONSTRAINT="/tmp/constraints.txt"
python -m auditwheel repair \
--exclude libcudf.so \
--exclude libnvcomp.so \
--exclude libkvikio.so \
-w ${package_dir}/final_dist \
${package_dir}/dist/*

Expand Down
1 change: 1 addition & 0 deletions ci/build_wheel_libcudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
mkdir -p ${package_dir}/final_dist
python -m auditwheel repair \
--exclude libnvcomp.so.4 \
--exclude libkvikio.so \
-w ${package_dir}/final_dist \
${package_dir}/dist/*

Expand Down
1 change: 1 addition & 0 deletions ci/build_wheel_pylibcudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export PIP_CONSTRAINT="/tmp/constraints.txt"
python -m auditwheel repair \
--exclude libcudf.so \
--exclude libnvcomp.so \
--exclude libkvikio.so \
-w ${package_dir}/final_dist \
${package_dir}/dist/*

Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
- cramjam
- cubinlinker
- cuda-nvtx=11.8
- cuda-python>=11.7.1,<12.0a0
- cuda-python>=11.7.1,<12.0a0,!=11.8.4
- cuda-sanitizer-api=11.8.86
- cuda-version=11.8
- cudatoolkit
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- cuda-nvcc
- cuda-nvrtc-dev
- cuda-nvtx-dev
- cuda-python>=12.0,<13.0a0
- cuda-python>=12.0,<13.0a0,!=12.6.1
- cuda-sanitizer-api
- cuda-version=12.5
- cupy>=12.0.0
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ requirements:
- cudatoolkit
- ptxcompiler >=0.7.0
- cubinlinker # CUDA enhanced compatibility.
- cuda-python >=11.7.1,<12.0a0
- cuda-python >=11.7.1,<12.0a0,!=11.8.4
{% else %}
- cuda-cudart
- libcufile # [linux64]
Expand All @@ -100,7 +100,7 @@ requirements:
# TODO: Add nvjitlink here
# xref: https://github.com/rapidsai/cudf/issues/12822
- cuda-nvrtc
- cuda-python >=12.0,<13.0a0
- cuda-python >=12.0,<13.0a0,!=12.6.1
- pynvjitlink
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/pylibcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ requirements:
- {{ pin_compatible('rmm', max_pin='x.x') }}
- fsspec >=0.6.0
{% if cuda_major == "11" %}
- cuda-python >=11.7.1,<12.0a0
- cuda-python >=11.7.1,<12.0a0,!=11.8.4
{% else %}
- cuda-python >=12.0,<13.0a0
- cuda-python >=12.0,<13.0a0,!=12.6.1
{% endif %}
- nvtx >=0.2.1
- packaging
Expand Down
9 changes: 5 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ files:
extras:
table: project
includes:
- depends_on_libkvikio
- depends_on_nvcomp
py_build_pylibcudf:
output: pyproject
Expand Down Expand Up @@ -658,10 +659,10 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages:
- cuda-python>=12.0,<13.0a0
- cuda-python>=12.0,<13.0a0,!=12.6.1
- matrix: {cuda: "11.*"}
packages: &run_pylibcudf_packages_all_cu11
- cuda-python>=11.7.1,<12.0a0
- cuda-python>=11.7.1,<12.0a0,!=11.8.4
- {matrix: null, packages: *run_pylibcudf_packages_all_cu11}
run_cudf:
common:
Expand All @@ -684,10 +685,10 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages:
- cuda-python>=12.0,<13.0a0
- cuda-python>=12.0,<13.0a0,!=12.6.1
- matrix: {cuda: "11.*"}
packages: &run_cudf_packages_all_cu11
- cuda-python>=11.7.1,<12.0a0
- cuda-python>=11.7.1,<12.0a0,!=11.8.4
- {matrix: null, packages: *run_cudf_packages_all_cu11}
- output_types: conda
matrices:
Expand Down
4 changes: 3 additions & 1 deletion python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ requires-python = ">=3.10"
dependencies = [
"cachetools",
"cubinlinker",
"cuda-python>=11.7.1,<12.0a0",
"cuda-python>=11.7.1,<12.0a0,!=11.8.4",
"cupy-cuda11x>=12.0.0",
"fsspec>=0.6.0",
"libcudf==24.12.*,>=0.0.0a0",
Expand Down Expand Up @@ -90,6 +90,8 @@ filterwarnings = [
"error",
"ignore:::.*xdist.*",
"ignore:::.*pytest.*",
# https://github.com/rapidsai/build-planning/issues/116
"ignore:.*cuda..* module is deprecated.*:DeprecationWarning",
# some third-party dependencies (e.g. 'boto3') still using datetime.datetime.utcnow()
"ignore:.*datetime.*utcnow.*scheduled for removal.*:DeprecationWarning:botocore",
# Deprecation warning from Pyarrow Table.to_pandas() with pandas-2.2+
Expand Down
4 changes: 3 additions & 1 deletion python/cudf_kafka/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ rapids = ["rmm", "cudf", "dask_cudf"]
addopts = "--tb=native --strict-config --strict-markers"
empty_parameter_set_mark = "fail_at_collect"
filterwarnings = [
"error"
"error",
# https://github.com/rapidsai/build-planning/issues/116
"ignore:.*cuda..* module is deprecated.*:DeprecationWarning",
]
xfail_strict = true

Expand Down
4 changes: 3 additions & 1 deletion python/cudf_polars/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ version = {file = "cudf_polars/VERSION"}
addopts = "--tb=native --strict-config --strict-markers"
empty_parameter_set_mark = "fail_at_collect"
filterwarnings = [
"error"
"error",
# https://github.com/rapidsai/build-planning/issues/116
"ignore:.*cuda..* module is deprecated.*:DeprecationWarning",
]
xfail_strict = true

Expand Down
2 changes: 2 additions & 0 deletions python/custreamz/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ addopts = "--tb=native --strict-config --strict-markers"
empty_parameter_set_mark = "fail_at_collect"
filterwarnings = [
"error",
# https://github.com/rapidsai/build-planning/issues/116
"ignore:.*cuda..* module is deprecated.*:DeprecationWarning",
"ignore:unclosed <socket.socket:ResourceWarning",
"ignore:Port .* is already in use.:UserWarning:distributed",
# Should be fixed in the next streamz release
Expand Down
2 changes: 2 additions & 0 deletions python/dask_cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ empty_parameter_set_mark = "fail_at_collect"
filterwarnings = [
"error::FutureWarning",
"error::DeprecationWarning",
# https://github.com/rapidsai/build-planning/issues/116
"ignore:.*cuda..* module is deprecated.*:DeprecationWarning",
# some third-party dependencies (e.g. 'boto3') still using datetime.datetime.utcnow()
"ignore:.*datetime.*utcnow.*scheduled for removal:DeprecationWarning:botocore",
"ignore:create_block_manager_from_blocks is deprecated and will be removed in a future version. Use public APIs instead.:DeprecationWarning",
Expand Down
11 changes: 11 additions & 0 deletions python/libcudf/libcudf/load.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@


def load_library():
try:
# libkvikio must be loaded before libcudf because libcudf references its symbols
import libkvikio

libkvikio.load_library()
except ModuleNotFoundError:
# libcudf's runtime dependency on libkvikio may be satisfied by a natively
# installed library or a conda package, in which case the import will fail and
# we assume the library is discoverable on system paths.
pass

# Dynamically load libcudf.so. Prefer a system library if one is present to
# avoid clobbering symbols that other packages might expect, but if no
# other library is present use the one in the wheel.
Expand Down
1 change: 1 addition & 0 deletions python/libcudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ classifiers = [
"Environment :: GPU :: NVIDIA CUDA",
]
dependencies = [
"libkvikio==24.12.*,>=0.0.0a0",
"nvidia-nvcomp==4.1.0.6",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

Expand Down
4 changes: 3 additions & 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>=11.7.1,<12.0a0",
"cuda-python>=11.7.1,<12.0a0,!=11.8.4",
"libcudf==24.12.*,>=0.0.0a0",
"nvtx>=0.2.1",
"packaging",
Expand Down Expand Up @@ -74,6 +74,8 @@ addopts = "--tb=native --strict-config --strict-markers --import-mode=importlib"
empty_parameter_set_mark = "fail_at_collect"
filterwarnings = [
"error",
# https://github.com/rapidsai/build-planning/issues/116
"ignore:.*cuda..* module is deprecated.*:DeprecationWarning",
"ignore:::.*xdist.*",
"ignore:::.*pytest.*"
]
Expand Down

0 comments on commit 588b21f

Please sign in to comment.