Skip to content

add total iteration count to trace output #4919

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
boegel merged 7 commits into from
Jul 3, 2025
Merged

add total iteration count to trace output #4919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85c9fd2
add total iteration count to trace output
Jun 12, 2025
066d140
calculate number of iterations in init
Jun 12, 2025
93305b0
try to fix
Jun 13, 2025
2097b87
drop number
smoors Jun 18, 2025
f2457b6
drop number
smoors Jun 18, 2025
b65d97e
drop number
smoors Jun 18, 2025
3e90216
drop number
smoors Jun 18, 2025
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
10 changes: 7 additions & 3 deletions easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,9 @@ def __init__(self, ec, logfile=None):
# initialize logger
self._init_log()

# number of iterations
self.iter_cnt = self.det_iter_cnt()

# try and use the specified group (if any)
group_name = build_option('group')
group_spec = self.cfg['group']
Expand Down Expand Up @@ -2387,7 +2390,8 @@ def handle_iterate_opts(self):
self.log.debug("Iterating opt %s: %s", opt, self.iter_opts[opt])

if self.iter_opts:
print_msg("starting iteration #%s ..." % self.iter_idx, log=self.log, silent=self.silent)
print_msg(f"starting iteration {self.iter_idx + 1}/{self.iter_cnt} ...", log=self.log,
silent=self.silent)
self.log.info("Current iteration index: %s", self.iter_idx)

# pop first element from all iterative easyconfig parameters as next value to use
Expand Down Expand Up @@ -2429,7 +2433,7 @@ def det_iter_cnt(self):

# we need to take into account that builddependencies is always a list
# we're only iterating over it if it's a list of lists
builddeps = self.cfg['builddependencies']
builddeps = self.cfg.get_ref('builddependencies')
if all(isinstance(x, list) for x in builddeps):
iter_opt_counts.append(len(builddeps))

Expand Down Expand Up @@ -4794,7 +4798,7 @@ def run_all_steps(self, run_test_cases):
if self.cfg['stop'] == 'cfg':
return True

steps = self.get_steps(run_test_cases=run_test_cases, iteration_count=self.det_iter_cnt())
steps = self.get_steps(run_test_cases=run_test_cases, iteration_count=self.iter_cnt)

# figure out how many steps will actually be run (not be skipped)
step_cnt = 0
Expand Down
6 changes: 3 additions & 3 deletions test/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ def test_handle_iterate_opts(self):
stdout = self.get_stdout()
self.mock_stdout(False)
self.assertEqual(eb.iter_idx, 0)
self.assertEqual(stdout, "== starting iteration #0 ...\n")
self.assertEqual(stdout, "== starting iteration 1/3 ...\n")
self.assertEqual(eb.cfg.iterating, True)
self.assertEqual(eb.cfg.iterate_options, ['configopts'])
self.assertEqual(eb.cfg['configopts'], "--opt1 --anotheropt")
Expand All @@ -1205,7 +1205,7 @@ def test_handle_iterate_opts(self):
stdout = self.get_stdout()
self.mock_stdout(False)
self.assertEqual(eb.iter_idx, 1)
self.assertEqual(stdout, "== starting iteration #1 ...\n")
self.assertEqual(stdout, "== starting iteration 2/3 ...\n")
self.assertEqual(eb.cfg.iterating, True)
self.assertEqual(eb.cfg.iterate_options, ['configopts'])
# preconfigopts should have been restored (https://github.com/easybuilders/easybuild-framework/pull/4848)
Expand All @@ -1218,7 +1218,7 @@ def test_handle_iterate_opts(self):
stdout = self.get_stdout()
self.mock_stdout(False)
self.assertEqual(eb.iter_idx, 2)
self.assertEqual(stdout, "== starting iteration #2 ...\n")
self.assertEqual(stdout, "== starting iteration 3/3 ...\n")
self.assertEqual(eb.cfg.iterating, True)
self.assertEqual(eb.cfg.iterate_options, ['configopts'])
self.assertEqual(eb.cfg['configopts'], "--opt3 --optbis")
Expand Down