diff --git a/bench.py b/bench.py index 59715aef6..e33998603 100644 --- a/bench.py +++ b/bench.py @@ -95,7 +95,7 @@ def get_optimal_cache_size(n_rows, dtype=np.double, max_cache=64): def parse_args(parser, size=None, loop_types=(), - n_jobs_supported=False, prefix='sklearn'): + n_jobs_supported=True, prefix='sklearn'): ''' Add common arguments useful for most benchmarks and parse. diff --git a/configs/skl_config.json b/configs/skl_config.json index dc8c9968c..93c23e068 100755 --- a/configs/skl_config.json +++ b/configs/skl_config.json @@ -146,8 +146,7 @@ "num-trees": [50], "max-depth": [16], "max-leaf-nodes": [131072], - "max-features": [0.2], - "use-sklearn-class": [""] + "max-features": [0.2] }, { "algorithm": "ridge", diff --git a/sklearn_bench/dbscan.py b/sklearn_bench/dbscan.py index bf0c71554..542da102f 100644 --- a/sklearn_bench/dbscan.py +++ b/sklearn_bench/dbscan.py @@ -27,7 +27,7 @@ parser.add_argument('-m', '--min-samples', default=5, type=int, help='The minimum number of samples required in a ' 'neighborhood to consider a point a core point') -params = bench.parse_args(parser, n_jobs_supported=True) +params = bench.parse_args(parser) from sklearn.cluster import DBSCAN diff --git a/sklearn_bench/df_clsf.py b/sklearn_bench/df_clsf.py index 62199539c..454fd4f4a 100644 --- a/sklearn_bench/df_clsf.py +++ b/sklearn_bench/df_clsf.py @@ -60,7 +60,8 @@ max_leaf_nodes=params.max_leaf_nodes, min_impurity_decrease=params.min_impurity_decrease, bootstrap=params.bootstrap, - random_state=params.seed) + random_state=params.seed, + n_jobs=params.n_jobs) params.n_classes = len(np.unique(y_train)) diff --git a/sklearn_bench/df_regr.py b/sklearn_bench/df_regr.py index 749f8aad0..73fc82738 100644 --- a/sklearn_bench/df_regr.py +++ b/sklearn_bench/df_regr.py @@ -58,7 +58,8 @@ max_leaf_nodes=params.max_leaf_nodes, min_impurity_decrease=params.min_impurity_decrease, bootstrap=params.bootstrap, - random_state=params.seed) + random_state=params.seed, + n_jobs=params.n_jobs) fit_time, _ = bench.measure_function_time(regr.fit, X_train, y_train, params=params) diff --git a/sklearn_bench/knn_clsf.py b/sklearn_bench/knn_clsf.py index 4019a891f..f30983a0b 100755 --- a/sklearn_bench/knn_clsf.py +++ b/sklearn_bench/knn_clsf.py @@ -49,7 +49,8 @@ knn_clsf = KNeighborsClassifier(n_neighbors=params.n_neighbors, weights=params.weights, algorithm=params.method, - metric=params.metric) + metric=params.metric, + n_jobs=params.n_jobs) # Measure time and accuracy on fitting train_time, _ = bench.measure_function_time(knn_clsf.fit, X_train, y_train, params=params)