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 fd1875f51a1a379363bd23f63134fc40e1499a4e..1d48c49c2a560d982ec20fb6dd098ccad66b7135 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 433e1fc58cff4bdf920898097ed2efac1c3a8534..6c4b2a35d667c4f89789816249ff200feefa5b4f 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 eb036e713504b58682c64f930fbbf526827687cf..62c105005d510fad81257b914f96c94f4f771d32 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 e8101697266c969dab8e54b78be3d9fece59ea85..f16e8759d398003dbe9c4bb2e4e9c2507be97002 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 28efaf8fbfde8e7a706a3999c090f4670d924169..7b3afd95fdef55c35a652426d9530e877716db7e 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 6bdb2d9e7c4cda051ffd8248c98fa7ef6a016f66..532a2891a390416ab2af4b4e8ea4a7098e3f6a3b 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 8435f2e05b18fd3643333a796bebf554d289c2a0..0bdd66d1cfcd2e6d0b42028d7edb4aeea8cece21 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 3aef2d276ad5e21de286856bc9a53588bdfa055f..7d044a9ca2f9b272e6f13989a167b0dc9a6d701b 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 cb0a1a3560f49791f02fcaf46b5d3a1790d3a8ff..d59cfafb57fbc5ccebdf938b2e85e42f6ba46a1e 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 210e6ef8edf3d787e96bbefa085706b4b892c54c..a6bb4d11a1d4838bf1eec47325b9cb0f31396be6 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 5d66bf38a1402b320e16c22e112da8be4775c552..0fdbd38db2caf31a8e0f9b4dfc8910409c253a86 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 ed436be46499b2711783f7445aeaf33712603b5e..4a1d62505ec119e99b3b85496894c971adbeb7a0 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 8f09090bab11ca32f11dedd8d3ca298671502cee..a1ae561542317c4e06ca6f6a1570592ee5d43b41 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 ad857b3a710ee53e14cf02215c282c3592cabe70..fc23e51cc3596bef88aadf3bad6e30cd654425c3 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 561ab7260963d66bba62e79140a582f7083b3609..f3c650d9981a7a20ace789cbeda3586a23a4c460 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 a6be13c76187eba8e969eb5d8eaed07cbde2c63c..6f99e8c2d4963556a7f0fbf26bb5664873641b0d 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
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 33ce26f4d08536025ba1cbde7b0dadc446d71e81..fef08119c52319e070c222f5a8ef3d62effa1937 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' => ' ',
}
date = release_dates[microarchitecture]