Skip to content

Commit b235614

Browse files
committed
index-list shouldn't consider worker0 - revert unit test changes
1 parent 1ddebbb commit b235614

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ repos:
3737
rev: v1.19.1
3838
hooks:
3939
- id: mypy
40-
exclude: ^libensemble/utils/(launcher|loc_stack|runners|pydantic|output_directory)\.py$|^libensemble/tests/regression_tests/support\.py$|^libensemble/tests/functionality_tests/
40+
exclude: ^libensemble/utils/(launcher|loc_stack|runners|pydantic|output_directory)\.py$|^libensemble/tests/regression_tests/support\.py$|^libensemble/tests/functionality_tests/|^libensemble/tests/unit_tests/

libensemble/resources/worker_resources.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def get_index_list(num_workers: int, num_rsets: int, zero_resource_list: list[in
106106
"""Map WorkerID to index into a nodelist"""
107107
index = 0
108108
index_list: list[int | None] = []
109-
for i in range(0, num_workers):
109+
for i in range(1, num_workers + 1):
110110
if i in zero_resource_list:
111111
index_list.append(None)
112112
else:

libensemble/tests/unit_tests/test_resources.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -694,23 +694,23 @@ def test_map_workerid_to_index():
694694

695695
zero_resource_list = []
696696
index_list = ResourceManager.get_index_list(num_workers, num_rsets, zero_resource_list)
697-
for workerID in range(0, num_workers):
698-
index = index_list[workerID]
699-
assert index == workerID, "index incorrect. Received: " + str(index)
700-
701-
zero_resource_list = [0]
702-
index_list = ResourceManager.get_index_list(num_workers, num_rsets, zero_resource_list)
703-
for workerID in range(1, num_workers):
704-
index = index_list[workerID]
697+
for workerID in range(1, num_workers + 1):
698+
index = index_list[workerID - 1]
705699
assert index == workerID - 1, "index incorrect. Received: " + str(index)
706700

707-
zero_resource_list = [0, 1]
701+
zero_resource_list = [1]
708702
index_list = ResourceManager.get_index_list(num_workers, num_rsets, zero_resource_list)
709-
for workerID in range(2, num_workers):
710-
index = index_list[workerID]
703+
for workerID in range(2, num_workers + 1):
704+
index = index_list[workerID - 1]
711705
assert index == workerID - 2, "index incorrect. Received: " + str(index)
712706

713-
zero_resource_list = [0, 2]
707+
zero_resource_list = [1, 2]
708+
index_list = ResourceManager.get_index_list(num_workers, num_rsets, zero_resource_list)
709+
for workerID in range(3, num_workers + 1):
710+
index = index_list[workerID - 1]
711+
assert index == workerID - 3, "index incorrect. Received: " + str(index)
712+
713+
zero_resource_list = [1, 3]
714714
index_list = ResourceManager.get_index_list(num_workers, num_rsets, zero_resource_list)
715715

716716
workerID = 2

0 commit comments

Comments
 (0)