A few fixes

gevtushenko · May 1, 2023 · 88488b3 · 88488b3
1 parent f32e30b
commit 88488b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/benchmarks/scripts/cub/bench/config.py b/benchmarks/scripts/cub/bench/config.py
@@ -98,7 +98,7 @@ def variant_space(self, algname):
             for value in range(param_space.low, param_space.high, param_space.step):
                 variants[-1].append(RangePoint(param_space.definition, param_space.label, value))
 
-        return list([VariantPoint(points) for points in itertools.product(*variants)])
+        return (VariantPoint(points) for points in itertools.product(*variants))
 
     def variant_space_size(self, algname):
         num_variants = 1

diff --git a/benchmarks/scripts/cub/bench/search.py b/benchmarks/scripts/cub/bench/search.py
@@ -1,5 +1,4 @@
 import re
-import random
 import argparse
 import numpy as np
 
@@ -37,12 +36,13 @@ def list_benches():
     config = Config()
 
     for algname in config.benchmarks:
-        space = config.variant_space(algname)
-        print("  * `{}`: {} variants: ".format(algname, len(space)))
+        space_size = config.variant_space_size(algname)
+        print("  * `{}`: {} variants: ".format(algname, space_size))
 
         for param_space in config.benchmarks[algname]:
-            param_name = param_space[0]
-            print("    * `{}`: {}".format(param_name, param_space[1]))
+            param_name = param_space.label
+            param_rng = (param_space.low, param_space.high, param_space.step)
+            print("    * `{}`: {}".format(param_name, param_rng))
 
 
 def parse_sub_space(args):
@@ -129,7 +129,6 @@ def __init__(self, base_center_estimator, variant_center_estimator):
 
     def __call__(self, algname, ct_workload_space, rt_workload_space):
         variants = Config().variant_space(algname)
-        random.shuffle(variants)
 
         for ct_workload in ct_workload_space:
             for variant in variants: