Merge pull request #94 from smoors/more_scales

add scales 1_cpn_2_nodes and 1_cpn_4_nodes
EESSI · Nov 16, 2023 · 1ba51dc · 1ba51dc
2 parents 276b435 + 85128a6
commit 1ba51dc
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/eessi/testsuite/constants.py b/eessi/testsuite/constants.py
@@ -38,18 +38,23 @@
 }
 
 SCALES = {
-        # required keys:
-        # - num_nodes
-        # - either node_part or (num_cpus_per_node and num_gpus_per_node)
-        '1_core': {'num_nodes': 1, 'num_cpus_per_node': 1, 'num_gpus_per_node': 1},
-        '2_cores': {'num_nodes': 1, 'num_cpus_per_node': 2, 'num_gpus_per_node': 1},
-        '4_cores': {'num_nodes': 1, 'num_cpus_per_node': 4, 'num_gpus_per_node': 1},
-        '1_8_node': {'num_nodes': 1, 'node_part': 8},  # 1/8 node
-        '1_4_node': {'num_nodes': 1, 'node_part': 4},  # 1/4 node
-        '1_2_node': {'num_nodes': 1, 'node_part': 2},  # 1/2 node
-        '1_node': {'num_nodes': 1, 'node_part': 1},
-        '2_nodes': {'num_nodes': 2, 'node_part': 1},
-        '4_nodes': {'num_nodes': 4, 'node_part': 1},
-        '8_nodes': {'num_nodes': 8, 'node_part': 1},
-        '16_nodes': {'num_nodes': 16, 'node_part': 1},
+    # required keys:
+    # - num_nodes
+    # - either node_part or (num_cpus_per_node and num_gpus_per_node)
+    # num_cpus_per_node and num_gpus_per_node are upper limits:
+    # the actual count depends on the specific configuration of cores, gpus, and sockets within the node,
+    # as well as the specific test being carried out.
+    '1_core': {'num_nodes': 1, 'num_cpus_per_node': 1, 'num_gpus_per_node': 1},
+    '2_cores': {'num_nodes': 1, 'num_cpus_per_node': 2, 'num_gpus_per_node': 1},
+    '4_cores': {'num_nodes': 1, 'num_cpus_per_node': 4, 'num_gpus_per_node': 1},
+    '1_cpn_2_nodes': {'num_nodes': 2, 'num_cpus_per_node': 1, 'num_gpus_per_node': 1},
+    '1_cpn_4_nodes': {'num_nodes': 4, 'num_cpus_per_node': 1, 'num_gpus_per_node': 1},
+    '1_8_node': {'num_nodes': 1, 'node_part': 8},  # 1/8 node
+    '1_4_node': {'num_nodes': 1, 'node_part': 4},  # 1/4 node
+    '1_2_node': {'num_nodes': 1, 'node_part': 2},  # 1/2 node
+    '1_node': {'num_nodes': 1, 'node_part': 1},
+    '2_nodes': {'num_nodes': 2, 'node_part': 1},
+    '4_nodes': {'num_nodes': 4, 'node_part': 1},
+    '8_nodes': {'num_nodes': 8, 'node_part': 1},
+    '16_nodes': {'num_nodes': 16, 'node_part': 1},
 }