Skip to content

Commit

Permalink
Unpin dask and distributed for 23.12 development (#1264)
Browse files Browse the repository at this point in the history
This PR relaxes `dask` and `distributed` versions pinning for `23.12` development.

xref: rapidsai/cudf#14320

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Peter Andreas Entschev (https://github.com/pentschev)

Approvers:
  - https://github.com/jakirkham
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)

URL: #1264
  • Loading branch information
galipremsagar authored Oct 27, 2023
1 parent 84bfc14 commit fbeee9c
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 127 deletions.
2 changes: 1 addition & 1 deletion conda/recipes/dask-cuda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ requirements:
- tomli
run:
- python
- dask-core ==2023.9.2
- dask-core >=2023.9.2
{% for r in data.get("project", {}).get("dependencies", []) %}
- {{ r }}
{% endfor %}
Expand Down
2 changes: 0 additions & 2 deletions dask_cuda/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

__version__ = "23.12.00"

from . import compat

# Monkey patching Dask to make use of explicit-comms when `DASK_EXPLICIT_COMMS=True`
dask.dataframe.shuffle.rearrange_by_column = get_rearrange_by_column_wrapper(
dask.dataframe.shuffle.rearrange_by_column
Expand Down
118 changes: 0 additions & 118 deletions dask_cuda/compat.py

This file was deleted.

2 changes: 1 addition & 1 deletion dask_cuda/device_host_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
serialize_bytelist,
)
from distributed.sizeof import safe_sizeof
from distributed.spill import CustomFile as KeyAsStringFile
from distributed.spill import AnyKeyFile as KeyAsStringFile
from distributed.utils import nbytes

from .is_device_object import is_device_object
Expand Down
4 changes: 4 additions & 0 deletions dask_cuda/tests/test_explicit_comms.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ def _test_dataframe_shuffle(backend, protocol, n_workers, _partitions):
@pytest.mark.parametrize("_partitions", [True, False])
def test_dataframe_shuffle(backend, protocol, nworkers, _partitions):
if backend == "cudf":
pytest.skip("Temporarily disable due to segfaults in libaws-cpp-sdk-core.so")

pytest.importorskip("cudf")

p = mp.Process(
Expand Down Expand Up @@ -259,6 +261,8 @@ def _test_dataframe_shuffle_merge(backend, protocol, n_workers):
@pytest.mark.parametrize("protocol", ["tcp", "ucx"])
def test_dataframe_shuffle_merge(backend, protocol, nworkers):
if backend == "cudf":
pytest.skip("Temporarily disable due to segfaults in libaws-cpp-sdk-core.so")

pytest.importorskip("cudf")
p = mp.Process(
target=_test_dataframe_shuffle_merge, args=(backend, protocol, nworkers)
Expand Down
2 changes: 2 additions & 0 deletions dask_cuda/tests/test_local_cuda_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ async def test_pre_import():


# Intentionally not using @gen_test to skip cleanup checks
@pytest.mark.xfail(reason="https://github.com/rapidsai/dask-cuda/issues/1265")
def test_pre_import_not_found():
async def _test_pre_import_not_found():
with raises_with_cause(RuntimeError, None, ImportError, None):
Expand Down Expand Up @@ -491,6 +492,7 @@ def test_print_cluster_config(capsys):
assert "[plugin]" in captured.out


@pytest.mark.xfail(reason="https://github.com/rapidsai/dask-cuda/issues/1265")
def test_death_timeout_raises():
with pytest.raises(asyncio.exceptions.TimeoutError):
with LocalCUDACluster(
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ dependencies:
common:
- output_types: [conda, requirements]
packages:
- dask==2023.9.2
- distributed==2023.9.2
- dask>=2023.9.2
- distributed>=2023.9.2
- numba>=0.57
- numpy>=1.21
- pandas>=1.3,<1.6.0dev0
- pynvml>=11.0.0,<11.5
- zict>=2.0.0
- output_types: [conda]
packages:
- dask-core==2023.9.2
- dask-core>=2023.9.2
test_python:
common:
- output_types: [conda]
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ authors = [
license = { text = "Apache-2.0" }
requires-python = ">=3.9"
dependencies = [
"dask ==2023.9.2",
"distributed ==2023.9.2",
"dask >=2023.9.2",
"distributed >=2023.9.2",
"pynvml >=11.0.0,<11.5",
"numpy >=1.21",
"numba >=0.57",
Expand Down

0 comments on commit fbeee9c

Please sign in to comment.