From 90e71e6ea3de92c543e681d33d805ba307fee5fc Mon Sep 17 00:00:00 2001 From: Vidal WATAT <vidal.watat@inria.fr> Date: Wed, 26 Sep 2012 00:51:13 +0200 Subject: [PATCH] [grenoble] deleted gpu=yes entries --- .../sites/grenoble/clusters/adonis/nodes/adonis-1.json | 1 - .../grenoble/clusters/adonis/nodes/adonis-10.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-2.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-3.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-4.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-5.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-6.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-7.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-8.json | 1 - .../sites/grenoble/clusters/adonis/nodes/adonis-9.json | 1 - generators/input/sites/grenoble/clusters/adonis.rb | 1 - generators/input/sites/grenoble/clusters/adonis.yaml | 10 ---------- 12 files changed, 21 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json index f6e692d9796..febe7992b36 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJP-00251" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json index 4af02761405..53ae2d09447 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJS-00255" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json index 9e3f0c771d5..a093da10e04 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJS-00251" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json index 847843fedbe..371ad0c59ce 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJP-00252" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json index 9f2218ac964..df8bca78511 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJS-00252" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json index 174118d448f..a65a4d155cb 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJP-00253" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json index adf76fc76ef..8d600ca7919 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJS-00253" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json index 73c7773c8f9..b28b469358b 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJP-00254" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json index 30c73d94439..98e969b82ec 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json @@ -14,7 +14,6 @@ "serial": "XAN-SMJS-00254" }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json index ebd54acfe68..e5aac5d2162 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json @@ -14,7 +14,6 @@ "serial": null }, "gpu": { - "gpu": true, "gpu_count": 2, "gpu_model": "Tesla-C1060" }, diff --git a/generators/input/sites/grenoble/clusters/adonis.rb b/generators/input/sites/grenoble/clusters/adonis.rb index ed85703d8ee..de07298b819 100644 --- a/generators/input/sites/grenoble/clusters/adonis.rb +++ b/generators/input/sites/grenoble/clusters/adonis.rb @@ -108,7 +108,6 @@ site :grenoble do |site_uid| :name => lookup('adonis', node_uid, 'chassis', 'product_name') }) gpu({ - :gpu => lookup('adonis', node_uid , 'gpu', 'gpu'), :gpu_count => lookup('adonis', node_uid, 'gpu', 'gpu_count'), :gpu_model => lookup('adonis', node_uid, 'gpu', 'gpu_model'), }) diff --git a/generators/input/sites/grenoble/clusters/adonis.yaml b/generators/input/sites/grenoble/clusters/adonis.yaml index 57a17556ebc..f309aeb4dd8 100644 --- a/generators/input/sites/grenoble/clusters/adonis.yaml +++ b/generators/input/sites/grenoble/clusters/adonis.yaml @@ -27,7 +27,6 @@ adonis-1: eth1: mac: 00:30:48:cc:7f:d9 gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-2: @@ -59,7 +58,6 @@ adonis-2: eth1: mac: 00:30:48:cc:7f:db gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-3: @@ -91,7 +89,6 @@ adonis-3: eth1: mac: 00:30:48:cd:c6:a5 gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-4: @@ -123,7 +120,6 @@ adonis-4: eth1: mac: 00:30:48:cd:c0:ad gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-5: @@ -155,7 +151,6 @@ adonis-5: eth1: mac: 00:30:48:cc:7e:0b gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-6: @@ -187,7 +182,6 @@ adonis-6: eth1: mac: 00:30:48:cc:7a:bd gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-7: @@ -219,7 +213,6 @@ adonis-7: eth1: mac: 00:30:48:cd:c6:81 gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-8: @@ -251,7 +244,6 @@ adonis-8: eth1: mac: 00:30:48:cd:c0:af gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-9: @@ -283,7 +275,6 @@ adonis-9: eth1: mac: 00:30:48:cb:cf:7f gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 adonis-10: @@ -315,6 +306,5 @@ adonis-10: eth1: mac: 00:30:48:cc:83:11 gpu: - gpu: YES gpu_count: 2 gpu_model: Tesla-C1060 -- GitLab