Skip to content

Commit 676fead

Browse files
committed
Add torch to remaining spmd tests
1 parent a3f3407 commit 676fead

12 files changed

Lines changed: 24 additions & 24 deletions

File tree

sklearnex/spmd/basic_statistics/tests/test_incremental_basic_statistics_spmd.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def test_incremental_basic_statistics_fit_spmd_gold(dataframe, queue, weighted,
104104
)
105105
@pytest.mark.parametrize(
106106
"dataframe,queue",
107-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
107+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
108108
)
109109
@pytest.mark.parametrize("num_blocks", [1, 2])
110110
@pytest.mark.parametrize("weighted", [True, False])
@@ -178,7 +178,7 @@ def test_incremental_basic_statistics_partial_fit_spmd_gold(
178178
)
179179
@pytest.mark.parametrize(
180180
"dataframe,queue",
181-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
181+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
182182
)
183183
@pytest.mark.parametrize("num_blocks", [1, 2])
184184
@pytest.mark.parametrize("weighted", [True, False])
@@ -247,7 +247,7 @@ def test_incremental_basic_statistics_single_option_partial_fit_spmd_gold(
247247
)
248248
@pytest.mark.parametrize(
249249
"dataframe,queue",
250-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
250+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
251251
)
252252
@pytest.mark.parametrize("num_blocks", [1, 2])
253253
@pytest.mark.parametrize("weighted", [True, False])

sklearnex/spmd/cluster/tests/test_dbscan_spmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_dbscan_spmd_gold(dataframe, queue):
6767
@pytest.mark.parametrize("min_samples", [2, 5, 15])
6868
@pytest.mark.parametrize(
6969
"dataframe,queue",
70-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
70+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
7171
)
7272
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
7373
@pytest.mark.parametrize("array_api_dispatch", [True, False])

sklearnex/spmd/cluster/tests/test_kmeans_spmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_kmeans_spmd_gold(dataframe, queue):
107107
@pytest.mark.parametrize("n_clusters", [2, 5, 15])
108108
@pytest.mark.parametrize(
109109
"dataframe,queue",
110-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
110+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
111111
)
112112
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
113113
@pytest.mark.parametrize("array_api_dispatch", [True, False])

sklearnex/spmd/covariance/tests/test_covariance_spmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_covariance_spmd_gold(dataframe, queue):
8383
@pytest.mark.parametrize("assume_centered", [True, False])
8484
@pytest.mark.parametrize(
8585
"dataframe,queue",
86-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
86+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
8787
)
8888
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
8989
@pytest.mark.parametrize("array_api_dispatch", [True, False])

sklearnex/spmd/covariance/tests/test_incremental_covariance_spmd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def test_incremental_covariance_fit_spmd_gold(dataframe, queue, assume_centered,
8888
)
8989
@pytest.mark.parametrize(
9090
"dataframe,queue",
91-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
91+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
9292
)
9393
@pytest.mark.parametrize("num_blocks", [1, 2])
9494
@pytest.mark.parametrize("assume_centered", [True, False])
@@ -149,7 +149,7 @@ def test_incremental_covariance_partial_fit_spmd_gold(
149149
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
150150
@pytest.mark.parametrize(
151151
"dataframe,queue",
152-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
152+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
153153
)
154154
@pytest.mark.parametrize("array_api_dispatch", [True, False])
155155
@pytest.mark.mpi

sklearnex/spmd/decomposition/tests/test_incremental_pca_spmd.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def test_incremental_pca_fit_spmd_gold(dataframe, queue, whiten, dtype):
9595
)
9696
@pytest.mark.parametrize(
9797
"dataframe,queue",
98-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
98+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
9999
)
100100
@pytest.mark.parametrize("whiten", [True, False])
101101
@pytest.mark.parametrize("num_blocks", [1, 2])
@@ -159,7 +159,7 @@ def test_incremental_pca_partial_fit_spmd_gold(
159159
)
160160
@pytest.mark.parametrize(
161161
"dataframe,queue",
162-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
162+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
163163
)
164164
@pytest.mark.parametrize("whiten", [True, False])
165165
@pytest.mark.parametrize("n_components", [None, 2, 5])
@@ -211,7 +211,7 @@ def test_incremental_pca_fit_spmd_random(
211211
)
212212
@pytest.mark.parametrize(
213213
"dataframe,queue",
214-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
214+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
215215
)
216216
@pytest.mark.parametrize("whiten", [True, False])
217217
@pytest.mark.parametrize("n_components", [None, 2, 5])

sklearnex/spmd/decomposition/tests/test_pca_spmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test_pca_spmd_gold(dataframe, queue):
9090
@pytest.mark.parametrize("whiten", [True, False])
9191
@pytest.mark.parametrize(
9292
"dataframe,queue",
93-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
93+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
9494
)
9595
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
9696
@pytest.mark.parametrize("array_api_dispatch", [True, False])

sklearnex/spmd/ensemble/tests/test_forest_spmd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_rfcls_spmd_gold(dataframe, queue):
107107
@pytest.mark.parametrize("local_trees_mode", [False, True])
108108
@pytest.mark.parametrize(
109109
"dataframe,queue",
110-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
110+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
111111
)
112112
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
113113
@pytest.mark.parametrize("array_api_dispatch", [True, False])
@@ -242,7 +242,7 @@ def test_rfreg_spmd_gold(dataframe, queue):
242242
@pytest.mark.parametrize("local_trees_mode", [False, True])
243243
@pytest.mark.parametrize(
244244
"dataframe,queue",
245-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
245+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
246246
)
247247
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
248248
@pytest.mark.parametrize("array_api_dispatch", [True, False])

sklearnex/spmd/linear_model/tests/test_incremental_linear_spmd.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
)
3838
@pytest.mark.parametrize(
3939
"dataframe,queue",
40-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
40+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
4141
)
4242
@pytest.mark.parametrize("fit_intercept", [True, False])
4343
@pytest.mark.parametrize("macro_block", [None, 1024])
@@ -196,7 +196,7 @@ def test_incremental_linear_regression_partial_fit_spmd_gold(
196196
)
197197
@pytest.mark.parametrize(
198198
"dataframe,queue",
199-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
199+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
200200
)
201201
@pytest.mark.parametrize("fit_intercept", [True, False])
202202
@pytest.mark.parametrize("num_samples", [100, 1000])
@@ -261,7 +261,7 @@ def test_incremental_linear_regression_fit_spmd_random(
261261
)
262262
@pytest.mark.parametrize(
263263
"dataframe,queue",
264-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
264+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
265265
)
266266
@pytest.mark.parametrize("fit_intercept", [True, False])
267267
@pytest.mark.parametrize("num_blocks", [1, 2])

sklearnex/spmd/linear_model/tests/test_linear_regression_spmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_linear_spmd_gold(dataframe, queue):
102102
@pytest.mark.parametrize("n_features", [10, 100])
103103
@pytest.mark.parametrize(
104104
"dataframe,queue",
105-
get_dataframes_and_queues(dataframe_filter_="dpnp", device_filter_="gpu"),
105+
get_dataframes_and_queues(dataframe_filter_="dpnp,torch", device_filter_="gpu"),
106106
)
107107
@pytest.mark.parametrize("dtype", [np.float32, np.float64])
108108
@pytest.mark.parametrize("array_api_dispatch", [True, False])

0 commit comments

Comments
 (0)