From 09b4bc5577f639cb1ad399b2e7f733a772d0a193 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Fri, 28 Jun 2024 18:23:31 +0200 Subject: [PATCH] Make more explicit how we only alter test.default_num_cpus_per_core on hyperthreading-enabled systems --- eessi/testsuite/hooks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eessi/testsuite/hooks.py b/eessi/testsuite/hooks.py index 8688f2e7..413ccf79 100644 --- a/eessi/testsuite/hooks.py +++ b/eessi/testsuite/hooks.py @@ -108,7 +108,9 @@ def assign_tasks_per_compute_unit(test: rfm.RegressionTest, compute_unit: str, n if SCALES[test.scale].get('num_cpus_per_node') is not None and compute_unit != COMPUTE_UNIT[HWTHREAD]: check_proc_attribute_defined(test, 'num_cpus_per_core') num_cpus_per_core = test.current_partition.processor.num_cpus_per_core - test.default_num_cpus_per_node = test.default_num_cpus_per_node * num_cpus_per_core + # On a hyperthreading system? + if num_cpus_per_core > 1: + test.default_num_cpus_per_node = test.default_num_cpus_per_node * num_cpus_per_core if FEATURES[GPU] in test.current_partition.features: _assign_default_num_gpus_per_node(test)