Putting skipping of canceling points into support

Author: jmlarson1

libensemble/alloc_funcs/fast_alloc.py

@@ -33,9 +33,7 @@ def give_sim_work_first(W, H, sim_specs, gen_specs, alloc_specs, persis_info, li
     gen_in = gen_specs.get("in", [])
 
     for wid in support.avail_worker_ids():
-        # Skip any cancelled points
-        while persis_info["next_to_give"] < len(H) and H[persis_info["next_to_give"]]["cancel_requested"]:
-            persis_info["next_to_give"] += 1
+        persis_info = support.skip_canceled_points(H, persis_info)
 
         # Give sim work if possible
         if persis_info["next_to_give"] < len(H):

libensemble/alloc_funcs/give_pregenerated_work.py

@@ -24,9 +24,7 @@ def give_pregenerated_sim_work(W, H, sim_specs, gen_specs, alloc_specs, persis_i
         return Work, persis_info, 1
 
     for i in support.avail_worker_ids():
-        # Skip any cancelled points
-        while persis_info["next_to_give"] < len(H) and H[persis_info["next_to_give"]]["cancel_requested"]:
-            persis_info["next_to_give"] += 1
+        persis_info = support.skip_canceled_points(H, persis_info)
 
         # Give sim work
         try:

libensemble/alloc_funcs/only_one_gen_alloc.py

@@ -22,9 +22,7 @@ def ensure_one_active_gen(W, H, sim_specs, gen_specs, alloc_specs, persis_info,
     gen_in = gen_specs.get("in", [])
 
     for wid in support.avail_worker_ids():
-        # Skip any cancelled points
-        while persis_info["next_to_give"] < len(H) and H[persis_info["next_to_give"]]["cancel_requested"]:
-            persis_info["next_to_give"] += 1
+        persis_info = support.skip_canceled_points(H, persis_info)
 
         if persis_info["next_to_give"] < len(H):
             try:

libensemble/alloc_funcs/persistent_aposmm_alloc.py

@@ -54,9 +54,7 @@ def persistent_aposmm_alloc(W, H, sim_specs, gen_specs, alloc_specs, persis_info
                 returned_but_not_given[point_ids] = False
 
     for wid in support.avail_worker_ids(persistent=False):
-        # Skip any cancelled points
-        while persis_info["next_to_give"] < len(H) and H[persis_info["next_to_give"]]["cancel_requested"]:
-            persis_info["next_to_give"] += 1
+        persis_info = support.skip_canceled_points(H, persis_info)
 
         if persis_info["next_to_give"] < len(H):
             # perform sim evaluations (if they exist in History).

libensemble/tools/alloc_support.py

@@ -366,6 +366,13 @@ def points_by_priority(self, H, points_avail, batch=False):
             q_inds = 0
         return np.nonzero(points_avail)[0][q_inds]
 
+    def skip_canceled_points(self, H, persis_info):
+        """Increments the "next_to_give" field in persis_info to skip any cancelled points"""
+        while persis_info["next_to_give"] < len(H) and H[persis_info["next_to_give"]]["cancel_requested"]:
+            persis_info["next_to_give"] += 1
+
+        return persis_info
+
     @staticmethod
     def _check_H_rows(H_rows):
         """Ensure H_rows is a numpy array.  If it is not, then convert if possible,