From a0e0cbeaa46d2b0d39bd9a47237b92136b2541f5 Mon Sep 17 00:00:00 2001
From: Arthur Garnier <arthur.garnier@inria.fr>
Date: Tue, 21 Mar 2017 15:51:39 +0100
Subject: [PATCH] [nancy] graphique - Fix pdu mapping + fix GPU Name on
graphique-1
---
.../clusters/graphique/nodes/graphique-1.json | 6 ++---
.../clusters/graphique/nodes/graphique-2.json | 6 ++---
.../clusters/graphique/nodes/graphique-4.json | 4 ++--
.../clusters/graphique/nodes/graphique-5.json | 6 ++---
grid5000-all.json | 22 +++++++++----------
.../nancy/clusters/graphique/graphique.yaml | 2 +-
.../clusters/graphique/graphique_pdu.yaml | 8 +++----
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
index 910ebe6a193..0c30bff137b 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
@@ -24,7 +24,7 @@
"gpu": {
"gpu": true,
"gpu_count": 2,
- "gpu_model": "Titian Black",
+ "gpu_model": "Titan Black",
"gpu_vendor": "Nvidia"
},
"kavlan": {
@@ -193,11 +193,11 @@
},
"pdu": [
{
- "port": 7,
+ "port": 9,
"uid": "graoully-pdu1"
},
{
- "port": 6,
+ "port": 5,
"uid": "graoully-pdu2"
}
]
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
index 326cc7265ac..27bf737d801 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
@@ -193,12 +193,12 @@
},
"pdu": [
{
- "port": 17,
+ "port": 5,
"uid": "graoully-pdu1"
},
{
- "port": 14,
- "uid": "grimoire-pdu1"
+ "port": 23,
+ "uid": "graoully-pdu2"
}
]
}
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
index 21f7a6adfbe..7383f402220 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
@@ -193,11 +193,11 @@
},
"pdu": [
{
- "port": 5,
+ "port": 7,
"uid": "graoully-pdu1"
},
{
- "port": 23,
+ "port": 6,
"uid": "graoully-pdu2"
}
]
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
index 8357503a728..c65c8625ddc 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
@@ -193,12 +193,12 @@
},
"pdu": [
{
- "port": 9,
+ "port": 17,
"uid": "graoully-pdu1"
},
{
- "port": 5,
- "uid": "graoully-pdu2"
+ "port": 14,
+ "uid": "grimoire-pdu1"
}
]
}
diff --git a/grid5000-all.json b/grid5000-all.json
index 5170e0a4eb8..395f2ce51c8 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -100385,7 +100385,7 @@
"gpu": {
"gpu": true,
"gpu_count": 2,
- "gpu_model": "Titian Black",
+ "gpu_model": "Titan Black",
"gpu_vendor": "Nvidia"
},
"kavlan": {
@@ -100554,11 +100554,11 @@
},
"pdu": [
{
- "port": 7,
+ "port": 9,
"uid": "graoully-pdu1"
},
{
- "port": 6,
+ "port": 5,
"uid": "graoully-pdu2"
}
]
@@ -100787,12 +100787,12 @@
},
"pdu": [
{
- "port": 17,
+ "port": 5,
"uid": "graoully-pdu1"
},
{
- "port": 14,
- "uid": "grimoire-pdu1"
+ "port": 23,
+ "uid": "graoully-pdu2"
}
]
}
@@ -101253,11 +101253,11 @@
},
"pdu": [
{
- "port": 5,
+ "port": 7,
"uid": "graoully-pdu1"
},
{
- "port": 23,
+ "port": 6,
"uid": "graoully-pdu2"
}
]
@@ -101486,12 +101486,12 @@
},
"pdu": [
{
- "port": 9,
+ "port": 17,
"uid": "graoully-pdu1"
},
{
- "port": 5,
- "uid": "graoully-pdu2"
+ "port": 14,
+ "uid": "grimoire-pdu1"
}
]
}
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index 2c2928c68e8..5c1dc48df66 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -120,7 +120,7 @@ nodes:
gpu: true
gpu_count: 2
gpu_vendor: Nvidia
- gpu_model: Titian Black
+ gpu_model: Titan Black
supported_job_types:
max_walltime: 86400
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml
index 5084c83b05c..c83d2a8ac5b 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml
@@ -5,13 +5,13 @@ nodes:
wattmeter: multiple
metric: power
- graphique-1:
+ graphique-4:
pdu:
- uid: graoully-pdu1
port: 7
- uid: graoully-pdu2
port: 6
- graphique-2:
+ graphique-5:
pdu:
- uid: graoully-pdu1
port: 17
@@ -23,13 +23,13 @@ nodes:
port: 6
- uid: graoully-pdu2
port: 17
- graphique-4:
+ graphique-2:
pdu:
- uid: graoully-pdu1
port: 5
- uid: graoully-pdu2
port: 23
- graphique-5:
+ graphique-1:
pdu:
- uid: graoully-pdu1
port: 9
--
GitLab