Merge pull request #1243 from Libensemble/cleanup/simplify_feb24

Cleanup/simplify feb24

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/resources/gpu_detect.py

@@ -48,30 +48,17 @@ def rocm_smi():
     return gpu_count
 
 
-def zeinfo():
+def zeinfo(string="Number of devices", except_val=None):
     """Detect GPU from zeinfo or return None"""
     try:
         ps = subprocess.Popen(("zeinfo"), stderr=subprocess.PIPE)
-        output = subprocess.check_output(("grep", "Number of devices"), stdin=ps.stderr)
+        output = subprocess.check_output(("grep", string), stdin=ps.stderr)
         gpu_count = int(output.decode().split()[3])
     except Exception:
-        return None
+        return except_val
     return gpu_count
 
 
-def get_num_tiles():
-    """Get number of tiles on GPU if available"""
-
-    # Currently only relevant to Intel GPUs
-    try:
-        ps = subprocess.Popen(("zeinfo"), stderr=subprocess.PIPE)
-        output = subprocess.check_output(("grep", "Number of sub-devices"), stdin=ps.stderr)
-        tile_count = int(output.decode().split()[3])
-    except Exception:
-        return 1
-    return tile_count
-
-
 METHODS = {
     "pynvml": pynvml,
     "nvidia_smi": nvidia_smi,

libensemble/resources/resources.py

@@ -9,7 +9,7 @@
 
 from libensemble.resources import node_resources
 from libensemble.resources.env_resources import EnvResources
-from libensemble.resources.gpu_detect import get_num_tiles
+from libensemble.resources.gpu_detect import zeinfo
 from libensemble.resources.mpi_resources import get_MPI_runner
 from libensemble.resources.worker_resources import ResourceManager, WorkerResources
 
@@ -179,7 +179,7 @@ def __init__(self, libE_specs: dict, platform_info: dict = {}, top_level_dir: st
         self.tiles_per_gpu = 1
         if libE_specs.get("use_tiles_as_gpus", False):
             # Not yet detected so only uses tiles if set in platform_info
-            self.tiles_per_gpu = platform_info.get("tiles_per_gpu") or get_num_tiles()
+            self.tiles_per_gpu = platform_info.get("tiles_per_gpu") or zeinfo("Number of sub-devices", except_val=1)
 
         node_file = resource_info.get("node_file", None)
         nodelist_env_slurm = resource_info.get("nodelist_env_slurm", None)

libensemble/sim_funcs/chwirut1.py

@@ -224,17 +224,20 @@
 # fmt: on
 
 
+def func_def(x, i):
+    return y[i] - np.exp(-x[0] * t[i]) / (x[1] + x[2] * t[i])
+
+
 def EvaluateFunction(x, component=np.nan):
     """
     Evaluates the chwirut function
     """
     if np.isnan(component):
         f = np.zeros(NOBSERVATIONS)
         for i in range(NOBSERVATIONS):
-            f[i] = y[i] - np.exp(-x[0] * t[i]) / (x[1] + x[2] * t[i])
+            f[i] = func_def(x, i)
     else:
-        i = component
-        f = y[i] - np.exp(-x[0] * t[i]) / (x[1] + x[2] * t[i])
+        f = func_def(x, component)
 
     return f
 

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,