From e0e391297b23211ecf2455b9df7d769b9291a296 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Tue, 3 Nov 2020 18:20:10 +0100
Subject: [PATCH] [drac] Change core numbering scheme to
 'contiguous-grouped-by-threads'

---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json | 6 +++---
 .../sites/grenoble/clusters/drac/nodes/drac-10.json         | 6 +++---
 .../sites/grenoble/clusters/drac/nodes/drac-11.json         | 6 +++---
 .../sites/grenoble/clusters/drac/nodes/drac-12.json         | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml | 6 +++---
 .../sites/grenoble/clusters/drac/nodes/drac-10.yaml         | 6 +++---
 .../sites/grenoble/clusters/drac/nodes/drac-11.yaml         | 6 +++---
 .../sites/grenoble/clusters/drac/nodes/drac-12.yaml         | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml | 6 +++---
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml | 6 +++---
 24 files changed, 72 insertions(+), 72 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 d424a8ef40..e31445220c 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 46964f95b6..44636be77a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 26b07cc458..9075fd3a47 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 e15d608b06..dcf36218fb 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 ed442c14f4..6340410eff 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 d25c8a5bc3..1f202595e9 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 f92872cec1..d167d44217 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -143,10 +143,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 575ba926f2..ff06bd0a15 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 b0448d68ce..db4bf809d1 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 2791080553..9827e872f1 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 223a13b182..6dab5a3f0b 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
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 a09ea25e8f..6d96ec1aa6 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous-grouped-by-threads",
     "nb_cores": 20,
     "nb_procs": 2,
     "nb_threads": 160,
@@ -142,10 +142,10 @@
     }
   ],
   "operating_system": {
-    "cstate_driver": "powernv_idle",
+    "cstate_driver": "contiguous-grouped-by-threadsnv_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "powernv-cpufreq",
+    "pstate_driver": "contiguous-grouped-by-threadsnv-cpufreq",
     "pstate_governor": "ondemand",
     "turboboost_enabled": false
   },
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
index fe3b41b942..4abba4b1e1 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -2,7 +2,7 @@
 ---
 drac-1:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-1:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
index 93034f616a..0463013d24 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -2,7 +2,7 @@
 ---
 drac-10:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-10:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
index 4b3593d0f7..c0df891da3 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -2,7 +2,7 @@
 ---
 drac-11:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-11:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
index d8c86f38fe..f3a60f2adb 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -2,7 +2,7 @@
 ---
 drac-12:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-12:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
index e5ee72d6e0..0221fd2db6 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -2,7 +2,7 @@
 ---
 drac-2:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-2:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
index c1b9723bf2..d627d914f4 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -2,7 +2,7 @@
 ---
 drac-3:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-3:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
index 521363f1dd..531f31d3a1 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -2,7 +2,7 @@
 ---
 drac-4:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -84,10 +84,10 @@ drac-4:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
index 5f92077c78..9191101661 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -2,7 +2,7 @@
 ---
 drac-5:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-5:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
index bb2d4150ff..5b1bf574ec 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -2,7 +2,7 @@
 ---
 drac-6:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-6:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
index 9081ff522d..7b5f832509 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -2,7 +2,7 @@
 ---
 drac-7:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-7:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
index f42f4863f8..4ceef112c8 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -2,7 +2,7 @@
 ---
 drac-8:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-8:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
index d1c9aa15ca..2bbe4d0ea1 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -2,7 +2,7 @@
 ---
 drac-9:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous-grouped-by-threads
     nb_cores: 20
     nb_procs: 2
     nb_threads: 160
@@ -83,10 +83,10 @@ drac-9:
       rate: 10000000000
       vendor: Mellanox Technologies
   operating_system:
-    cstate_driver: powernv_idle
+    cstate_driver: contiguous-grouped-by-threadsnv_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: powernv-cpufreq
+    pstate_driver: contiguous-grouped-by-threadsnv-cpufreq
     pstate_governor: ondemand
     turboboost_enabled: false
   processor:
-- 
GitLab