[grenoble] Add gpu_vendor property

9bd8f97d · Simon Delamare · 7706b03e · 9bd8f97d · 9bd8f97d · 9bd8f97d
Commit 9bd8f97d authored Oct 24, 2013 by Simon Delamare
12 changed files
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -17,7 +17,8 @@
  "gpu": {
    "gpu": true,
    "gpu_count": 2,
-    "gpu_model": "Tesla-C1060"
+    "gpu_model": "Tesla-C1060",
+    "gpu_vendor": "Nvidia"
  },
  "main_memory": {
    "ram_size": 25330180096,

--- a/generators/input/sites/grenoble/clusters/adonis.rb
+++ b/generators/input/sites/grenoble/clusters/adonis.rb
@@ -140,6 +140,7 @@ site :grenoble do |site_uid|
        gpu({
          :gpu         => true,
          :gpu_count   =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_count'),
+          :gpu_vendor  =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_vendor'),
          :gpu_model   =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_model'),
        })


--- a/generators/input/sites/grenoble/clusters/adonis_manual.yaml
+++ b/generators/input/sites/grenoble/clusters/adonis_manual.yaml
@@ -11,6 +11,7 @@ adonis-1:
    block: block-1
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-2:
  network_interfaces:
@@ -24,6 +25,7 @@ adonis-2:
    block: block-1
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-3:
  network_interfaces:
@@ -37,6 +39,7 @@ adonis-3:
    block: block-2
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-4:
  network_interfaces:
@@ -50,6 +53,7 @@ adonis-4:
    block: block-2
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-5:
  network_interfaces:
@@ -63,6 +67,7 @@ adonis-5:
    block: block-1
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-6:
  network_interfaces:
@@ -76,6 +81,7 @@ adonis-6:
    block: block-1
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-7:
  network_interfaces:
@@ -89,6 +95,7 @@ adonis-7:
    block: block-1
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-8:
  network_interfaces:
@@ -102,6 +109,7 @@ adonis-8:
    block: block-1
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-9:
  network_interfaces:
@@ -115,6 +123,7 @@ adonis-9:
    block: block-2
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060
 adonis-10:
  network_interfaces:
@@ -128,4 +137,5 @@ adonis-10:
    block: block-2
  gpu:
    gpu_count: 2
+    gpu_vendor: Nvidia
    gpu_model: Tesla-C1060