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

Jump to bottom

CI: Fix expected ValueError and dask-glm incompatibility #5644

Merged
merged 2 commits into from
Nov 8, 2023
Merged

CI: Fix expected ValueError and dask-glm incompatibility #5644

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
e50ac6e
Expect all supported types and shapes to work with host mem type.
csadorf Nov 6, 2023
0c28977
Pin dask-glm to 0.3.0.
csadorf Nov 8, 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
2 changes: 1 addition & 1 deletion 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 @@ -77,5 +77,5 @@ dependencies:
- treelite==3.9.1
- umap-learn==0.5.3
- pip:
- git+https://github.com/dask/dask-glm@main
- dask-glm==0.3.0
name: all_cuda-118_arch-x86_64
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ dependencies:
- treelite==3.9.1
- umap-learn==0.5.3
- pip:
- git+https://github.com/dask/dask-glm@main
- dask-glm==0.3.0
name: all_cuda-120_arch-x86_64
6 changes: 2 additions & 4 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,13 @@ dependencies:
packages:
- pip
- pip:
# TODO: Figure out what to do with this dependency
# since the repo is now archived.
- git+https://github.com/dask/dask-glm@main
- dask-glm==0.3.0
# TODO: remove pin once a release that includes fixes for the error
# is released: https://github.com/rapidsai/cuml/issues/5514
- hdbscan<=0.8.30
- output_types: pyproject
packages:
- dask-glm @ git+https://github.com/dask/dask-glm@main
- dask-glm==0.3.0
# TODO: Can we stop pulling from the master branch now that there was a release in October?
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think comment technically belongs to the dask-glm, but I'm hesitant to delay merge of this.

- hdbscan @ git+https://github.com/scikit-learn-contrib/hdbscan.git@master
test_notebooks:
Expand Down
13 changes: 3 additions & 10 deletions python/cuml/tests/test_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ def test_array_init_from_bytes(data_type, dtype, shape, order, mem_type):
mem_type=cuml_array_mem_types(),
)
@settings(deadline=None)
def test_array_init_bad(input_type, dtype, shape, order, mem_type):
def test_array_mem_type(input_type, dtype, shape, order, mem_type):
"""
This test ensures that we assert on incorrect combinations of arguments
when creating CumlArray
Test whether we can create CumlArray from all supported types and array
shapes on all supported mem types.
"""
mem_type = MemoryType.from_str(mem_type)

Expand All @@ -214,13 +214,6 @@ def test_array_init_bad(input_type, dtype, shape, order, mem_type):
# Ensure the array is creatable
array = CumlArray(input_array)

with pytest.raises(ValueError):
bad_dtype = np.float16 if dtype != np.float16 else np.float32
CumlArray(input_array, dtype=bad_dtype)

with pytest.raises(ValueError):
CumlArray(input_array, shape=(*array.shape, 1))

input_mem_type = determine_array_memtype(input_array)
if input_mem_type.is_device_accessible:
joint_mem_type = input_mem_type
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ classifiers = [

[project.optional-dependencies]
test = [
"dask-glm @ git+https://github.com/dask/dask-glm@main",
"dask-glm==0.3.0",
"dask-ml",
"hdbscan @ git+https://github.com/scikit-learn-contrib/hdbscan.git@master",
"hypothesis>=6.0,<7",
Expand Down