Update normalization parameters and add estimator params validation #210
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
| } | ||
| }, | ||
| "data": { | ||
| "preprocessing_kwargs": { "normalize": "standard" } | ||
| } | ||
| }, | ||
| "sklearn knn parameters": { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ | |
| "random_state": 42 | ||
| }, | ||
| "preprocessing_kwargs": { | ||
| "normalize": "standard" | ||
| } | ||
| }, | ||
| "bench": { "n_runs": 5 }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -4,14 +4,19 @@ | |||||||||
| "high-load dbscan datasets": { | ||||||||||
| "data": [ | ||||||||||
| { | ||||||||||
| "dataset" : "cifar", | ||||||||||
| "split_kwargs": { "ignore" : true }, | ||||||||||
|
Comment on lines
+7
to
+8
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||||||
| "preprocessing_kwargs": { "normalize": "mean" } | ||||||||||
| }, | ||||||||||
| { | ||||||||||
| "dataset": ["road_network", "covtype"], | ||||||||||
| "split_kwargs": { "ignore": true }, | ||||||||||
| "preprocessing_kwargs": { "normalize": "standard" } | ||||||||||
| }, | ||||||||||
| { | ||||||||||
| "dataset": "susy", | ||||||||||
| "split_kwargs": { "train_size": 800000 }, | ||||||||||
| "preprocessing_kwargs": { "normalize": "standard" } | ||||||||||
| }, | ||||||||||
| { | ||||||||||
| "source": "make_blobs", | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |
| "data": { | ||
| "dataset": ["susy", "hepmass"], | ||
| "split_kwargs": { "ignore": true }, | ||
| "preprocessing_kwargs": { "normalize": "standard" } | ||
| } | ||
| }, | ||
| { | ||
|
|
@@ -37,7 +37,8 @@ | |
| { | ||
| "data": { | ||
| "dataset": "cifar", | ||
| "split_kwargs": { "ignore": true }, | ||
| "preprocessing_kwargs": { "normalize": "mean" } | ||
| } | ||
| } | ||
| ] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ | |
| "susy" | ||
| ], | ||
| "preprocessing_kwargs": { | ||
| "normalize": "standard" | ||
| }, | ||
| "split_kwargs": { "ignore": true } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ | |
| "data": { | ||
| "dataset": "mnist", | ||
| "split_kwargs": { "ignore": true }, | ||
| "preprocessing_kwargs": { "normalize": null } | ||
| }, | ||
| "algorithm": { "estimator_params": { "C": 1.0, "kernel": ["poly", "rbf"] } } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,9 +16,16 @@ | |
| }, | ||
| { | ||
| "data": { | ||
| "dataset": ["sensit", "mnist"], | ||
| "split_kwargs": { "ignore": true } | ||
| } | ||
| }, | ||
| { | ||
| "data": { | ||
| "dataset" : "cifar", | ||
| "split_kwargs": { "ignore" : true }, | ||
| "preprocessing_kwargs": { "normalize": "mean" } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ pandas | |
| tabulate | ||
| fastparquet | ||
| h5py | ||
| openml | ||
|
Contributor
There was a problem hiding this comment. Looks like you need to rebase from the current main. |
||
| openpyxl | ||
| tqdm | ||
| psutil | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -334,6 +334,48 @@ def verify_patching(stream: io.StringIO, function_name) -> bool: | |
| return acceleration_lines > 0 and fallback_lines == 0 | ||
|
|
||
|
|
||
| def validate_estimator_params(estimator_class, estimator_params: Dict) -> Dict: | ||
| """Validates parameters and returns only those supported by the estimator. | ||
|
|
||
| Args: | ||
| estimator_class: The estimator class to validate against | ||
| estimator_params: Dictionary of parameters to validate | ||
|
|
||
| Returns: | ||
| Dictionary with only valid parameters | ||
| """ | ||
| try: | ||
| init_signature = inspect.signature(estimator_class.__init__) | ||
| valid_params = set(init_signature.parameters.keys()) - {"self"} | ||
|
|
||
| # Check if estimator accepts **kwargs | ||
| has_var_keyword = any( | ||
| param.kind == inspect.Parameter.VAR_KEYWORD | ||
| for param in init_signature.parameters.values() | ||
| ) | ||
|
|
||
| # If accepts **kwargs, return all params | ||
| if has_var_keyword: | ||
| return estimator_params | ||
|
|
||
| # Filter out invalid params and warn | ||
| filtered_params = {} | ||
| for param_name, param_value in estimator_params.items(): | ||
| if param_name in valid_params: | ||
| filtered_params[param_name] = param_value | ||
| else: | ||
| logger.warning( | ||
| f"Parameter '{param_name}' is not supported by " | ||
| f"{estimator_class.__name__} and will be ignored" | ||
| ) | ||
|
|
||
| return filtered_params | ||
|
|
||
| except Exception as e: | ||
| logger.debug(f"Could not validate parameters for {estimator_class.__name__}: {e}") | ||
| return estimator_params | ||
|
|
||
|
|
||
| def create_online_function(method_instance, data_args, batch_size): | ||
| n_batches = data_args[0].shape[0] // batch_size | ||
|
|
||
|
|
@@ -491,6 +533,9 @@ def main(bench_case: BenchCase, filters: List[BenchCase]): | |
| bench_case, "algorithm:estimator_params", dict() | ||
| ) | ||
|
|
||
| # validate and filter estimator parameters | ||
| estimator_params = validate_estimator_params(estimator_class, estimator_params) | ||
|
|
||
| # get estimator methods for measurement | ||
| estimator_methods = get_estimator_methods(bench_case) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,12 @@ | |
| import pandas as pd | ||
| from scipy.sparse import csr_matrix | ||
| from sklearn.model_selection import train_test_split | ||
| from sklearn.preprocessing import ( | ||
| MinMaxScaler, | ||
| OneHotEncoder, | ||
| OrdinalEncoder, | ||
| StandardScaler, | ||
| ) | ||
|
|
||
| from ..utils.custom_types import Array | ||
| from ..utils.logger import logger | ||
|
|
@@ -167,7 +172,7 @@ def preprocess_x( | |
| x: Array, | ||
| replace_nan="auto", | ||
| category_encoding="ordinal", | ||
| normalize=None, | ||
| force_for_sparse=True, | ||
| **kwargs, | ||
| ) -> Array: | ||
|
|
@@ -219,9 +224,18 @@ def preprocess_x( | |
| pass | ||
| else: | ||
| logger.warning(f'Unknown "{category_encoding}" category encoding type.') | ||
| # Normalization | ||
| if normalize: | ||
| if normalize == "standard": | ||
| scaler = StandardScaler(with_mean=True, with_std=True) | ||
| elif normalize == "mean": | ||
| scaler = StandardScaler(with_mean=True, with_std=False) | ||
| elif normalize == "minmax": | ||
| scaler = MinMaxScaler(feature_range=(0, 1)) | ||
| else: | ||
| logger.warning(f'Unknown "{normalize}" normalization type.') | ||
| if scaler is not None: | ||
| return pd.DataFrame(scaler.fit_transform(x), columns=x.columns, index=x.index) | ||
|
Contributor
There was a problem hiding this comment. Wouldn't this make it ignore |
||
| if return_type == np.ndarray: | ||
| return x.values | ||
| else: | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would the jsons with the datasets be able to override this? For example:
https://github.com/avolkov-intel/scikit-learn_bench/blob/a2a75152d6bae2cf3bcdf350125369b04f289b33/configs/regular/knn.json#L8
It's not clear from the docs how it would work when specified more than once.