Various improvements to the handling of budget and return values in pyatf strategies

Author: fjwillemsen

kernel_tuner/strategies/pyatf_strategies.py

@@ -15,7 +15,7 @@ def tune(searchspace: Searchspace, runner, tuning_options):
     from pyatf.search_techniques.search_technique import SearchTechnique
 
     # setup the Kernel Tuner functionalities
-    cost_func = CostFunc(searchspace, tuning_options, runner, scaling=True, snap=True)
+    cost_func = CostFunc(searchspace, tuning_options, runner, scaling=True, snap=True, return_invalid=True)
     # using this instead of get_bounds because scaling is used
     bounds, _, eps = cost_func.get_bounds_x0_eps()
 
@@ -39,10 +39,11 @@ def tune(searchspace: Searchspace, runner, tuning_options):
     get_next_coordinates_or_indices = search_technique.get_next_coordinates
     coordinates_or_indices = set()  # Set[Union[Coordinates, Index]]
     costs = {}   # Dict[Union[Coordinates, Index], Cost]
+    eval_count = 0
 
     try:
         # optimization loop (KT-compatible re-implementation of `make_step` from TuningRun)
-        while True:
+        while eval_count < searchspace.size:
 
             # get new coordinates
             if not coordinates_or_indices:
@@ -62,13 +63,14 @@ def tune(searchspace: Searchspace, runner, tuning_options):
                 coords_or_index = tuple(b[0]+c*(b[1]-b[0]) for c, b in zip(coords_or_index, bounds) if c is not None)
 
             # evaluate the configuration
-            opt_result = cost_func(coords_or_index) 
+            opt_result = cost_func(coords_or_index)
 
             # adjust opt_result to expected PyATF output in cost and valid
             if not isinstance(opt_result, (int, float)):
                 valid = False
             else:
                 cost = opt_result
+                eval_count += 1
 
             # record the evaluation
             costs[coords_or_index] = cost