From 42fdee4b543cab238493170229eb2e0a197fed13 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Fri, 5 Jun 2020 11:36:25 +0200
Subject: [PATCH] [lib] oar - do not genrate gpu ppty for orion (#10785)
---
lib/refrepo/gen/oar-properties.rb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index f83861004c..484a723f93 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -450,7 +450,10 @@ def get_ref_node_properties_internal(cluster_uid, cluster, node_uid, node)
h['memcpu'] = node['main_memory']['ram_size'] / node['architecture']['nb_procs']/MiB
h['memnode'] = node['main_memory']['ram_size'] / MiB
- if node.key?('gpu_devices')
+ if node.key?('gpu_devices') \
+ and h['cluster'] != 'orion'
+ # Do not generate GPU ppty for orion, cf #10785
+
# This forbids a node to host different GPU models ...
h['gpu_model'] = GPURef.getGrid5000LegacyNameFor(node['gpu_devices'].values[0]['model'])
h['gpu_count'] = node['gpu_devices'].length
--
GitLab