if gen_on_worker is True, then [0] needs to be removed as the default zero-resource-worker. [0] shouldn't factor into the math for get_workers2assign2

Author: jlnav

libensemble/resources/rset_resources.py

@@ -130,7 +130,7 @@ def get_rsets_on_a_node(num_rsets, resources):
     def get_workers2assign2(num_workers, resources):
         """Returns workers to assign resources to"""
         zero_resource_list = resources.zero_resource_workers
-        return num_workers - len(zero_resource_list)
+        return num_workers - len(zero_resource_list) if resources.zero_resource_workers != [0] else num_workers
 
     @staticmethod
     def even_assignment(nnodes, nworkers):

libensemble/tests/functionality_tests/test_1d_splitcomm.py

@@ -34,6 +34,7 @@
     libE_specs["H_file_prefix"] = "splitcomm_" + str(sub_comm_number)
     libE_specs["safe_mode"] = False
     libE_specs["disable_log_files"] = True
+    libE_specs["gen_on_worker"] = True
 
     sim_specs = {
         "sim_f": sim_f,

libensemble/utils/pydantic_bindings.py

@@ -7,6 +7,7 @@
 from libensemble import specs
 from libensemble.resources import platforms
 from libensemble.utils.validators import (
+    check_adjust_zrw_on_gen_on_worker,
     check_any_workers_and_disable_rm_if_tcp,
     check_exit_criteria,
     check_gpu_setting_type,
@@ -95,6 +96,7 @@
             "set_default_comms": set_default_comms,
             "set_workflow_dir": set_workflow_dir,
             "set_calc_dirs_on_input_dir": set_calc_dirs_on_input_dir,
+            "check_adjust_zrw_on_gen_on_worker": check_adjust_zrw_on_gen_on_worker,
         },
     )
 

libensemble/utils/specs_checkers.py

@@ -100,3 +100,10 @@ def _check_logical_cores(values):
             scg(values, "logical_cores_per_node") % scg(values, "cores_per_node") == 0
         ), "Logical cores doesn't divide evenly into cores"
     return values
+
+
+def _check_adjust_zrw_on_gen_on_worker(values):
+    """When gen_on_worker is set the default zero_resource_worker value complicates resources"""
+    if scg(values, "gen_on_worker") and scg(values, "zero_resource_workers") == [0]:
+        scs(values, "zero_resource_workers", [])
+    return values

libensemble/utils/validators.py

@@ -7,6 +7,7 @@
 
 from libensemble.resources.platforms import Platform
 from libensemble.utils.specs_checkers import (
+    _check_adjust_zrw_on_gen_on_worker,
     _check_any_workers_and_disable_rm_if_tcp,
     _check_exit_criteria,
     _check_H0,
@@ -117,6 +118,11 @@ def check_mpi_runner_type(cls, value):
 check_mpi_runner_type = field_validator("mpi_runner")(classmethod(check_mpi_runner_type))
 
 
+@model_validator(mode="after")
+def check_adjust_zrw_on_gen_on_worker(self):
+    return _check_adjust_zrw_on_gen_on_worker(self)
+
+
 @model_validator(mode="after")
 def check_any_workers_and_disable_rm_if_tcp(self):
     return _check_any_workers_and_disable_rm_if_tcp(self)