From c17b4b3e7c27ee54372e98c6c17000d3d30fefce Mon Sep 17 00:00:00 2001
From: Pierre Neyron <pierre.neyron@imag.fr>
Date: Fri, 20 Mar 2020 14:54:12 +0100
Subject: [PATCH] [parapluie] change cpu_core_numbering to
 "contiguous-including-threads" (seamlessly)

---
 .../sites/rennes/clusters/parapluie/nodes/parapluie-1.json      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-11.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-12.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-13.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-15.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-19.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-2.json      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-20.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-21.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-22.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-25.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-28.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-31.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-32.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-35.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-38.json     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-8.json      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-9.json      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml     | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml      | 2 +-
 .../sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml      | 2 +-
 58 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index 932c8be09a9..9bcb32a2704 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index eff3bec9219..12f82d6ac2e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index dfd7d346f94..c5661a4c0e6 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index cf429501195..b95f61ef5a7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 2fa342ca69d..b4cda0138bc 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index 72ba8802ffb..1ee7af787af 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index bf9639a9c9d..3f292b98d2d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index fdd8bd1de2e..5fa8c9cfc17 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index 96dfeac173f..78ab0ec5138 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index b5544db3cef..ea4cb7fe1bf 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index f7e3e8108af..f0688bbf796 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index ee769adabb3..758ab231d35 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index a4e3225101f..221e41e89cb 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index a99c4e03429..c83f61d8f78 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index 873d8aef006..1e6b227d822 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index 71c0db3e9d1..99df60f597d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index b0fd54e573a..b54216d584e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index 692d8c1627d..13853d2bb1b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -1,6 +1,6 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
+    "cpu_core_numbering": "contiguous-including-threads",
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index 200d3ad4e2a..7808c2c2204 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-1:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
index 7703db9130d..bf57516e837 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-10:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index ad83340e41c..d9f34b70ec4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-11:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index 09a9b3a6c9a..4c02998e85a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-12:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
index 4817dd6b7a6..fe2ebc9cbfc 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-13:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
index f6a9a5c655d..acb088fcdd4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-14:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index 99f6683b1cc..6afeb6ea73f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-15:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
index 08eca40fca2..22b8844afd7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-16:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
index 459e5376bdf..5aae30ef0b5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-17:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
index e2d89dc6bc7..d140097d333 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-18:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index 123c25ce9f5..febb0d07917 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-19:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index e7d191d8930..d4b66489445 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-2:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index eaa3b74d21c..95642f5f467 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-20:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index af457897b45..59c6eab43ca 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-21:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index 5212c0ed6fa..3d03d386fb5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-22:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
index 23b671344f1..8608a5b5c86 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-23:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
index 867379f6106..5831a3c7466 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-24:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index 74a14868fd0..74aa7886c56 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-25:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
index 4b44028bc46..2e93169e29e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-26:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
index 077573e8f4f..2a88dfa7588 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-27:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index 1852a408ade..07f5fbb6907 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-28:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
index 14f806c7ce8..fefe9bfc1cc 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-29:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
index a7804fb3ab0..67ce68fdcab 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-3:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
index 0f89772621f..e1ccd61e49b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-30:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index b9fe2347b6d..f44bbc6cd4b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-31:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index 7bf99d32a3f..e32fcb7dabb 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-32:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
index 98ef5289816..a9878b1f508 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-33:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
index c1719adf24f..c75e90e0066 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-34:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
index 107590e3b4d..86467af21e8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-35:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
index cb9c521b703..f4b54d4100e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-36:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
index 5847dc5dac9..396c1a0dff4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-37:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index a763ebf34da..734b0693706 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-38:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
index e2e9faca315..11390d94ace 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-39:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
index ce7a689bd52..f9913754ae9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-4:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
index 2c710dd1698..e02a160a4f1 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-40:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
index 721d25f18b2..92ceec80c19 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-5:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
index f53d8b733de..92a755b6c8e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-6:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
index 27b87c55925..7812c9cc3bd 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-7:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
index 7b85fa8070a..8ccd99cf088 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-8:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index 82b4ff858e4..6b7ba0c53b7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -2,7 +2,7 @@
 ---
 parapluie-9:
   architecture:
-    cpu_core_numbering: contiguous
+    cpu_core_numbering: contiguous-including-threads
     nb_cores: 24
     nb_procs: 2
     nb_threads: 24
-- 
GitLab