Improved dynamic import of modules for custom strategies

Author: fjwillemsen

kernel_tuner/file_utils.py

@@ -305,16 +305,23 @@ def store_metadata_file(metadata_filename: str):
 
 def import_class_from_file(file_path: Path, class_name):
     """Import a class from a file."""
-    module_name = file_path.stem
-    spec = spec_from_file_location(module_name, file_path)
-    if spec is None:
-        raise ImportError(f"Could not load spec from {file_path}")
-    
-    # create a module from the spec and execute it
-    module = module_from_spec(spec)
-    spec.loader.exec_module(module)
-    if not hasattr(module, class_name):
-        raise ImportError(f"Module '{module_name}' has no class '{class_name}'")
+
+    def load_module(module_name):
+        spec = spec_from_file_location(module_name, file_path)
+        if spec is None:
+            raise ImportError(f"Could not load spec from {file_path}")
+        
+        # create a module from the spec and execute it
+        module = module_from_spec(spec)
+        spec.loader.exec_module(module)
+        if not hasattr(module, class_name):
+            raise ImportError(f"Module '{module_name}' has no class '{class_name}'")
+        return module
+
+    try:
+        module = load_module(file_path.stem)
+    except ImportError:
+        module = load_module(f"{file_path.parent.stem}.{file_path.stem}")
 
     # return the class from the module
     return getattr(module, class_name)

kernel_tuner/interface.py

@@ -902,10 +902,9 @@ def tune_kernel_T1(
         class_name: str = strategy
         assert opt_path.exists(), f"Custom search method path '{opt_path}' does not exist relative to current working directory {Path.cwd()}"
         optimizer_class = import_class_from_file(opt_path, class_name)
-        budget = strategy_options.get("max_fevals", 1e12)    # if not set, use a very large number to have it run out at the time limit
         filter_keys = ["custom_search_method_path", "max_fevals", "time_limit", "constraint_aware"]
         adjusted_strategy_options = {k:v for k, v in strategy_options.items() if k not in filter_keys}
-        optimizer_instance = optimizer_class(budget=budget, **adjusted_strategy_options)
+        optimizer_instance = optimizer_class(**adjusted_strategy_options)
         strategy = OptAlgWrapper(optimizer_instance)
 
     # set the cache path
@@ -973,6 +972,8 @@ def tune_kernel_T1(
         elif arg["MemoryType"] == "Scalar":
             if arg["Type"] == "float":
                 argument = numpy.float32(arg["FillValue"])
+            elif arg["Type"] == "int32":
+                argument = numpy.int32(arg["FillValue"])
             else:
                 raise NotImplementedError()
         if argument is not None: