From 99ed4d739ccc17ba0ef2bc955e66c3936f961a57 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Tue, 10 Nov 2020 09:32:51 +0100
Subject: [PATCH] [drac] Change microarchitecture to POWER8
---
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json | 2 +-
data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json | 2 +-
input/grid5000/sites/grenoble/clusters/drac/drac.yaml | 2 +-
lib/refrepo/gen/wiki/generators/hardware.rb | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
index 2f945240f1..f88b96cdb4 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL, altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
index 3867d3b7cd..171cb9e6a6 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
index 6573d31802..33c526ad65 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
index 4c006d6875..467864fb6a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
index e6dcd2c588..5bcb2332f1 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL, altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
index 938fd14ca1..074f66c99d 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL, altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
index cfb5c7c951..d9a78a65d7 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
index 9d38381406..88425d767d 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
index 4dc949d321..4f38988dff 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
index 796936d8b0..78c9e8f0cf 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
index 92708fef08..030aa9faa8 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
index cecbf510f1..3c07d77c29 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -193,7 +193,7 @@
"clock_speed": 4000000000,
"ht_capable": true,
"instruction_set": "ppc64le",
- "microarchitecture": "POWER8NVL",
+ "microarchitecture": "POWER8",
"microcode": "unknown",
"model": "POWER8NVL",
"other_description": "POWER8NVL (raw), altivec supported",
diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
index 3f1e610431..ed515b4792 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
@@ -9,7 +9,7 @@ queues:
nodes:
drac-[1-12]:
processor:
- microarchitecture: POWER8NVL
+ microarchitecture: POWER8
clock_speed: 4000000000
supported_job_types:
deploy: true
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 228fa419f2..3a39f6956d 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -335,7 +335,7 @@ class G5KHardwareGenerator < WikiGenerator
'Westmere' => '2011',
'Sandy Bridge' => '2012',
'Haswell' => '2013',
- 'POWER8NVL' => '2014',
+ 'POWER8' => '2014',
'Broadwell' => '2015',
'Skylake' => '2016',
'Zen' => '2017',
--
GitLab