also store problem size in cache

Author: benvanwerkhoven

kernel_tuner/util.py

@@ -728,6 +728,7 @@ def process_cache(cache, kernel_options, tuning_options, runner):
 
         { device_name: "name of device"
           kernel_name: "name of kernel"
+          problem_size: (int, int, int)
           tune_params_keys: list
           tune_params:
           cache: {
@@ -754,6 +755,7 @@ def process_cache(cache, kernel_options, tuning_options, runner):
         c = OrderedDict()
         c["device_name"] = runner.dev.name
         c["kernel_name"] = kernel_options.kernel_name
+        c["problem_size"] = kernel_options.problem_size if not callable(kernel_options.problem_size) else "callable"
         c["tune_params_keys"] = list(tuning_options.tune_params.keys())
         c["tune_params"] = tuning_options.tune_params
         c["cache"] = {}
@@ -780,6 +782,11 @@ def process_cache(cache, kernel_options, tuning_options, runner):
             raise ValueError("Cannot load cache which contains results for different device")
         if cached_data["kernel_name"] != kernel_options.kernel_name:
             raise ValueError("Cannot load cache which contains results for different kernel")
+        if "problem_size" in cached_data and not callable(kernel_options.problem_size):
+            # cache returns list, problem_size is likely a tuple. Therefore, the next check
+            # checks the equality of all items in the list/tuples individually
+            if not all([i == j for i, j in zip(cached_data["problem_size"], kernel_options.problem_size)]):
+                raise ValueError("Cannot load cache which contains results for different problem_size")
         if cached_data["tune_params_keys"] != list(tuning_options.tune_params.keys()):
             raise ValueError("Cannot load cache which contains results obtained with different tunable parameters")
 

test/test_util_functions.py

@@ -549,7 +549,7 @@ def assert_open_cachefile_is_correctly_parsed(cache):
     cache = get_temp_filename(suffix=".json")
     delete_temp_file(cache)
 
-    kernel_options = Options(kernel_name="test_kernel")
+    kernel_options = Options(kernel_name="test_kernel", problem_size=(1, 2))
     tuning_options = Options(cache=cache, tune_params=Options(x=[1, 2, 3, 4]), simulation_mode=False)
     runner = Options(dev=Options(name="test_device"), simulation_mode=False)