From ecfe82d3888af718a7a9d6cf9f820bef842b7073 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@inria.fr>
Date: Fri, 17 Jan 2025 15:19:33 +0100
Subject: [PATCH 1/2] [wiki/hardware] add missing architectures

---
 lib/refrepo/gen/wiki/generators/hardware.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 33ce26f4d0..fef08119c5 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -386,6 +386,9 @@ class G5KHardwareGenerator < WikiGenerator
       'Volta' => '2017',
       'Fermi' => '2010',
       'Golden Cove' => '2021',
+      'Grace' => '2022',
+      'Hopper' => '2022',
+      'Sapphire Rapids' => '2023',
       'N/A' => '&nbsp;',
     }
     date = release_dates[microarchitecture]
-- 
GitLab


From ce9b6b07a9cc1daf1772a7c1ab28c579397d16b3 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@inria.fr>
Date: Fri, 17 Jan 2025 15:26:58 +0100
Subject: [PATCH 2/2] [mercantour2] enable hyperthreading

---
 .../sophia/clusters/mercantour2/nodes/mercantour2-1.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-2.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-3.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-4.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-5.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-6.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-7.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-8.json    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-1.yaml    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-2.yaml    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-3.yaml    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-4.yaml    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-5.yaml    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-6.yaml    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-7.yaml    | 6 +++---
 .../sophia/clusters/mercantour2/nodes/mercantour2-8.yaml    | 6 +++---
 16 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
index fd1875f51a..1d48c49c2a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
index 433e1fc58c..6c4b2a35d6 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
index eb036e7135..62c105005d 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
index e810169726..f16e8759d3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
index 28efaf8fbf..7b3afd95fd 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
index 6bdb2d9e7c..532a2891a3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
index 8435f2e05b..0bdd66d1cf 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
index 3aef2d276a..7d044a9ca2 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
@@ -1,9 +1,9 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
+    "nb_threads": 32,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -206,7 +206,7 @@
   "operating_system": {
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "intel_cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.yaml
index cb0a1a3560..d59cfafb57 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-1:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-1:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.yaml
index 210e6ef8ed..a6bb4d11a1 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-2:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-2:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.yaml
index 5d66bf38a1..0fdbd38db2 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-3:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-3:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.yaml
index ed436be464..4a1d62505e 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-4:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-4:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.yaml
index 8f09090bab..a1ae561542 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-5:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-5:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.yaml
index ad857b3a71..fc23e51cc3 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-6:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-6:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.yaml
index 561ab72609..f3c650d998 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-7:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-7:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.yaml
index a6be13c761..6f99e8c2d4 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.yaml
@@ -2,10 +2,10 @@
 ---
 mercantour2-8:
   architecture:
-    cpu_core_numbering: contiguous-including-threads
+    cpu_core_numbering: contiguous
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
   bios:
     release_date: 03/04/2015
@@ -124,7 +124,7 @@ mercantour2-8:
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: intel_cpufreq
     pstate_governor: performance
     turboboost_enabled: true
-- 
GitLab