Skip to content

Commit 1d05197

Browse files
committed
Revert "Revert "[oar-properties] add the gpu and gpudevice OAR properties.""
This reverts commit bd3aeea.
1 parent 9a32d73 commit 1d05197

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

lib/refrepo/gen/wiki/generators/oar_properties.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ def initialize(page_name)
4343
"description" => "The ID of the CPU the resource is part of. The unique scope is the OAR server. ",
4444
"possible_values" => "1, 2, 3, ..."
4545
},
46+
"gpu" => {
47+
"description" => "The ID of the GPU the resource is part of. The unique scope is the OAR server. ",
48+
"possible_values" => "1, 2, 3, ..."
49+
},
4650
"host" => {
4751
"description" => "A user-friendly name for the network_address property",
4852
"possible_values" => "dahu-1.grenoble.grid5000.fr, ..."

lib/refrepo/valid/oar-properties.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
IGNORED_PROPERTIES=%w{}
88

99
# Propriétés qui devraient être présentes
10-
G5K_PROPERTIES=%w{api_timestamp available_upto besteffort chassis chunks cluster cluster_priority comment core cpu cpuarch cpucore cpufreq cpuset cputype deploy desktop_computing disk disk_reservation_count diskpath disktype drain eth_count eth_rate expiry_date finaud_decision gpu_model gpu_count grub host ib ib_count ib_rate id ip last_available_upto last_job_date links maintenance max_walltime memcore memcpu memnode mic myri myri_count myri_rate network_address next_finaud_decision next_state nodemodel production rconsole scheduler_priority slash_16 slash_17 slash_18 slash_19 slash_20 slash_21 slash_22 state state_num subnet_address subnet_prefix suspended_jobs switch type virtual vlan wattmeter opa opa_count opa_rate}.sort - IGNORED_PROPERTIES
10+
G5K_PROPERTIES=%w{api_timestamp available_upto besteffort chassis chunks cluster cluster_priority comment core cpu cpuarch cpucore cpufreq cpuset cputype deploy desktop_computing disk disk_reservation_count diskpath disktype drain eth_count eth_rate expiry_date finaud_decision gpu gpudevice gpu_model gpu_count grub host ib ib_count ib_rate id ip last_available_upto last_job_date links maintenance max_walltime memcore memcpu memnode mic myri myri_count myri_rate network_address next_finaud_decision next_state nodemodel production rconsole scheduler_priority slash_16 slash_17 slash_18 slash_19 slash_20 slash_21 slash_22 state state_num subnet_address subnet_prefix suspended_jobs switch type virtual vlan wattmeter opa opa_count opa_rate}.sort - IGNORED_PROPERTIES
1111

1212

1313
module RefRepo::Valid::OarProperties

0 commit comments

Comments
 (0)