force error on unsupported options

Author: benvanwerkhoven

kernel_tuner/strategies/brute_force.py

@@ -6,6 +6,9 @@
 
 def tune(searchspace: Searchspace, runner, tuning_options):
 
+    # Force error on unsupported options
+    common.get_options(tuning_options.strategy_options or [], _options, unsupported=["max_fevals", "time_limit", "x0", "searchspace_construction_options"])
+
     # call the runner
     return runner.run(searchspace.sorted_list(), tuning_options)
 

kernel_tuner/strategies/common.py

@@ -43,9 +43,12 @@ def make_strategy_options_doc(strategy_options):
     return doc
 
 
-def get_options(strategy_options, options):
+def get_options(strategy_options, options, unsupported=None):
     """Get the strategy-specific options or their defaults from user-supplied strategy_options."""
     accepted = list(options.keys()) + ["max_fevals", "time_limit", "x0", "searchspace_construction_options"]
+    if unsupported:
+        for key in unsupported:
+            accepted.remove(key)
     for key in strategy_options:
         if key not in accepted:
             raise ValueError(f"Unrecognized option {key} in strategy_options (allowed: {accepted})")

kernel_tuner/strategies/random_sample.py

@@ -11,7 +11,7 @@
 
 def tune(searchspace: Searchspace, runner, tuning_options):
     # get the samples
-    fraction = common.get_options(tuning_options.strategy_options, _options)[0]
+    fraction = common.get_options(tuning_options.strategy_options, _options, unsupported=["x0"])[0]
     assert 0 <= fraction <= 1.0
     num_samples = int(np.ceil(searchspace.size * fraction))
 

test/strategies/test_strategies.py

@@ -44,7 +44,9 @@ def test_strategies(vector_add, strategy):
         filter_options = {opt:val for opt, val in options.items() if opt in kernel_tuner.interface.strategy_map[strategy]._options}
     else:
         filter_options = options
-    filter_options["max_fevals"] = 10
+
+    if strategy != "brute_force":
+        filter_options["max_fevals"] = 10
 
     results, _ = kernel_tuner.tune_kernel(*vector_add, strategy=strategy, strategy_options=filter_options,
                                          verbose=False, cache=cache_filename, simulation_mode=True)

test/test_time_budgets.py

@@ -69,9 +69,11 @@ def test_some_time_budget(env):
 @skip_if_no_gcc
 def test_full_time_budget(env):
     """Ensure that given ample time budget, the entire space is explored."""
-    res, _ = tune_kernel(*env, strategy="brute_force", strategy_options={"time_limit": 10.0})
 
     # Ensure that the entire space is explored.
     tune_params = env[-1]
     size_all = len(list(product(*tune_params.values())))
+
+    res, _ = tune_kernel(*env, strategy="random_sample", strategy_options={"fraction": 1.0, "time_limit": 10.0})
+
     assert len(res) == size_all