Skip to content

Commit 7aa42a3

Browse files
committed
Support incremental benchmarking of datasets larger than memory
1 parent 1d48f3a commit 7aa42a3

File tree

5 files changed

+2
-79
lines changed

5 files changed

+2
-79
lines changed

configs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Configs have the three highest parameter keys:
117117
|:---------------|:--------------|:--------|:------------|
118118
| `algorithm`:`estimator` | None | | Name of measured estimator. |
119119
| `algorithm`:`estimator_params` | Empty `dict` | | Parameters for estimator constructor. |
120-
| `algorithm`:`training`:`num_batches` | 5 | | Number of batches to benchmark `partial_fit` function, using batches the size of number of samples specified (not samples divided by `num_batches`). For incremental estimators only. |
120+
| `algorithm`:`num_batches`:`training` | 5 | | Number of batches to benchmark `partial_fit` function, using batches the size of number of samples specified (not samples divided by `num_batches`). For incremental estimators only. |
121121
| `algorithm`:`online_inference_mode` | False | | Enables online mode for inference methods of estimator (separate call for each sample). |
122122
| `algorithm`:`sklearn_context` | None | | Parameters for sklearn `config_context` used over estimator. |
123123
| `algorithm`:`sklearnex_context` | None | | Parameters for sklearnex `config_context` used over estimator. Updated by `sklearn_context` if set. |

configs/sklearnex_incremental_example.json

Lines changed: 0 additions & 65 deletions
This file was deleted.

sklbench/report/implementation.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,7 @@ def get_summary_from_df(df: pd.DataFrame, df_name: str) -> pd.DataFrame:
260260
# only relative improvements are included in summary currently
261261
if len(column) > 1 and column[1] == f"{metric_name} relative improvement":
262262
metric_columns.append(column)
263-
if metric_columns:
264-
summary = df[metric_columns].aggregate(geomean_wrapper, axis=0).to_frame().T
265-
else:
266-
summary = pd.DataFrame()
263+
summary = df[metric_columns].aggregate(geomean_wrapper, axis=0).to_frame().T
267264
summary.index = pd.Index([df_name])
268265
return summary
269266

test-configuration-linux.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ steps:
4545
conda activate bench-env
4646
python -m sklbench --report -l DEBUG --report -c configs/sklearn_example.json
4747
displayName: Sklearn example run
48-
- script: |
49-
source /usr/share/miniconda/etc/profile.d/conda.sh
50-
conda activate bench-env
51-
python -m sklbench --report -l DEBUG --report -c configs/sklearnex_incremental_example.json
52-
displayName: Incremental algorithms example run
5348
- script: |
5449
source /usr/share/miniconda/etc/profile.d/conda.sh
5550
conda activate bench-env

test-configuration-win.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ steps:
4343
call activate bench-env
4444
python -m sklbench --report -l DEBUG --report -c configs/sklearn_example.json
4545
displayName: Sklearn example run
46-
- script: |
47-
call activate bench-env
48-
python -m sklbench --report -l DEBUG --report -c configs/incremental.json
49-
displayName: Incremental algorithms example run
5046
- script: |
5147
call activate bench-env
5248
python -m sklbench --report -l DEBUG --report -c configs/xgboost_example.json

0 commit comments

Comments
 (0)