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.

Sign up for GitHub

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 UCX config namespace #695

Merged
merged 2 commits into from
Jul 28, 2021
Merged

Update UCX config namespace #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f74351d
Update UCX config namespace
pentschev Jul 28, 2021
2cb4049
Install Dask main branch in CI for 21.10 development
pentschev Jul 28, 2021
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
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export NUMPY_EXPERIMENTAL_ARRAY_FUNCTION=1

# Install dask and distributed from master branch. Usually needed during
# development time and disabled before a new dask-cuda release.
export INSTALL_DASK_MASTER=0
export INSTALL_DASK_MASTER=1

################################################################################
# SETUP - Check environment
Expand Down
2 changes: 1 addition & 1 deletion dask_cuda/cuda_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def del_pid_file():
name=name if nprocs == 1 or not name else str(name) + "-" + str(i),
local_directory=local_directory,
config={
"ucx": get_ucx_config(
"distributed.comm.ucx": get_ucx_config(
enable_tcp_over_ucx=enable_tcp_over_ucx,
enable_infiniband=enable_infiniband,
enable_nvlink=enable_nvlink,
Expand Down
2 changes: 1 addition & 1 deletion dask_cuda/initialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def initialize(
net_devices=net_devices,
cuda_device_index=cuda_device_index,
)
dask.config.update(dask.config.global_config, {"ucx": ucx_config}, priority="new")
dask.config.set({"distributed.comm.ucx": ucx_config})


@click.command()
Expand Down
2 changes: 1 addition & 1 deletion dask_cuda/local_cuda_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def __init__(
protocol=protocol,
worker_class=worker_class,
config={
"ucx": get_ucx_config(
"distributed.comm.ucx": get_ucx_config(
enable_tcp_over_ucx=enable_tcp_over_ucx,
enable_nvlink=enable_nvlink,
enable_infiniband=enable_infiniband,
Expand Down
6 changes: 3 additions & 3 deletions dask_cuda/tests/test_initialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def _test_initialize_ucx_tcp():
n_workers=1,
threads_per_worker=1,
processes=True,
config={"ucx": get_ucx_config(**kwargs)},
config={"distributed.comm.ucx": get_ucx_config(**kwargs)},
) as cluster:
with Client(cluster) as client:
res = da.from_array(numpy.arange(10000), chunks=(1000,))
Expand Down Expand Up @@ -68,7 +68,7 @@ def _test_initialize_ucx_nvlink():
n_workers=1,
threads_per_worker=1,
processes=True,
config={"ucx": get_ucx_config(**kwargs)},
config={"distributed.comm.ucx": get_ucx_config(**kwargs)},
) as cluster:
with Client(cluster) as client:
res = da.from_array(numpy.arange(10000), chunks=(1000,))
Expand Down Expand Up @@ -110,7 +110,7 @@ def _test_initialize_ucx_infiniband():
n_workers=1,
threads_per_worker=1,
processes=True,
config={"ucx": get_ucx_config(**kwargs)},
config={"distributed.comm.ucx": get_ucx_config(**kwargs)},
) as cluster:
with Client(cluster) as client:
res = da.from_array(numpy.arange(10000), chunks=(1000,))
Expand Down