Skip to content

[bugfix] Fix nodelist compaction for single digitless nodes #2689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2022
Merged

[bugfix] Fix nodelist compaction for single digitless nodes #2689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c59457f
Fix nodelist compaction for single digitless nodes
vkarak Nov 24, 2022
1d38961
Merge branch 'master' into bugfix/nodelist-failure-report
vkarak Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion reframe/utility/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,9 @@ def add(self, nid):
self.__nodes.append(nid)

def __str__(self):
if not self.__nodes:
return self.__name

abbrev = []
encoded = _rl_encode(_delta_encode(self.nodes))
for unit in encoded:
Expand Down Expand Up @@ -920,7 +923,8 @@ def nodelist_abbrev(nodes):
basename, width, nid = _parse_node(n)
ng = _NodeGroup(basename, width)
node_groups.setdefault(ng, ng)
node_groups[ng].add(nid)
if nid is not None:
node_groups[ng].add(nid)

return ','.join(str(ng) for ng in node_groups)

Expand Down
2 changes: 2 additions & 0 deletions unittests/test_utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,6 +1800,8 @@ def test_nodelist_utilities():
assert nodelist(['nid01', 'nid10', 'nid20']) == 'nid01,nid10,nid20'
assert nodelist([]) == ''
assert nodelist(['nid001']) == 'nid001'
assert nodelist(['node']) == 'node'
assert nodelist(['nid001', 'node', 'nid002']) == 'nid00[1-2],node'

# Test the reverse operation
assert expand('nid00[0-4],nid01[0-4],nid02[0-4]') == sorted(nid_nodes)
Expand Down