[lille] Add gpu_vendor property andd change gpu property to shared

42a6e123 · Simon Delamare · 9bd8f97d · 42a6e123 · 42a6e123 · 42a6e123
Commit 42a6e123 authored Oct 24, 2013 by Simon Delamare
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
@@ -15,9 +15,10 @@
    "serial": "D385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385187840,

--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
@@ -15,9 +15,10 @@
    "serial": "D385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385171456,

--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
@@ -15,9 +15,10 @@
    "serial": "D385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385171456,

--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
@@ -15,9 +15,10 @@
    "serial": "D385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385171456,

--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
@@ -15,9 +15,10 @@
    "serial": "F385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385171456,

--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
@@ -15,9 +15,10 @@
    "serial": "F385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385171456,

--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
@@ -15,9 +15,10 @@
    "serial": "F385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385171456,

--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
@@ -15,9 +15,10 @@
    "serial": "F385Z4J"
  },
  "gpu": {
-    "gpu": true,
+    "gpu": "shared",
    "gpu_count": 4,
-    "gpu_model": "Tesla-S2050"
+    "gpu_model": "Tesla-S2050",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 8385171456,

--- a/generators/input/sites/lille/clusters/chirloute.rb
+++ b/generators/input/sites/lille/clusters/chirloute.rb
@@ -135,8 +135,9 @@ site :lille do |site_uid|
        })

        gpu({
-          :gpu        => true,
+          :gpu        => 'shared',
          :gpu_count  => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_count'),
+          :gpu_vendor => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_vendor'),
          :gpu_model => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_model'),
        })


--- a/generators/input/sites/lille/clusters/chirloute_manual.yaml
+++ b/generators/input/sites/lille/clusters/chirloute_manual.yaml
@@ -5,6 +5,7 @@ chirloute-1:
      switch_port: Gi4/25
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050
 chirloute-2:
  network_interfaces:
@@ -12,6 +13,7 @@ chirloute-2:
      switch_port: Gi3/25
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050
 chirloute-3:
  network_interfaces:
@@ -19,6 +21,7 @@ chirloute-3:
      switch_port: Gi4/44
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050
 chirloute-4:
  network_interfaces:
@@ -26,6 +29,7 @@ chirloute-4:
      switch_port: Gi3/26
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050
 chirloute-5:
  network_interfaces:
@@ -33,6 +37,7 @@ chirloute-5:
      switch_port: Gi4/23
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050
 chirloute-6:
  network_interfaces:
@@ -40,6 +45,7 @@ chirloute-6:
      switch_port: Gi3/31
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050
 chirloute-7:
  network_interfaces:
@@ -47,6 +53,7 @@ chirloute-7:
      switch_port: Gi4/23
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050
 chirloute-8:
  network_interfaces:
@@ -54,4 +61,5 @@ chirloute-8:
      switch_port: Gi3/32
  gpu:
    gpu_count: 4
+    gpu_vendor: Nvidia
    gpu_model: Tesla-S2050