additional zrw removal adjustments

Author: jlnav

docs/resource_manager/zero_resource_workers.rst

@@ -67,23 +67,3 @@ may be multiple nodes or a partition of a node in each resource set. If the spli
 is uneven, resource sets are not split between nodes. For example, if there are
 two nodes and five resource sets, one node will have three resource sets, and
 the other will have two.
-
-Placing zero-resource functions on a fixed worker
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If the generator must always be on worker one, then instead of using
-``num_resource_sets``, use the ``zero_resource_workers`` *libE_specs* option:
-
-.. code-block:: python
-
-    libE_specs["zero_resource_workers"] = [1]
-
-in the calling script and worker one will not be allocated resources. In general,
-set the parameter ``zero_resource_workers`` to a list of worker IDs that should not
-have resources assigned.
-
-This approach can be useful if running in
-:doc:`distributed mode<../platforms/platforms_index>`.
-
-The use of the ``zero_resource_workers`` *libE_specs* option must be supported by
-the allocation function, see :ref:`start_only_persistent<start_only_persistent_label>`)

libensemble/manager.py

@@ -396,7 +396,7 @@ def _set_resources(self, Work: dict, w: int) -> None:
 
         if rset_req is None:
             rset_team = []
-            default_rset = resource_manager.index_list[w - 1]  # type: ignore
+            default_rset = resource_manager.index_list[w]  # type: ignore
             if default_rset is not None:
                 rset_team.append(default_rset)
             Work["libE_info"]["rset_team"] = rset_team

libensemble/resources/rset_resources.py

@@ -41,17 +41,16 @@ def __init__(self, num_workers: int, resources: GlobalResources):
 
         Determines the compute resources available for each resource set.
 
-        Unless resource sets is set explicitly, the number of resource sets is the number of workers,
-        excluding any workers defined as zero resource workers.
+        Unless resource sets is set explicitly, the number of resource sets is the number of workers.
 
         Parameters
         ----------
 
         num_workers: int
             The total number of workers
 
-        resources: Resources
-            A Resources object containing global nodelist and intranode information
+        resources: GlobalResources
+            A GlobalResources object containing global nodelist and intranode information
 
         """
         self.num_workers = num_workers

libensemble/resources/worker_resources.py

@@ -111,7 +111,7 @@ def get_index_list(num_workers: int, num_rsets: int) -> list[int | None]:
                 index_list.append(None)
             else:
                 index_list.append(index)
-            index += 1
+                index += 1
         return index_list
 
 

libensemble/tests/functionality_tests/test_GPU_gen_resources.py

@@ -96,7 +96,6 @@
             # reset
             libE_specs = base_libE_specs.copy()
             libE_specs["gen_on_worker"] = gen_on_worker
-            libE_specs["zero_resource_workers"] = []  # perhaps the generator needs GPUs
 
             resourced_workers = (
                 nworkers if gen_on_worker else nworkers + 1

libensemble/tests/functionality_tests/test_mpi_runners.py

@@ -36,6 +36,7 @@
 
     libE_specs["dedicated_mode"] = True
     libE_specs["enforce_worker_core_bounds"] = True
+    libE_specs["gen_on_worker"] = True
 
     # To allow visual checking - log file not used in test
     log_file = "ensemble_mpi_runners_comms_" + str(comms) + "_wrks_" + str(nworkers) + ".log"

libensemble/tests/functionality_tests/test_persistent_uniform_gen_decides_stop.py

@@ -13,7 +13,7 @@
 
 # Do not change these lines - they are parsed by run-tests.sh
 # TESTSUITE_COMMS: mpi local
-# TESTSUITE_NPROCS: 3 5
+# TESTSUITE_NPROCS: 4 6
 # TESTSUITE_OS_SKIP: WIN
 
 import sys

libensemble/tests/functionality_tests/test_runlines_adaptive_workers_persistent.py

@@ -2,7 +2,7 @@
 Runs libEnsemble run-lines for adaptive workers with persistent gen.
 
 Default setup is designed to run on 4*N + 1 workers - to modify, change total_nodes.
-where one worker is a zero-resource persistent gen.
+where one worker is a persistent gen without assigned resources.
 
 Execute via one of the following commands (e.g. 9 workers):
    mpiexec -np 10 python test_runlines_adaptive_workers_persistent.py

libensemble/tests/functionality_tests/test_runlines_adaptive_workers_persistent_oversubscribe_rsets.py

@@ -2,7 +2,7 @@
 Runs libEnsemble run-lines for adaptive workers with persistent gen.
 
 Default setup is designed to run on 2*N + 1 workers - to modify, change total_nodes.
-where one worker is a zero-resource persistent gen.
+where one worker is a persistent gen without assigned resources.
 
 Execute via one of the following commands (e.g. 5 workers):
    mpiexec -np 6 python test_runlines_adaptive_workers_persistent_oversubscribe_rsets.py

libensemble/tests/unit_tests/test_allocation_funcs_and_support.py

@@ -35,19 +35,18 @@
 
 W_gen_mgr = np.array(
     [
-        (0, True, 0, 0, False, False),
-        (1, False, 0, 0, False, False),
-        (2, False, 0, 0, False, False),
-        (3, False, 0, 0, False, False),
-        (4, False, 0, 0, False, False),
+        (0, True, 0, 0, False),
+        (1, False, 0, 0, False),
+        (2, False, 0, 0, False),
+        (3, False, 0, 0, False),
+        (4, False, 0, 0, False),
     ],
     dtype=[
         ("worker_id", "<i8"),
         ("gen_worker", "?"),
         ("active", "<i8"),
         ("persis_state", "<i8"),
         ("active_recv", "?"),
-        ("zero_resource_worker", "?"),
     ],
 )
 
@@ -173,13 +172,6 @@ def test_als_worker_ids_with_gen_mgr():
         flag = 0
     assert flag == 0, "AllocSupport didn't error on invalid options for avail_worker_ids()"
 
-    W_zrw = W_gen_mgr.copy()
-    W_zrw["zero_resource_worker"] = np.array([True, 0, 0, 0, 0])
-    als = AllocSupport(W_zrw, True)
-    assert als.avail_worker_ids(zero_resource_workers=True) == [
-        0
-    ], "avail_worker_ids() didn't return expected zero resource worker list."
-
 
 def test_als_evaluate_gens():
     W_gens = W.copy()