Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 0bd499cb authored by Lucas Nussbaum's avatar Lucas Nussbaum Committed by Jonathan Pastor
Browse files

Rename cpuset_mapping to architecture/cpu_core_numbering

parent 32b77ff1
No related branches found
No related tags found
1 merge request!6WIP: Features/oar gpus
...@@ -9,9 +9,6 @@ class MissingProperty < StandardError; end ...@@ -9,9 +9,6 @@ class MissingProperty < StandardError; end
MiB = 1024**2 MiB = 1024**2
# CPU distribution can be: round-robin | continuous
DEFAULT_CPUSET_MAPPING = "continuous"
# GPU distribution can be: round-robin | continuous # GPU distribution can be: round-robin | continuous
DEFAULT_GPUSET_MAPPING = "continuous" DEFAULT_GPUSET_MAPPING = "continuous"
...@@ -1072,7 +1069,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s ...@@ -1072,7 +1069,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
gpu_count = first_node.key?("gpu_devices") ? first_node["gpu_devices"].length : 0 gpu_count = first_node.key?("gpu_devices") ? first_node["gpu_devices"].length : 0
cpu_model = "#{first_node['processor']['model']} #{first_node['processor']['version']}" cpu_model = "#{first_node['processor']['model']} #{first_node['processor']['version']}"
cpuset_mapping = first_node.key?("cpuset_mapping") ? first_node["cpuset_mapping"] : DEFAULT_CPUSET_MAPPING core_numbering = first_node['architecture']['cpu_core_numbering']
# Detect how 'GPUSETs' are distributed over CPUs/GPUs of servers of this cluster # Detect how 'GPUSETs' are distributed over CPUs/GPUs of servers of this cluster
gpuset_mapping = DEFAULT_GPUSET_MAPPING gpuset_mapping = DEFAULT_GPUSET_MAPPING
...@@ -1206,7 +1203,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s ...@@ -1206,7 +1203,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
gpu_idx += 1 gpu_idx += 1
end end
if cpuset_mapping == 'continuous' if core_numbering == 'continuous'
cpuset = 0 cpuset = 0
end end
...@@ -1278,7 +1275,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s ...@@ -1278,7 +1275,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
############################################ ############################################
# (2-d) Associate a cpuset to each core # (2-d) Associate a cpuset to each core
############################################ ############################################
if cpuset_mapping == 'continuous' if core_numbering == 'continuous'
row[:cpuset] = cpuset row[:cpuset] = cpuset
else else
# CPUSETs starts at 0 # CPUSETs starts at 0
...@@ -1310,7 +1307,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s ...@@ -1310,7 +1307,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
core_idx += 1 core_idx += 1
if cpuset_mapping == 'continuous' if core_numbering == 'continuous'
cpuset += 1 cpuset += 1
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment