From d889afde4d81f93eff66383be432952b04080c06 Mon Sep 17 00:00:00 2001 From: ethanglaser Date: Tue, 2 Dec 2025 18:15:08 -0800 Subject: [PATCH 1/2] Transition default GPU data format from dpctl to dpnp --- configs/common/sklearn.json | 2 +- sklbench/benchmarks/sklearn_estimator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/common/sklearn.json b/configs/common/sklearn.json index 60018e6f..6b988ba7 100644 --- a/configs/common/sklearn.json +++ b/configs/common/sklearn.json @@ -19,7 +19,7 @@ "estimator_params": { "n_jobs": "[REMOVE]" } }, "data": { - "format": "dpctl", + "format": "dpnp", "order": "C", "distributed_split": "rank_based" }, diff --git a/sklbench/benchmarks/sklearn_estimator.py b/sklbench/benchmarks/sklearn_estimator.py index 1d49722c..95802477 100644 --- a/sklbench/benchmarks/sklearn_estimator.py +++ b/sklbench/benchmarks/sklearn_estimator.py @@ -363,7 +363,7 @@ def dataframe_function(x): for i in range(n_batches): method_instance(x.iloc[i * batch_size : (i + 1) * batch_size]) - if "ndarray" in str(type(data_args[0])): + if "array" in str(type(data_args[0])): return ndarray_function elif "DataFrame" in str(type(data_args[0])): return dataframe_function From 63f23b2147c27d223777c34f0d234205daf1684c Mon Sep 17 00:00:00 2001 From: ethanglaser Date: Tue, 2 Dec 2025 18:23:09 -0800 Subject: [PATCH 2/2] deprecate dpctl tensors in sklbench --- sklbench/datasets/transformer.py | 7 +++++++ sklbench/utils/common.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/sklbench/datasets/transformer.py b/sklbench/datasets/transformer.py index 9fe515b4..1efc31e6 100644 --- a/sklbench/datasets/transformer.py +++ b/sklbench/datasets/transformer.py @@ -15,6 +15,7 @@ # =============================================================================== import os +import warnings import numpy as np import pandas as pd @@ -47,6 +48,12 @@ def convert_data(data, dformat: str, order: str, dtype: str, device: str = None) return dpnp.array(data, dtype=dtype, order=order, device=device) elif dformat == "dpctl": + warnings.warn( + "dpctl tensors are deprecated and support for them " + "in scikit-learn_bench will be removed. " + "Consider using dpnp arrays instead.", + FutureWarning, + ) import dpctl.tensor return dpctl.tensor.asarray(data, dtype=dtype, order=order, device=device) diff --git a/sklbench/utils/common.py b/sklbench/utils/common.py index 4686d6b3..ae666007 100755 --- a/sklbench/utils/common.py +++ b/sklbench/utils/common.py @@ -20,6 +20,7 @@ import json import re import subprocess as sp +import warnings from pprint import pformat from shutil import get_terminal_size from typing import Any, Dict, List, Tuple, Union @@ -214,6 +215,12 @@ def convert_to_numpy(a, dp_compat=False) -> np.ndarray: return dpnp.asnumpy(a) elif "dpctl" in str(type(a)): + warnings.warn( + "dpctl tensors are deprecated and support for them " + "in scikit-learn_bench will be removed. " + "Consider using dpnp arrays instead.", + FutureWarning, + ) import dpctl.tensor return dpctl.tensor.to_numpy(a)