Fix constructor of Searchspace that was lost due to bad merge

Author: stijnh

kernel_tuner/searchspace.py

@@ -15,13 +15,13 @@ class Searchspace:
     """Class that offers the search space to strategies"""
 
     def __init__(
-        self,
-        tuning_options: dict,
-        max_threads: int,
-        build_neighbors_index=False,
-        neighbor_method=None,
-        sort=False,
-        sort_last_param_first=False,
+            self,
+            tune_params: dict,
+            restrictions,
+            max_threads: int,
+            block_size_names=default_block_size_names,
+            build_neighbors_index=False,
+            neighbor_method=None
     ) -> None:
         """Build a searchspace using the variables and constraints.
         Optionally build the neighbors index - only faster if you repeatedly look up neighbors. Methods:
@@ -47,9 +47,9 @@ def __init__(
         if neighbor_method is not None and neighbor_method != "Hamming":
             self.__prepare_neighbors_index()
         if build_neighbors_index:
-            self.neighbors_index = self.__build_neighbors_index(neighbor_method)
+            self.neighbors_index = self.__build_neighbors_index(neighbor_method, max_threads)
 
-    def __build_searchspace(self, sort: bool, sort_last_param_first: bool) -> Tuple[List[tuple], np.ndarray, dict, int]:
+    def __build_searchspace(self, block_size_names: list, max_threads: int) -> Tuple[List[tuple], np.ndarray, dict, int]:
         """compute valid configurations in a search space based on restrictions and max_threads, returns the searchspace, a dict of the searchspace for fast lookups and the size"""
 
         # instantiate the parameter space with all the variables

test/test_searchspace.py

@@ -53,7 +53,7 @@ def min_func(gpu1, gpu2, gpu3, gpu4):
 sort_tune_params["gpu2"] = list(range(num_layers))
 sort_tune_params["gpu3"] = list(range(num_layers))
 sort_tuning_options = Options(dict(restrictions=[], tune_params=sort_tune_params))
-searchspace_sort = Searchspace(sort_tuning_options.tune_params, sort_tuning_options.restrictions, max_threads)
+searchspace_sort = Searchspace(sort_tune_params, [], max_threads)
 
 def test_size():
     """test that the searchspace after applying restrictions is the expected size"""
@@ -73,7 +73,7 @@ def test_internal_representation():
 
 def test_sort():
     """test that the sort searchspace option works as expected"""
-    simple_searchspace_sort = Searchspace(simple_tuning_options, max_threads, sort=True, sort_last_param_first=False)
+    simple_searchspace_sort = Searchspace(simple_tuning_options.tune_params, simple_tuning_options.restrictions, max_threads, sort=True, sort_last_param_first=False)
     assert simple_searchspace_sort.list == [
         (1, 4, "string_1"),
         (1, 4, "string_2"),