Fix random_sample incorrectly sampling too many configurations

Author: stijnh

kernel_tuner/interface.py

@@ -630,6 +630,9 @@ def tune_kernel(
         if "searchspace_construction_options" in strategy_options:
             searchspace_construction_options = strategy_options["searchspace_construction_options"]         
 
+    tuning_options["time_limit"] = time_limit  # TODO: Is this used?
+    tuning_options["max_fevals"] = max_fevals  # TODO: Is this used?
+    
     # log the user inputs
     logging.debug("tune_kernel called")
     logging.debug("kernel_options: %s", util.get_config_string(kernel_options))
@@ -720,11 +723,8 @@ def preprocess_cache(filepath):
         logging.info(f"evaluation limit has been adjusted from {max_fevals} to {searchspace.size} (search space size)")
         max_fevals = searchspace.size
 
-    # Create the budget. Add the time spent on startup to the budget
-    budget = util.TuningBudget(time_limit, max_fevals)
-    tuning_options["time_limit"] = time_limit  # TODO: Is this used?
-    tuning_options["max_fevals"] = max_fevals  # TODO: Is this used?
-    tuning_options["budget"] = budget
+    # Create the budget
+    tuning_options["budget"] = util.TuningBudget(time_limit, max_fevals)
 
 
     # call the strategy to execute the tuning process

test/strategies/test_common.py

@@ -7,7 +7,7 @@
 from kernel_tuner.searchspace import Searchspace
 from kernel_tuner.strategies import common
 from kernel_tuner.strategies.common import CostFunc
-from kernel_tuner.util import StopCriterionReached
+from kernel_tuner.util import StopCriterionReached, TuningBudget
 
 try:
     from mock import Mock
@@ -30,7 +30,7 @@ def fake_runner():
 
 def test_cost_func():
     x = [1, 4]
-    tuning_options = Options(scaling=False, snap=False, tune_params=tune_params,
+    tuning_options = Options(tune_params=tune_params, budget=TuningBudget(),
                              restrictions=None, strategy_options={}, cache={}, unique_results={},
                              objective="time", objective_higher_is_better=False, metrics=None)
     runner = fake_runner()
@@ -41,7 +41,7 @@ def test_cost_func():
     # check if restrictions are properly handled
     def restrictions(x, y):
         return False
-    tuning_options = Options(scaling=False, snap=False, tune_params=tune_params,
+    tuning_options = Options(tune_params=tune_params, budget=TuningBudget(),
                              restrictions=restrictions, strategy_options={},
                              verbose=True, cache={}, unique_results={},
                              objective="time", objective_higher_is_better=False, metrics=None)