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

Unpin dask and distributed for development and fix merge_labels test #1574

Merged
merged 5 commits into from
Jun 6, 2023
Merged

Unpin dask and distributed for development and fix merge_labels test #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51695f0
Unpin dask and distributed for development
galipremsagar Jun 2, 2023
5a9d393
Merge remote-tracking branch 'upstream/branch-23.08' into unpin_dask
galipremsagar Jun 6, 2023
5aeaedf
Fixing merge_labels test
cjnolet Jun 6, 2023
b7c34c3
Fixing style
cjnolet Jun 6, 2023
493ffdf
Merge branch 'bug-2308-fix_merge_labels_test' into unpin_dask
galipremsagar Jun 6, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
build_type: pull-request
package-name: raft_dask
# Always want to test against latest dask/distributed.
test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_${{ '${PIP_CU_VERSION}' }} rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-unittest: "python -m pytest ./python/raft-dask/raft_dask/test"
test-smoketest: "python ./ci/wheel_smoke_test_raft_dask.py"
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
package-name: raft_dask
test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
test-before-arm64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
test-before-amd64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-before-arm64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-unittest: "python -m pytest ./python/raft-dask/raft_dask/test"
6 changes: 3 additions & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=0.29,<0.30
- dask-core==2023.3.2
- dask-core>=2023.5.1
- dask-cuda==23.8.*
- dask==2023.3.2
- distributed==2023.3.2.1
- dask>=2023.5.1
- distributed>=2023.5.1
- doxygen>=1.8.20
- gcc_linux-64=11.*
- gmock>=1.13.0
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/raft-dask/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ requirements:
run:
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
- cuda-python >=11.7.1,<12.0
- dask ==2023.3.2
- dask-core ==2023.3.2
- dask >=2023.5.1
- dask-core >=2023.5.1
- dask-cuda ={{ minor_version }}
- distributed ==2023.3.2.1
- distributed >=2023.5.1
- joblib >=0.11
- nccl >=2.9.9
- pylibraft {{ version }}
Expand Down
4 changes: 3 additions & 1 deletion cpp/test/label/merge_labels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ class MergeLabelsTest : public ::testing::TestWithParam<MergeLabelsInputs<Index_

MergeLabelsInputs<Index_> params;
rmm::device_uvector<Index_> labels_a, labels_b, expected, R;
rmm::device_scalar<bool> mask, m;
rmm::device_uvector<bool> mask;

rmm::device_scalar<bool> m;
};

using MergeLabelsTestI = MergeLabelsTest<int>;
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,16 +270,16 @@ dependencies:
common:
- output_types: [conda, pyproject]
packages:
- dask==2023.3.2
- dask>=2023.5.1
- dask-cuda==23.8.*
- distributed==2023.3.2.1
- distributed>=2023.5.1
- joblib>=0.11
- numba>=0.57
- *numpy
- ucx-py==0.33.*
- output_types: conda
packages:
- dask-core==2023.3.2
- dask-core>=2023.5.1
- ucx>=1.13.0
- ucx-proc=*=gpu
- output_types: pyproject
Expand Down
4 changes: 2 additions & 2 deletions python/raft-dask/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"dask-cuda==23.8.*",
"dask==2023.3.2",
"distributed==2023.3.2.1",
"dask>=2023.5.1",
"distributed>=2023.5.1",
"joblib>=0.11",
"numba>=0.57",
"numpy>=1.21",
Expand Down