logic updates

Author: ethanglaser

sklbench/benchmarks/sklearn_estimator.py

@@ -516,7 +516,7 @@ def main(bench_case: BenchCase, filters: List[BenchCase]):
         bench_case, "algorithm:estimator_params", dict()
     )
     # logger.debug("estimator params: " + str(estimator_params))
-    if "DBSCAN" in str(estimator_name):
+    if "DBSCAN" in str(estimator_name) and get_bench_case_value(bench_case, "data:distributed_split", None) != "rank_based":
         if "min_samples" in estimator_params:
             from mpi4py import MPI
 

sklbench/datasets/transformer.py

@@ -109,11 +109,11 @@ def split_and_transform_data(bench_case, data, data_description):
         y_train, y_test = None, None
 
     distributed_split = get_bench_case_value(bench_case, "data:distributed_split", None)
-    knn_split_train = (
-        "KNeighbors" in get_bench_case_value(bench_case, "algorithm:estimator", "")
-        and int(get_bench_case_value(bench_case, "bench:mpi_params:n", 1)) > 1
-    )
-    if distributed_split == "rank_based" or knn_split_train:
+    # knn_split_train = (
+    #     "KNeighbors" in get_bench_case_value(bench_case, "algorithm:estimator", "")
+    #     and int(get_bench_case_value(bench_case, "bench:mpi_params:n", 1)) > 1
+    # )
+    if distributed_split == "rank_based":
         from mpi4py import MPI
 
         comm = MPI.COMM_WORLD

sklbench/utils/measurement.py

@@ -79,7 +79,7 @@ def measure_time(
         t0 = timeit.default_timer()
         func_return_value = func(*args, **kwargs)
         t1 = timeit.default_timer()
-        if hasattr(func.__self__, "_n_inner_iter"):
+        if hasattr(func, "__self__") and hasattr(func.__self__, "_n_inner_iter"):
             inners.append(func.__self__._n_inner_iter)
             iters.append(func.__self__.n_iter_)
         if enable_itt and itt_is_available: