Changed to cached neighbor lookup now multiple methods are cached simultaneously

Author: fjwillemsen

kernel_tuner/strategies/common.py

@@ -375,7 +375,7 @@ def unscale_and_snap_to_nearest_valid(x, params, searchspace, eps):
 
 def get_neighbors(params, searchspace):
     for neighbor_method in ["strictly-adjacent", "adjacent", "Hamming"]:
-        neighbors = searchspace.get_neighbors_no_cache(tuple(params), neighbor_method=neighbor_method)
+        neighbors = searchspace.get_neighbors(tuple(params), neighbor_method=neighbor_method)
         if len(neighbors) > 0:
             return neighbors
     return []

kernel_tuner/strategies/genetic_algorithm.py

@@ -161,7 +161,7 @@ def mutate(self, dna, cache=False):
                 if cache:
                     neighbors = self.searchspace.get_neighbors(tuple(dna), neighbor_method="Hamming")
                 else:
-                    neighbors = self.searchspace.get_neighbors_no_cache(tuple(dna), neighbor_method="Hamming")
+                    neighbors = self.searchspace.get_neighbors(tuple(dna), neighbor_method="Hamming")
                 if len(neighbors) > 0:
                     return list(random.choice(neighbors))
             else:
@@ -185,7 +185,7 @@ def repair(self, dna):
             # search for valid configurations neighboring this config
             # start from strictly-adjacent to increasingly allowing more neighbors
             for neighbor_method in ["strictly-adjacent", "adjacent", "Hamming"]:
-                neighbors = self.searchspace.get_neighbors_no_cache(tuple(dna), neighbor_method=neighbor_method)
+                neighbors = self.searchspace.get_neighbors(tuple(dna), neighbor_method=neighbor_method)
 
                 # if we have found valid neighboring configurations, select one at random
                 if len(neighbors) > 0:

kernel_tuner/strategies/greedy_ils.py

@@ -60,7 +60,7 @@ def tune(searchspace: Searchspace, runner, tuning_options):
 tune.__doc__ = common.get_strategy_docstring("Greedy Iterative Local Search (ILS)", _options)
 
 def mutate(indiv, searchspace: Searchspace):
-    neighbors = searchspace.get_neighbors_no_cache(tuple(indiv), neighbor_method="Hamming")
+    neighbors = searchspace.get_neighbors(tuple(indiv), neighbor_method="Hamming")
     return list(random_choice(neighbors))
 
 

kernel_tuner/strategies/simulated_annealing.py

@@ -117,7 +117,7 @@ def neighbor(pos, searchspace: Searchspace, constraint_aware=True):
 
     def random_neighbor(pos, method):
         """Helper method to return a random neighbor."""
-        neighbors = searchspace.get_neighbors_no_cache(pos, neighbor_method=method)
+        neighbors = searchspace.get_neighbor(pos, neighbor_method=method)
         if not neighbors:
             return pos
         return random.choice(neighbors)