From ed1377716fc3ea76500f64d12e6a5c40749a1b23 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Wed, 1 Jul 2020 16:58:29 +0200
Subject: [PATCH] [dev/oar-prop] Compute gpu_count over all nodes, not just the
first one
---
lib/refrepo/gen/oar-properties.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index 0fc32d8b39..0379d1aa15 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -1243,7 +1243,7 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
cpu_count = first_node['architecture']['nb_procs']
cpu_core_count = first_node['architecture']['nb_cores'] / cpu_count
cpu_thread_count = first_node['architecture']['nb_threads'] / cpu_count
- gpu_count = first_node.key?("gpu_devices") ? first_node["gpu_devices"].length : 0
+ gpu_count = cluster_desc_from_data_files['nodes'].values.map { |e| (e['gpu_devices'] || {} ).length }.max
cpu_model = "#{first_node['processor']['model']} #{first_node['processor']['version']}"
core_numbering = first_node['architecture']['cpu_core_numbering']
--
GitLab