From e5272906fc0e699bb5c36302f9bb089e15caba0f Mon Sep 17 00:00:00 2001 From: Tim Head Date: Mon, 17 Mar 2025 07:34:16 -0700 Subject: [PATCH 1/2] Clean up after removing KMeans deprecation --- python/cuml/cuml/tests/test_common.py | 4 ---- python/cuml/cuml/tests/test_public_methods_attributes.py | 3 --- python/cuml/cuml/tests/test_sklearn_import_export.py | 9 --------- 3 files changed, 16 deletions(-) diff --git a/python/cuml/cuml/tests/test_common.py b/python/cuml/cuml/tests/test_common.py index 4b78c8f08d..0dc6ccd575 100644 --- a/python/cuml/cuml/tests/test_common.py +++ b/python/cuml/cuml/tests/test_common.py @@ -19,10 +19,6 @@ import cuml from cuml.datasets import make_blobs -pytestmark = pytest.mark.filterwarnings( - "ignore:The default value of `n_init` will change from 1 to 'auto' in 25.04" -) - @pytest.mark.parametrize( "Estimator", diff --git a/python/cuml/cuml/tests/test_public_methods_attributes.py b/python/cuml/cuml/tests/test_public_methods_attributes.py index 3bfdb089b9..9c6169b7a6 100644 --- a/python/cuml/cuml/tests/test_public_methods_attributes.py +++ b/python/cuml/cuml/tests/test_public_methods_attributes.py @@ -26,9 +26,6 @@ pytest.mark.filterwarnings( "ignore:Starting from version 22.04, the default method of TSNE is 'fft'." ), - pytest.mark.filterwarnings( - "ignore:The default value of `n_init` will change from 1 to 'auto' in 25.04" - ), ] diff --git a/python/cuml/cuml/tests/test_sklearn_import_export.py b/python/cuml/cuml/tests/test_sklearn_import_export.py index b3ed1f67b1..e07d88bc9f 100644 --- a/python/cuml/cuml/tests/test_sklearn_import_export.py +++ b/python/cuml/cuml/tests/test_sklearn_import_export.py @@ -103,12 +103,6 @@ def assert_estimator_roundtrip( _ = original_params.pop("init", None) _ = rm_params.pop("init", None) - # This failure will be fixed by - # https://github.com/rapidsai/cuml/pull/6142 - # otherwise the predict with default n_init like this - # roundtrip will fail later. - pytest.xfail(reason="auto is not supported by cuML n_init yet") - def dict_diff(a, b): # Get all keys from both dictionaries all_keys = set(a.keys()) | set(b.keys()) @@ -158,9 +152,6 @@ def test_basic_roundtrip(): assert ckm.n_clusters == 13 -@pytest.mark.filterwarnings( - "ignore:The default value of `n_init` will change from 1 to 'auto' in 25.04" -) def test_kmeans(random_state): # Using sklearn directly for demonstration X, _ = make_blobs( From 828458700c2b147efe9f9408966f7a5fbbd2a844 Mon Sep 17 00:00:00 2001 From: Tim Head Date: Tue, 18 Mar 2025 00:15:40 -0700 Subject: [PATCH 2/2] Trigger CI