diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index c89e4a0374df05085182eea2b5bf50e174a9ebe7..7917fa011b6c452778832208b26858de85198303 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index 77e8050f7cdcc19a22d71d311d1681508fc399a1..3316912fae13f5a707b08ba7b78bc573842b2158 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index d81acb9357328b208aeca44306b18191edea5d29..9b5898b246bd78be03785340dc274ac489fa8f5d 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 8c08216186f46b39b5e58d90de2bf40e26e26065..8b724b9f3ef44bbbb2a06e3434a8517f0ce7ea0d 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index 78ef8fbe1c2bf78373bc66acc313441bfabd3a6b..26143074773a6cc01b97031f38c5bd40d7481686 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index 78ebb976d3b93e43a1604de72aca966209a23b8d..bd3ac3bf92c99e03a98c69d38cf73b08c5582dda 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index 31b2bfaa7cbb08bbd2528cccfd2b8172cb6a05cf..e603227b231cb6063e7fd3adbab3145ac288f0c5 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index e8e08ae8fc7c02e28302609e2658e5abdcb3345b..6ca3e993c1504cf272681c1a50e662d57dc10d00 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index e2ebd97228af98dac1012603c7510bc2a523e9c8..25dad94fac2f6712f28a5e4b6ba30b8509b6d778 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index 2dc776f3a3b2c2ff66d9f5f856a8e3f1800128d7..3c3e17ce9313b1f2ee9441e5fab05bdaac6ec543 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "05/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index f94d8c5f5b3ced39490398815e11b40516e4c374..040da6c8c9710c22718c2dcb708229f5e33169be 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index 87876bb3d0e91014922b0b337e0b58de97335c12..de0dd2dfe4170ca495ed555b897208fae30eaa4b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index c3fff9b0ccc1f82eb01efc92ed6f8ea275f2fc88..e9adf9ef82f5b7fc55e2567363b1a469c27754fd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index f06a4d7939e2a6dc608d39512e1c7768073e2b17..c0936ab031f563f03bdedc4ae2212d26b739a551 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index a4add4d687c383f60bec4fbc30acb6a70d02416e..f794734ef4c579d1d61fd1540f4f905a49158e6b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index b22eb367e64fb355a917f94adca1bf52c7132ff7..1845385db85a2b5e074f16424dd3c31de8739f13 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 93eb6f99cca6d72ef3bdd9b0181232463bf1b63e..e730e61d7bc57feb994ea262a95cd7da739f7335 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index 59572f354bcd3c94f7de64bcb69ee73fbbd0a8cb..16af34d1bd337b4294d4195c10bcd5495d5ce6b4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index c31096fcbd333d8be5147e2c0a678d3ef70a4701..14adbdcfa83244a94195ebb91aa12ada08e28a66 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index 399bfbb8af68964f04c885642a149b42fba7e116..c7f94fd9946ee71165a5c972e46c82b32c89f4bf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 8fcbbf07b630e744cfa0479c02770cc9e6e9707b..b8cbaa50cc755a6a466e43a7395cdfbdb0635527 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index 52607e9b320155a7f94f8a5ed642c90e33afdda2..e8a7431a71a19e6779cf4b3e507cfe3f3e9fa5dd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index 5ae8fa0295113860cebac0ab84c9aa41d0258a78..213455aa47ce24728160702d88319b8d7bd75c3e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index 79fd84dd26423737506ac2bbe0ae35f5fb591780..38f3fcc7f1074e7d79bcb38d5c1fb0d93f3f6dcf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index 40a0920778938eeae6d7f2011926bb590a6a1d1d..9cbfafc963d3d79aebae7944e5cd29eea4c0ad1c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index a859cd639dbe1bddbca253217ab99509057f79a2..a4aa9b0a825c5055469ea6db3fcfa39a186df357 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index c379d29612965e463b7219c075a2956cf17584bd..237ce3c2a3237d748613ce5f5c089d2e9ec76bf2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index 142347acdc5e9852dafa0b5effb25e601a95eddc..baa09c8125b4efa2318b58360bee5d35f3833e78 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index c1912c191a517c028d99daa6936458aad9bfa8fe..61fb03cd242644e123f6e6ce52ac62105edbf4c6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index ccc4d336fa5dc8b38e852770038ad787ef8393fe..4e1644146a3119196eae03a7682b970166fdb1fc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index c3705b10673cd820cfdb526b3ed7e5d7cb0bbbe8..84cf2a776cb3e2734e68d03cb4569349052a6048 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index f1f6824ffa2711bb2af7c8a102778acd2ac4d9f1..93b601a83980f1d831465d6f9d12110c2172b7c6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index e9ed38bee7999d070ecb04acd287f9bd8b53cb4c..6c33868537366b4c8b0d0f132c422a2f36a0fd8e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 02cf9dd63fa4947e3ce9a5a9783ce774b1756cb9..be32ebe1663988d99545efae03c92bc99d8c009c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 0f332885bc589248f2302c3a200e465c57263243..fb43f475e65ebf7e41c6093e0c859c6be82d3451 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 69b759282f4c538915eda33e812a9cb4995c12cb..e3433279e1df03688cd753db0ecdefe515f6e216 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index 2fbe3eda2e851927716b0e1878a0a5dc5c2a1044..11a4551e4ddd24301237e6add658c579a5ff1f7a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index 32d5462cc44ea3cad1586b138df79b5a12d6c78e..79377921d98d2235cf045b007db43fd64bb35bfd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index 0e5a628739815fb46ac63ca4484d05d4237f3b68..73bfeac64ec1c276bc9c23e5b56febc2ca152ca2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index 1697c7ba983d74a3f4995f5ecf5a3dab62ce2d0b..2644384452eb8f900c7c3fa501bbd5884729ec11 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 9cafe7c7c2f6e67ce969fa14a9a64da6d516d585..a5d882f173cb969ce96a6d397b83591a82e8d6a7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index fdda54b5bfb24b57bdb6415c35dad07a887b753d..5bed4589a926c96f45a0a87749418bab60e2a7e9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index a0d860d479ff95f60c45873a79449acffef8fc9c..03c40a1a5dddcc3c6e8183fd4bc9fcbf04477bb8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 535305f8b4813044fb4642ce0654e8f941ce0082..39fb611f02f5650d73f01906117118dd1414fb75 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index 674ea9c8c26351c6b880582dc2a97e5ae16a82b3..74c940ec16f0eef5c923ac3ed8f335968f2a26f1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index 1e3c177adefdad390f0d67bf8a5577774f446515..8e3da39ac486dc0411feec6250ea967409ed0f9d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index d35b5f61095e74e7fb73015150e9c6e3f28f3446..6a5346a47cb3abb9e5da2ab3fe53a38dfaa5ecf3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 3f1965a9bab358352077821fc8ca8db28c640f97..baa70c8157f1c96f5a21530eda0610e93d3f3c9b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index 334595854c6f87add8463dd2263cab1cad2f4ca4..2f5b4b35ed1e035c6738bfd22efec3ac68e768c0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index a6538d7c5be84bbc80e0f3f7a039145e2c47a24f..2ca43c37a6880f25b0436b835f1c27132d6b6a64 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/20/2010",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index 518fabdfdfe2374d35a00e2b2e5cc4a2df2452fc..bae63a14acae29580e6f59d8154d5dc75a0cc292 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 26612ab3c3d0d9ed01aa4ee9671a01b311f133ac..6f320c11c796aef4b66fd92bfe3224ed17fe63a2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index eaefeb837ff23757e24f6a51ef886ab06981a92c..25677c7ffe2b4a36b27df30726c7c5c9508f0dd3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index c4124496dabd20f15cc1f7351f3931d7ad9faa98..a946c106c8ffdc9be35e6a0b3f66b8641e872971 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index 14ddeb001a7838e1c8127a9416c74fabceac726b..c25ebb64604df99fff1eb35db1d53664f467c1ef 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index 1ff689cf7a86215bdd1d6b91b065f454e1faaab6..cef80b2c981d6b10e0f5a73f37be4139e2ffed01 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 8f2c8b5fef35a49204ffce459f5832ec15db7035..3a6bba5767eaaa523aa9b458707a80cf8aa397a2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 6f49c35a447952be5a75ef23980741179dc2949d..7e4e44e021aab194a2c82cdeda44cfb4079aaa81 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index 82cda9b94cc1f25811edc87e5481f438b938749e..a52df276cf9b3211aebfaf738a169f51f47febb7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index 1128a9cc162c1c9fc8be39cc85f9c6c7d429a8fb..c78a9a72a95faf31894a24baaab1165048ae6067 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 2779300260d30afaa42e4ac01062421f83a72c27..c09d595d27dcceb8531ffebb2032b5b9d2c10e8e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 3d4925b44e42e206f2c4aed1b605ec7b34560c47..ba49cca817fce924664375fd5482a2e9a808897c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index a5b2625307db008ccfddf022415f23a27ed6ec4f..b1bdc01183d61ddd4bfab18678c197084a60e392 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index bb458778181ae4f9ee8b3adf553cfefb3c94772e..5fb465adc0263d5764310aa1005ac8673181f74b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index 5a3c6eb9e467f94aa717b3e810f0dfb2a853c14d..ecdd592eba395fb7cc204b15f8cbb93aa402cd9c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index bbacb7dbb52da64b1a4f13359e3199eb4468d26f..0be7d5c7f92e06f91086ac7f3e8fef27c65ad6bc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index 0fbe5f71abbc1d0a965362abc1be9b396d750316..87d9801d35f372b8a31c0c4814b59c105b1e62a2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index 6d043b97996ee3dad0f17095c0ce516142a4fcd0..c4bc7f8d942f5665334b8bfd0012eec3a544fc3c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 71f1bebabd8c21ac8ee0c9c87c03334645fdd168..552fe87ec1eb92efe4737c41cd00fdedee249fd6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index 8fe7ae64b9e80bb0480fc1ccdabe08b9d6b40984..35e2a2c1f8083a06e5747da65bc7693df2371c83 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index edd7230e75fba85d959c305d31d5aff9ba6d99ae..62490da589588bb56b6d446ec6c0b0c01f949bef 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index 1f0e0faa6569479beb3023bf98fc49367adb47d2..a8e429f2f2ef11b76a86736c356d2fd10ff32ae8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index 09e4a4fa9bd6bb0412837cfab13b1f7eba6d8ad5..febd87b8153f7f436e9b6f80f8fb070ff1d4a779 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index 54bea65e9958f3259545f06ac3813ace6b6e5be2..377819db6e55e8b691b6a436bb7230c631c3c1f6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 907d0ac5e3e11c327b64aed4dcaba262c09eb5d9..58420e26706464f6b6cf83e63ee38f57356cc59b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index f3adf97974782393669ae837b70396b476c764e3..2baab75cddd0caf450760a4a9c2a3586c8ebb40a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index 2dd0afd22b5fe5344ffe0a00e95efe9a15d5aa0c..02dce92c1f11acce0ab0af3081b7fa41c35655df 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index a282d2f668aa5ce678726ecf77e92b0a66a2e1a5..269e6da8f87bc596e424b71b2a429b7c1667dfeb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index 1e8e3aab8ca80149a4953f44e7c061f96b4d4673..5c5cfb7291d5cf4be2233412cc7e7cf8e3a3f5e1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 5587385e1afedbdf0065b94d7c7972120490e400..f1fea001da7526f93f0f3467d8837856c86c2784 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index baee62b85ee2721cb0493ab47f391fcc8c8e255d..a876f33a308ba085341092d5922aeb565e01b594 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index 62cf4d079363b720eb602c3f7881bf3247c9898b..1e0ff4bfdefda735d9754ebb56e52c5d6b5436a4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/26/2011",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index b4bafe69ebb0096589b3ff8eb394f54c694f0150..ece591ac7e17483717be35013a6daa4f2985159c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index 84b5b7a6b8cc459b74ccacbb1a14d31fcb36a17c..1727e5f865bdca98b49d1485e607a5698b037d6a 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index ce326411cd66683e09d71f2ea0b8b80bc7756ffc..7effd1d0d72589123ebe2cf964d81b35dcbc07e7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index c60e24beb5744b8ebfbf6b67108c88f6bb56fc05..c8de055d645af0fa9e70c82e3b95368cac5d6df3 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index 76facf252ed0dc277bd43ca81a23d6af6776d0c1..bae197b5e9d6740ccc47c50e5a4691e43761b1c9 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index 123fee5983467907d47ee86ba758d80a13df322a..f7d2be624d1489e5ece4eb6ccffc515e559bc68f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index 1d83a56034203b6b5f2d2d6be9a82d685adee637..e904a195ee57b8a3a05104bde7ed932d328a34e2 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index 7adbf51502b484c80cc7b506028d92aad9bf5097..f6f890f44d7020726969586170a82a45203e1ec7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index bab8e62a721d649d8665e64efbd1163f456e2b20..d48a05b5bfa348fad23b36c50a57f51a7e8e17dd 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index 1e2320f4bb72af1439eba9d06bad538a423cbcb9..ede247d92a96dcad43719af7adfe47fe6b43b470 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index 8b93eb1e61de305b66ffc09913f8a0acfba54ed7..7676401de30d7d364c2d02e069c7d374dd439790 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index 17aafdfb51c14667042d4a934277da449dda7ef7..c1566b00bbbac2607f53794fc591ceebf1c09aa4 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index 4e48e8f5698204ba84082beb61f23316cc1200b2..17784cf9dbe74d76bcdc8ebe4ec90b953eb4e0be 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index 85e0d2c389b704a0918fe58d2880cd76ce3a0964..0ca61d2e532861e2fa83351b142d540c41ce1ba5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index 61d082e7c2795981fcb5965b0506ba334f9a0718..d24284c622147a964d02f7e7cfe0f42a42398230 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index 9e290d77f55111167b88249f577edd727629daf9..df5d104e5e94be3580d7925915c988ff141ac46a 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index ec7f65115eb72e163d16abc2e6b9baee02a1b6ee..858ccdcf21ad329aad03185befc14d43eaac5ced 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index 48bda8fde29b6fcff1fc9703ee2d4c8a3bf52cbb..f91b2e8e7e44fc3d488b0e2f9429efb87e5c110e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index 2149d784623f539630de219826a3f65dc5ec3af9..34357f2a2cded57872b56843eaef810b4fd42539 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index aa451c9c98153bc8d877121d1c5a7a7d2d60a945..68620a01a72ab7f000889808b24e4f76cfa0c2bc 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index 5f20f1564857234b22cd63224322d2ee0719f981..3231382c8e876e0304b960e83aa947495d426654 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 217932ebfd08b79e787f97d3b7f10e97d090e292..20ab0d5a350bd06b1e19621e07cbd72bc8add741 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index d26cefbd0d244e7b8a0e15b1026bc9d98dca3071..590b82ebad019994ebe627ed2b74695e3d778f69 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index ec24b3490e05fe31ce9a4e47869dbfc2efcea276..3420230cee40f3224703f11e80d5f5614cea4364 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 6c7e7a288edcfc1b8f08611ffd20926d167e2bf7..a69e88c93ec6b55a9fc811f3f0ed04cbdca75e1d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index c37a0027a7bbe0a0668b1ffad55c3fb7dceee2fd..645a4e238671a9a79b080357181f3402f90b3792 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index 538c0f3e2bf86c54bbc13e0206b79d71d7055a7f..81ffcd7e20d56a52ca767db8b1e5de75393ef1bd 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index a071013c8cc4cc6a5cd73059e3a9d985040d9239..61e5352c789eeb780f35548109e9760acdb7c5bb 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 3cfd6e0ea10d75b63cc2c4af75e3ab806cee6803..d33a275887a3aff75a8ada2eb180d07d9813475f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index 632cea339b04a5735baf9dbba3423be8f2744b4b..ca52e0c765d01abddc9ad05706d49ed8502848bf 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index f75a553efe8eac30f07f1fbd6455a58c770a928a..e3e256a089382cc8d575fcec4a957aa6a8d93881 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index 1d471c89299257b848b28b1c1159d58c73fcb41b..6ede6c901210adf056d2a7eda215c53c2e409f5d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 23ee4d8822203a41b47591561798fb0eb59be033..36561967e958a4519802c58fa18202b36699defa 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index b6c3ef6c66f12d90120c90bb254d036b7c4bafa8..2ba4e717f01ad3fe20c11feb205131a5c9400d17 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/30/2008",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
index 39a5827d64e087132c54da5b06f865cb52c0b2c6..311c673f18277978afdd368c7d35864860d860e8 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
index d1466d8389c6d96f62530f30950d7e428de1f8a9..0ace3af508cabada35b602471bfe387299ddde16 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
index e88fdd8c9e3e5edbf2362770cc2ce43d84c958a3..77b8ae17900f01ff4da1c74c74fe3c4bc5e07d1f 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
index 7e68e2414d7feef327f8eb0dde7a1d64a56411c8..f951ce03b0d729038d1d1e441473d137bf5620f2 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
index f6292148ac2b55c3aa643c533b10127b5734f929..e764aba1f5f1839a380f1548e6cd6b994fafb861 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
index 6c6daee8de913e2b5f35fc6b19451a47d4d1782a..1b5238c81ff20061de62db5c092008bfebd0c7e5 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
index 6c937751f18d28b262b21aba3abb2477f399a585..5132de50e53b454cc9bc915f0505c091dc39cb02 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
index 984811d84cfb1f9bb064e0afe245b97fd487db3f..78d6445c702f9f1744ca6027d31473a021d987b5 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
index 48c33dbd5f16d39992904c54245a9bdd30ecf64f..ca3524c2c603f5d1a2db80e9e34b2a9fd3b9a257 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
index 87cc1bf824f3c6f761f028c249528182e6a00d7c..088ea7fe248118df1b6647cf5b7901154133f85b 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
index 6b2c253d616959c05425ab45411d541a72c51ac8..9957c62d4ffd27e3c7a95651071954e196f08839 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
index 75b4601a3cf2e26b92f1be8c02c27a0bdf311f8f..66fcf9df0a533718a1e895c65b40fd584c012db5 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
index c48ba11c60ee8f9cf8f723aba764f345e68c853d..b1042e7d79f617236c4af4b367475e7a5441ef35 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
index 2e442f0725446126ae686a6713b382c048b50b22..5ad4666fdee37b6951e698408637cb3c00eec0b1 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
index bc576edc21a66c99602fc220762c48a1f3f1d083..5f62e45cf72a4233c091f02aab7ac81fc4548c7b 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
index 20d3c86536bc7d2f087bec9bb38d6fab362e8db0..41f31ad95e1729796efcb8c38a78bea2bd6397d0 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
index 184d1f793f27827292416eaebde8aeb9acaa0319..0f55f5199657bc848067766e8619b05971e8f386 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
index 24a7dc00cf765ee486004412645755fd730f6435..6004078b763ebd7b1361221ef2e8acb3f18a7f40 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
index 98b7e1714e5b25a791b44c19dbd302a8ee532a7d..6a3f90286d923cdd286800fd98f12c66dc5d587f 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
index 0c438fff7ed9a10730f7f1bda9192e99dbba75d2..bf78ec80eb7ca95057917f5eeade4fc7df03d945 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/22/2010",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
index fffb030f2eaa8d051e6f390c5bb260272cdc0649..acee5c127942f1f0b1bfc7ae777bb542a966dc0f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
index 22f9e1840b85bddc8a457e0556de9077aa28e98f..a47f1a13d1f8d695d07e1463149114bc8f961177 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
index be651f0a63a52a1c8c013bbfd6174f29d6507518..03243c14ddfad48d511329385e70d8874616e66f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
index 5bf279ee9e143f37e84499990b78ed9e6be96724..a3c894709a0357add181b6cacbf31aa2fc1caffd 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
index 97532f6cd09d714e55e8c3b2523047f4cb8c8a35..96257232c06cb297ca8addd3394c1ab88e706cd8 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
index 66b3f858924ecdfe4806c5618cb825e2665a873a..20b579620874acd78e04c242f0da709e00f1ee3c 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
index 19a18312578169ac60239e9d8c20eee26b14f769..cd3a088f7ea9a901a5cb3d6a17835e3cb48a3df9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
index 888c24dcfa86227e57f9322d9e3cc8d3ed4546a2..7cbae81eb06bd30c7be0eee1109bb9ce114f5636 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
index e40753310abeae303bc0c28a9f126218d862e303..39dde22f1a8f4ec521b67ef33740fe54423285d5 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
index 4e4897c88e45e19796e2c4b8d93df187e45829b3..38a9f6a55f5be3502e6bffb304472f9c55623d0a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
index 6c344699ad2c6a74037c4ac982846fbd5c3ebb94..80c5eb45a88f9671f5b4266319fc708efcab9573 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
index 7652e622e928522053f4a7714ea3ca37ccc7cf05..1c76d8c38d0eaf2483b8923fb6212f5a90ce217b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
index 236d9e57098d435533193a6b1bbe449317962480..6067c5556dfedd551b079dff207a249c07ab50ca 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
index b1106a7dcff5cafa9ddfb6e128d305a0decb4b70..c080e081812f47b0c8b7ff70fee4cd092e660f45 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/09/2008",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
index 59cad8d72a6fbcfacc5260387b68440703bc9311..2b2ac72ce1f65274c0532e1d7e5c4170d75d9a97 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
index bcabb348551bd758ff231554a3f241922862fb04..385c0b186576560139145637a29f32e8812d97b1 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
index 18b1c766030cab62f32d506d8f64c539d146c6dc..5a55031733c764b414fd42f62829257398025c19 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
index d99f80ba15a7a140c5882a2cd8d0f5d39756af12..7b5b1839f5b21972f97a0ab08ac8059007465864 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
index 224e0f118af629423f459e7ccc49016fe1477337..2f795a72c940da348c653f8a882e26d7739cf9c9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
index 69caf7ea5be30aac35c57f7c193ba25e728c2954..4a026db9388ca739d474d100f611b93f8e79ebb9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
index 68b146d769527fb0464af8f4fd890d71c7db37a5..928266aa714b9d3bc33e5ecb8a884fe874fa2172 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
index 5e5e8ae2742b1583d5b1928e6b1b7d269c94f752..88d2e3b4cd673f4905067c61bdd75b3d09534ddb 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
index a2de2f8b7344873da1f2acded3ce4ee7199c5705..a7d097b9298fc7d07cf1d8001e02696bf38afe30 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
index 25e3a8c089a5cb2f4ffe7b0a0154e089a713b3ae..78ad848943b436de55a3653be768cabfb9642390 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
index d4a8499582c442137793faef697d0e4648de3081..2f73820f4bd39ed9d0579f6dd069225864ddfa42 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
index cd8342a1ae97fb31ddd2af4f6c4b949b6f0ad175..8f6e9219f402d41653ff556ba092f43401427c4b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
index 0bbfe690b70413259b4167f26a15583c8bd58896..81353a83efd333d3385d650833a2586575b0a686 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
index 054eae415aea02b94b8c5b23dc7f5daddb10fa56..fb0d2139d288c0d6465712efebb44626cac2ece9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
index 912a36230b27fdcbce1daaffd9e357ae06f3bf30..9dfa47d34eee379c3c6b2d07bb3a00c53d0cf8ec 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
index 3c7273bdc5d84b3239e2c9e8b4b15ab569eac877..415dc10d96c8465f490b8f46ea5b42a97984f476 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
index b1291a26c4142a36b40f1bf9a2a052a0ad14b53a..6596b6496b92d193ddabbcb64e30f57804c0e0b2 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
index efe246fe83f8494c2a255e7d47ec35263049b74b..f61b649eb15417679b17f1444f7edb15e799962b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
index 191349d58662e1eed72ab441448bbe02c81c5e0e..ad7025eff0a78f9b451c364a1b622907fdf7813f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
index 12c627e22912e9a10959664788f48e3abcc94e23..9c146cb088624a9d07b46de384f11c9341be7700 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
index f6dcba9462b47f42f0aa003e719c0fdb41bcfa54..5411fcbae389f15ef63e5af91b74b4175cfab9c1 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
index 7a2fb7091c814b0360f925be9fcdcfc15bc2abdf..a1904031d0fd298c0dbb5ff2e2657899e4217a18 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
index b4ac9882b1b67bfb22cd332a473d425b8d810d35..128573655e295869ad40070d9cef51c027c95301 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
index ffda8380dbe69149a73126aafce275a1aa129a3d..863f458a5757c43af397f5b26de306557790e429 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
index af9543f193b350abaab95d16bce4e16afac32f6b..8e8281bee6e64e68c7815a6b473bffdd4f78336a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
index 395fbf3fe45d060ea755aa01519786bb4713d741..cfaf1ea19f5ce555d8dc0d162b493b9828f79c21 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
index f2ba7ba3f23b3b1419bbe65a7c0c3d02fefe29af..2f05658cdeba6f93d6e2fcce905bb507bde044d7 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
index 373c85eb134b0eab65817ec01064cbe49d039ed2..14b85417bad865257bd6f90e6392a5c8cfc3fc8e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
index b28bce7e21b2baee60c809b6b5c1be9d3c60788d..c234623b1c43618921df71c5610e04c878810850 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
index 54989969befd2046ebe207c06a91014965aef95f..fa7747bf93bf1fcb612e705f5585786e2f16ae30 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
index e057d748990a4b0f1a75d057832ba11d856d4d70..d2fe92ae7d720a4c1ecff41aa16a5e64c476179a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
index 327e1f3b517afe55c54a42efed4d919e3bf50a6d..0992bc0a9e948cb37a0b553ae6097012891de553 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/10/2007",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
index 877b9d9ab43c714e376c6ea1ab750f8277864e92..9eec45fec07ad7e88d2b78765c4ed9663bc36a1e 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
index e29e456150e57f681b0db1269f403a305ee37a40..8f0506fb4f3aae2403dc58b6830cb4129a0a3f4f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
index 6610e21708fe47f78c45423d9a47a01eccd52941..8ac6035b1ffbe1593740f1967de6860b15be6650 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
index 9007737040c92f6a5b406e0468096a204c787975..49ab95b47bdef02047cc66f39100c2b0674e4da9 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
index 5a16e01f0d92ce223f9ddd44d6747bf6a206ce83..ac075bd4360df5ba306d8af45e785228ba72a692 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
index e49b410d7a4bdee5ed00611a30ff6997f8f9a666..fee1873321ee9e63a6b9231e089e680a5756776a 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
index 04b54ff1a888cb966a633cd7557cb48e2e309293..d61e92b851761f6daf42f9bc0041209d3f76c5b3 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
index 4abd6e1f28951d9afc69decfb048ed68cb84d5d8..74b8ffab2e492cf4699599690064ccf9639c4fd4 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
index 1e58cf4838eb26ffefa952328ae77547f0bdf483..16fd58d720b713ee76cc3d34bec9b3964163fdb8 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
index b94c49d0930e78d3156694ddcbf42ddd2975c548..464af17b9f268dc60a671d337216869cfabef4ae 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
index cb5bee90ae737935f6af1b7f48083e374fa99085..9212560f2ed789c1b801b865fd361a325a0ec89f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
index fab219879bbb41f406f82106202ee9e88a13d48e..01f2843f7d58d8473859edb73353b18db00f6fff 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
index e63a440752125e080b8eb9091fb57b0715642a8a..a8d220a7bdc3be12520e3f8b129281b1c31a8f8f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
index d4877a32e58345f45ca2d1e88a490ab66f72cc94..8ce34ab483c69a87bf0347f9938dc525ab3b55c6 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
index 654cb715fb26ad736abb17de1d1a74c1e4b4d4ed..38f381f13d5fc37b42db66d23de78147217bb56a 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
index 2f3c4d19d6bffb96fb563959de49892e26f8885c..f12c4f535d075a4dfe561a8e458ee54cb2fb064f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
index eeb041f547818fab45c240f184738bdd0c2b65a3..208bcd09d96e4749fb12ceb7462f3660f7289606 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
index a0660b6413181a839d074f250f033d63fe79a1bd..55a71f09eef7e2fbed6b5f3cc9a1557971a6e394 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
index 194f2aaa2651cd9f1a741a0b9158a983b646d13e..dddb6473a36f748f770bec4cd573cdc926b25170 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
index 12cc13a55ac5d81923f81548f1ff178fabd4e87f..ee52240d2438cec8d378b7fe51f9868e557c3d62 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
index 4b3db9d131e265241bbe657d463bb25b75f668cb..92a19a83fcda67e637569d0451b6b7a7fc00302e 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
index 8f19a8defb6cb5eeb869d2082ad245e41c53cef5..0b3aba605ff0c762f83e75c6ec213bf56ef19c2d 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -7,9 +7,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "10/30/2010",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
index e9fc2bbe37c9b1a85646615d5035507722b44403..1049c3a0bf746bc4b76ff521a8d1018d9b7a80da 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
index 1ec0d6916bcc91b9a07869f67d61c6ab14f4c54e..7101e82efe32cebbeedebaada527d0e05a69eecd 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
index 975ef63af3e300c195c6057097a34801766dcb8b..c4ec5a2ba77d06f9aebb6dd872df7582740e7360 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json
index d6d650e1b2c9f1dfb2827dff5cfab966e843edc9..52fa895de165c821189e29927bacbca8d66cbdd1 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
index d96d00d27b22ca088ca7d33148a6ff4899931bd2..2dfe5fa515de83eaec617def24d03d930d7673af 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
index 11953e929bdb5d81b6f9df1542332458bf25c34e..5ba7aa5f9ef5e3b4dfdc335a6f91f02d5f050e4b 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
index 005bc1f891f9b0ad0cc4f886c2786ca038215708..047bbcc17221b565edf0362f32485167f94f7399 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
index 387676c56bba8ecd1ba7169d4df8a467bbbe64b8..bc09ec38af4a703f036d900f5334f3b5783643ee 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
index d5c7b4157853c33b3e728b5be01a4e58bcd3c653..856f52c2f39d84f8fd7d007ef45e4ed8c7ff3dc2 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
index 5ee3835841c360a97c9bc84dd44256bcb2b88d91..aa8c9496b9e852cf1faa5e06425ad4823fea72f0 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
index 6e617a28fd6621cc2cfd1223cb6a12542298edca..1b56b92c28ccf3877a55e7a65e8bf3bdf0ac17a5 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
index 486c1dc301ad3f0ca7c87d96b67d9f2e8495be92..5c75b9ce38bbab0a5268271b003c9a77a4fa1bda 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
index 0602de9759cf8f5c4fc8e0d7c70584ac0a6d7cbc..4ba58c6fd60940cf39eff61d2169e693a9c7898c 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
index 70ee7c6151876c75aae8026b13336ea09d5ab74d..1f259f98aa06a33c331e44ca49f37c0fce1662c5 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
index 2329f8f9cdf27c427a65226b4a0bb5fd675c3ea9..f477e05f48ab75803d5b4b05ed86e674f4e79635 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -107,6 +105,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
index d8bea5eec31f8263c07d9427a6971bb34da8cb39..01c351631d3166171cd77e3b0148659bb1144869 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
@@ -6,16 +6,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/27/2016",
@@ -108,6 +106,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
index ceee381f7d5dc73e5aaf2e7fa99ee51613311a6a..3f78028454aace68b4966d9150ffbcaa1b849971 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -131,6 +129,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
index 15f170219fa711704c070ab1bf2a300f57fbb4a5..e750ab28ca04e502bdd11e97a1f2ab06613b09b8 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -131,6 +129,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
index c0eaad3cb3211815402a6e361f172dbc783522a5..fc2bb94b06aff0a19d7143fde713b569a230a7dd 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -131,6 +129,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
index 264dba828d1956eeba160070875fadc67e95bee9..5f91a8a9df62c58c50ba3d6efcf8ad5ba91ffb6a 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -131,6 +129,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2000000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
index 33a535dd5cfa8dc6f818b6de8bd7e72b9837a5b2..0700c59359e5a8a6e5708ef2de7bbc2ee8869f38 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "05/10/2012",
@@ -164,6 +162,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
index 2b6a5dbad3eb399005cdfb084c20d92350eeb563..859e3c25810391295bee41d2ee35552cd5915e50 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "05/10/2012",
@@ -164,6 +162,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
index 8553daf5e222e9328e929061513d203a763d63b9..1295e7014cc37da96ca991d19e0ea13c882af51c 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "05/10/2012",
@@ -164,6 +162,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
index db0503e3785396d81721290106f6532660fae372..f441b6a86ec73bd0bcacd1836b992e05f8aabd6b 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "05/10/2012",
@@ -164,6 +162,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
index 85bb9151e07652e647afb1b54aa3e3f9a9d012c4..86fd604e73042e75b6f688185c3ca904afcc22df 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
index a18a87fb5b808aa792d64d18dfe37286de8cb2ce..fbaff75bd2d120dadb5393835e4a3d30c4a2bcab 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index 2a1e23a7ce5fcb30276be70868340197126e2ff7..888e48362a8bdf334313f0fc0962bff77ee214ba 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index 127c1f579a5fa78b901b4ac305396df70cbb2a45..1346f07392bf339eff05f84b1951867736bd2969 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index b2192ce731fd10c0ecb49b5a56625eb731dc892d..6b65264dabeb8b2e444d9832e132cfe8bbd64ce9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index 9e217bab33a4a8b618ac352167bf314e0c2ca170..14c0070cded5e307ff2175c86f3291a9c245e206 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index 1bcdf676b12a7564cad34eaff7346d9ba90b873d..d7058c78d79f87051225c82e75b2e286f2662073 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index b7d68798dbd8fa8b60ec3a909f961bc8b222fa51..975bc13f7ac06fb16544ddeda9989675ddcefbb8 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
index 89eaabba02d6473ef51a09b1e3a82bb713ade016..1ed2c78c722a8c6f8be124f5229ae2f4a4a51e45 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
index b7410b9917538aebe670ee6cb1a9fca32cad876b..194a5e2f872042b11b785ccc9cc4d87f5ae71c6f 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
index a2207e95987e4f1dcad5f6ece470f7f0c7bb4716..51fb3bbf3e496f5ee344a5460b8020a48f8f13bc 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index b2fe2335e1c283c1e99db988067c5a9c968b17a3..5ad6aa04cbdd54795902f666c4c1603fa7908d6d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
index 5bc1bd30e0bcb58881c3dc5cdff9b0c365014487..fb338a0ec135345e774ec359cd3ab2df5b895469 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
index d27ff1bfaaa3dbbe61aa57a9d92de4f9016c7e82..8db159de165c518f46ee3fe7415190c2f65a1254 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
index 6572eeeef4449a957825bb2bafedf40806a3f423..f9d6764945d29c78ad319a5fefd8e92dabd7ecb9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "03/02/2005",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
index f64f36cee541f82c1ded9a6b13ecbcde33fc7863..73599c44174bb438741e1219094493959d38951d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
index c48d426922fa106fb765a4130bdd8d02dbad1a57..5066a18cd5cddfcdce0fac981f57bfebe24534ea 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
index c7cf96104a4360b79aacf15cde0e48a9975deb7a..785c78e9930537301459f5700bdbb361e43e0bee 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
index 20809e746ffa6ebda1da58eff9007f89a062d7b5..499255f5e6f02c4ebb1e276255fe1e485841945a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
index ba523713fc00d3465bcc104d96ca56f1f6e7720f..9780c9867c67d929851b9c1123082a3abcbc7a72 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
index 46981ba0846d63e2dc50662ad24761d50b2f3e90..c24e7d67f80a1cd175ffa74f3fea310df1d06c3d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
index 0c0c997695b28489ca542d821e3fc00ea70ac6de..b94c4ebca2ef8289bb4b6fea0b57afb14ebdfb9d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index 990a3e4d9a6f38d0206976be24025b45aa235b73..ffb8c84226df6f63df8fe0a8fb3971f902dd4b91 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
index dc16f985b3385b5937fbc1dcb29854756c27cba5..0a6c490b1e231911b9e940fbdda9f40e0dec1391 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
index d0b4b354e2df17f8121d5e44bf3f4175ad519430..7e115113648ad580ad27cb14120b1d77624eb92d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
index 641e1d3d194b9d1114f14fed2bb2c44beaa0fc7a..93675063fe6f2a04bc6bfd763c68e990b010143b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
index 222f66b76155b8331aff0ae90c77515a8a07c390..5158fb47f471318c9a9dd9f9ce4c0bd7c14368a0 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
index 8d1853dcdbd6e9dcc107fd0800be038387355511..3c9bf5ee4cf7a5d04068db866a64c7898fa9aefd 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
index 644ec92a20ed49d1eca04dbaa3755b58fb17c575..037efe4776501878dacb07fe9f6ff501e2c4a730 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
index f886ac6751e98b4dec39093aeef644f5d56bfa06..326b726bc04b29afb2e29c0248caca6582c4d97a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
index de292a1b129d3075b98d23bd2769c2c4867771cb..f880a31deff46dde1f9617f805f7fa7880cff2c1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
index c054ff024a582df197aedf7507dddf5060e5757a..abda47ef82918ccbec872270fc8f2797a193a82e 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
index 404ebd61cbc08c2b47c3a58d9a805570f62e8e1c..4b9964c375172dbb529ad44c55a5061469bd8037 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index c1211558bab21f84907c61bb30138c4bd7867b12..3fbe3ffec55a0caca69c46482c259f9976bd3df6 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
index 06332cd7049a19b7b669f88b849df14e3d933898..2c1390ee88de628d5ecfebdc7f4c0b49f25c2905 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
index 641cee33051599d550ada03e770d59e3ed7524b5..8d178037bb40076b7eb4069f9d2ce65bffe99fde 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
index ef7db58d372091198af794ce52b62a47d7129aa8..b1dc77ebd1c652bbf5aef83d51c8b4176ff1a36b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
index a18bfa19efa19210bb1e4e98c16cff2ca7dea4f9..9c19f00ba2befb07eb3b78fb29132333a7771b88 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
index dae0ec1e928b01eb9b6734ccfb9365180df41eb8..336db16468520d1e94479074e2c2425059e4e2b9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
index 110a3b94e92903621b9361ca13fc9ed4c30a2221..77bf877b7e4a8e476cca3f25e78822d5cf7f8c21 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
index 0f31d24a8552dd651f0afc2ce4839893a6e1d7ba..b18ce9828190852809f4ca936c1fa4cbdac4ef1a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
index 71415f8a469f877e6c8f5273782310f3f769713b..47a533f8c2d683608d1f79739a322c23bebb9f15 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
index 61b7ac027817bbac76bcb6aab59e9513eddcfa03..83f3c790a462738d76ba89f7a9f8ccf1cfee3e1d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
index 0c93829a84a26891f0d4bc5f6c7365496a900e2d..33ea5a1a9457c62ca1b2a7af4e5242de648adf6d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index 541a98025ac130863f7cdcd4498c379c052c827c..137881f1514c51bb091b76dd303ae4195204e954 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
index 99899e10aefe74a1d8abb8d75f8f3b4a3c177679..e06936a8a6a1b02ade48148a6ed329245d6846cb 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
index 4d5baba918407a9fc20c88b449f14139eee5fa57..20fa822bbb0710c03159f89523d0e010933e80e9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
index da96775eb7710acc2374665911dc408c63dae3ca..87465eb89353dacfe20b5b4b2bf7ad6c12f9cc01 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
index 12bdedad150d36766f3ffc51e7be70ab308e0f67..0c979c22928631ff75fc9f1cd7eb67515ace637e 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
index b1e2d20437612dc2cec5a202e730c8db71fc8a10..19c2abaaf5a9202882e13eb6253ebbbfc62e969b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
index 54d73b32b94c684ce11cb96079876117b640a19f..ac13f0809e6cf270885b1fe44fae93c90ba743d7 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
index 38a07c1194f8a0c629cf84b632fa056aca695c23..47584ac6767b8c1e0f96d19bf18a2728e1bdbcd1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
index 78020e34acd555cf41698851b5bf1822f05600ee..397486eb51913d84e3b8213ac5c723ac5375062a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
index 7d54c6c4094220e785edcb2accb7caa5800f33e8..c5e507f936740648dc10006f8754595f6080cf26 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
index 2e78433b42d90944df727fee5c1197d54a54f9f7..a726e8ee2a745467312e3b919cfb546d2518835f 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
index c8e251f7ce1aeab7822a553a30096cccf7412572..b44bf0aa7b1b30a9b4d5bba9f4dde13ad05f6bac 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
index 0ef2683c059567a9a2002a2cb61ce5affe277467..90abe9a450cba84905a3d6c2cac3708fe42e5eb9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
index 68ca7fac964d4977f60c172532095616a6cadb5c..6be8f82f54fdb12b83a84f4d1a894306e3f57a9a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
index fcacb9dcc42e5f9db55a19cdd18e3df3fa604142..0c52f25dddc91d573458cc27f3ee0c402c9ec9e9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
index 6a9ef0ebcc0d6395eabc180da29662ff84694369..321b099601657abeb92581fdcb20003a7502b2dd 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
index 08826e490d1313b57f2517e5d532a56cfd1e3e5b..f8c070f2ccc949d5400ce804dfb1aea3935a6800 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
index 9fc65fd3afb3526ac8a4dac7d5311f23927d5124..0c8bcc79d9472951113b9e32de47e795c8456986 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
index 190ac06633d400a4feadf1be996cfbd76f9ebc76..5e481386c92d896e6917c403f2a3c705fa181f09 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
index 9fe04b6a75f2c9139c4d73aa42300a377dd5321b..267fcf15096a7321dc02ca122e24b599244b2cb2 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
index 59d3aa526cbfff1c242f11c259ab2727b371527a..9eb4e14ebe5f904a210b17db7d2215dde8d39163 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
index 82ca898263a025cb9bfefdff81c87f22d295eb8e..12b67e89475c05848dd79ea300583cd544a76ec9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
index 4f8aa76268b05687a8a61fddd4df43c2b9440098..bc7b37e547ba1eb6ad645ee675ac5957dee7083c 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
index 027ce75ecd12a20a14b02f12987e7a1b9393e129..be151f575649a925cdfc80176bf10f76bc81a3ca 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
index 80796ef983a8b89da730750be71196b51a4d5834..9ddc3bdefdffa3383fca16e4feefccc90aeed75a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
index 58fe7fc25385cd87be39b0273ffefc42a955f256..f03faf78f1582c2ee93ae08184d0afbcbb7cb21f 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
index 1b818df2f018ebfb2256352246abb66aab2925b9..38c65bca9315b1e127503c199226cf59225e6a54 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
index 85ab7fba111ea85ea142bae4d1be5c410959eb3f..0678e3bd1c21e4df695a0ee04f3d8d5bb35c8c56 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
index f3286e96a656906d71bb586a413751375d5ec7e5..5065c0eb3bb0f3884b2c84e0c650b08a649a10ed 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
index 51eba37a9308bd77e731cfcc1c4c59b1e19a70e7..31de10c8b9ad1dbd36f78baf85483a57914b2f7b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
index c44b4f23410413406f2d6f3319bcf6219f6544ea..297485d9175aaeda896723bbb477006f43f61a3d 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
index 07eb297ef83d9e8a7c35d15a243d437674628ba8..b84c433b20b88d311d4b824152a21b788861ad0b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
index fce5392a0d436aa3b0ce202031d6013b457607a4..d536cd194a9a8ed9fe9885120cb6e651fc7c5572 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
index 76c49819b81f1a8488afba90661a467343cc53e4..ab9285ad868b78e5c65108dfb33769429bdba2f6 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
index f298cfb51d3dc4f2b94e865805eaa666633bd830..0c42848600d81d6d670076bb633382cd321b41b1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 2,
     "nb_procs": 2,
     "nb_threads": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 2
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/25/2006",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
index 8dc7e2713693cf282965f1aae4e69dd84dc64a88..12bc85aa3301e0501199bcbb601df87cbdd5358c 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
index 91ce622f0de9a48b6fd90fa19dddef220c4afdd2..e72bc0cb63044b25efb6d1e077554ae57b2bf126 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
index 2b6e298ef97c10980946bf6d5d1f336c626e11a2..5dc22b69207cedb08d7f1a0d3014d46ac1bb9712 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
index 5026d0c566f5c037088d594df93c3522b70f207f..ab63ae0ab36eb7d5a781db54bf53347a188f7b2e 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
index 6a961640704a1ecf143484df93617718e8f6ddc1..ad41f9785f862634399be6a64c03d19922756098 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json
index 875ca5d39e9857748442e8cb54ba91ef6136214b..64b7e4bd84574d15876960eef621dfe023548119 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
index aa63f76cd92e6db90dcbb6bb515b432699c31f87..b900eba1dc8183152f55f416be34fbb0cb92d604 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json
index c56aee3952ee21ad0d6c409bd21d514a966aa962..4b3dfc2732d3b636fc1af22e8b475143bdc9f9c4 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json
index 1870c0e5e311c15aa92fcd5a95b84710ac446432..051f744ac479271fda5298eae8efc87125f20404 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
index 69589965e9ddf7c96f09d5fa9924efc370eef4e9..9b9a3db2c12bc60b129c82ad3eb2c3b3aae62ae8 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
index ad45c5b35f8c5023fdf7af7af27bf480bde87d8d..83bb564acd5b8cf8b7d57d86caf069c47bc0f0f5 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
index b99371731083a59eb0cfd3ef166f7eb68b777eb2..411142f8f251e0eaf95795595ba21ffa8b40178d 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
index 4ea5d05bc1df8d82a915f9f049b0e80bd0bed4a8..ffb8310002e51755855f7a6ee3b8c2ac7eb42b87 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
index d05c7e4938783f39b73ae8daf2ab8b09a4e8252e..3126e6e531a09629a37100280be6f652477ca04e 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
index 0b06d68ebce5b1b60ca4eeb5e5b185553f4298ed..b1721c0a235c2e3ec2e9ec4f26db85697d8cf31a 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
index 2804cff0ed954b08c2a644e76f83612a66b3abeb..3bd628834a3669bb7538f32167ae9131f6b2ca99 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/22/2016",
@@ -161,6 +159,7 @@
     "cache_l3": 15728640,
     "clock_speed": 2300000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
index 317b866b305dc3e2c8d5f6e5e88d3f06010f4173..a2e03eab24e57694b9a4444b225947a489d9db69 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
index 11db4736383ac8215f984947db8185b6d38f487a..7f0d644806058225c040733ef1e4e662658f30b6 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
index bf558782ac0c70a757795ab0b0a759b33e82b23d..913c9f77d4864bb8589d2d6f3c3831cbd2b3e97d 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
index d3b454721738af8d032b0ec16da5ea28db405e5f..1c9439d2fde5c93bc75bbb6dc00b4e631810782e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
index 581bd4cbc2e86a5500e4d9db40e3ab3f3ecfe56a..1b10099e30c3e29c9769f67119e1cea1e213e92e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
index 8786077c9b200988f8bd672379bd0899d2997ce9..5664ba1f20d5342df98e0e3ef003960aca2ce877 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
index 21d32294a8bcf2fce4a3c40ad6b0c1774772bf16..0fa4df1aa1a3ba0279df3bfcc4bff883dbb92fb6 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
index 7b466f169625d378b6449862e9593b21ff97960a..9ddcf8c3af634774dd2fe223318efd7e58010fda 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
index 7dfff40cbc721de1d1bc17a58a87f41a9d59c345..308bcaf6fd3c143286cff29d0c5f7edb5a31ec10 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
index 572f2108ff8ade541f3e36ede5dff632cdd94484..5afe974fce6da3490c940b7bdcf90b148c6f48dc 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
index 285ae9edba69c645f3e1b597979373673fc36411..80d7f1db6945bb3824558e9ecddb9c86c42fe908 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
index 751e455b5af0818f9440f36708e302d73cc85759..29cb1c379cdabc5044c18e66d01613efadf5d675 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
index 63899a438b95d5932292f44c1e7cdbe92d17cc6c..09120642114db97238f0de8df245283eb4518ba1 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
index dcacf921bd53f2ebf276bc289ebd808cc632f80c..3b6e1efd813d9720243f4d7c177e1fa6f43b7750 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
index d7b690055c76f551c30b278fd57cec1655e964a7..5ff38b67e252987733f6a7ada53440e27f911afa 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
index cfe6e313acd6f1661b0c90e56b151afb5a0b67da..f150a6dd018e2ce38a6c7aef4eb5bfaa0150c8e5 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
index 35095572918272f74674420159de729b905c8707..19695366638035669e5cffebe8e771a355d0aa98 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
index 4c03f9c7643203fea883d9061a420494846a5079..f97b3d55a8ac96d7eea8d9e563fda71fb1817f40 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
index 124905c701e9a37d6a816bf5bf5337463f515339..700632fadaaede7ca42110588d7ac94ced5db95f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
index 21650319cfa60485aff57dd16098fbfd77abb3e6..f1c9d8af7c229c4e14fd0d766c7d80e1b6f368db 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
index 147c57d8c85e694938cce5bd226dd592c63ecce2..1027c6bc7be0189d84e8cc727e9ee1379d3b6a2a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
index 0a43116099e0f357158a0b563a0d19dd268f6e60..64b5d16f35ec0303d7b274630502d26ce1552d44 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
index 687f9453c1de88ee9a7568cf3145d3081571d663..4f197f0d0944ab3957c2643895cf7f2a094fb433 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
index 73db3d0431ec90d2f34414e1d5ce64fdc9b9c4a2..001e9ac932bc4f85fe1a3d80fe2763e98042f88f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
index 058309139109dd0cf48f51fd021dcf9cb81f518e..7413cc3bc34a4dea997491a7093ee17498b542a2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
index 6b8f6fb76536ceabfe9e22f07d48a3f07bb0e048..85e2287ae8cd6cff5d0dc436c6000a5928b7668b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
index 872d7bf8b164c259d4be2e01d0585b92c2e02bea..1a807cebe499fa26530507168c82cc6e51f99c8b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
index c3af8d0a5302de618ba02aa0d20cc38a6387c3eb..e5cfe2cb28b779e547003e82ba1d798094bb597a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
index 477c3349135b9d7a528d96c39d661626c0757019..8663f0437e106773f8cc6dbd6bd33aff696a0053 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
index 1752c40b571c00b59fc2cb024261f328e2d0c1a7..ca3945c471c65ccf9d29c107accce835826314a7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
index 0aa1e6f4c03df77cbc333ce5e25472243eb38917..125b57081bcfb8b8d9268b86049b7d49efaac7a5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
index 25fec611e71c0bd79538b0e24cc39e5bca475fd6..fa189394d48b3e2b9cd54dcba194de6b07d31657 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
index 0ec3b429665f49fd028239418ec06fbeb4991e8c..40de8d182ffe0bc59cf25f03d038be53bf72662a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
index 753ce6628d1853586f6b5c2fccdde4812069d810..00bb7be940b92d8663d33e3a50c0c15ffe93e574 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
index 21f929c56e8a8776330781793b53945106e7c234..c79031f8c2e391453cac3c4894f9606b42fbe648 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
index 75021d9e3bff0299a3cc7e478a96ef2b11abc95a..34d686e23624daeba15541a5b67c236e422913e3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
index d9c057f411d9d02ac3e7ec074092750f009f42fa..730b838c1dd6f92f5f300734d22c2b3e096312d6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
index 83e2461ae0388f0c28f04f19822e18ecbbfb5e59..8cc65137b097c1b480c8d2a8190225ded5fab514 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
index 0480169be53bcbdbef18d1ed53a51c2a3dcfa40f..8a549f17ba994da3b3683ec4556ba82a0f800736 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
index 3d40fc99465fe8a272eb2bc97c621e6a70dd6af1..feba431f9c932edf627b82029718451ea525e156 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
index fb7ed91e12155d07115e98a4376e1d27319f6b68..308be9ee82f8dbba5fc5c8a20a2994541a3ec34b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
index 3ca9be1e078c599fc7252e50ba8ca13e925e1ec9..6c818b2c4ecab904ce6ef63c368f2a2ef3d5f336 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
index c5da95f010ddf1044e3f27ea3ab54fd2af0f85da..fb585c16af4521bf86228fb4225489612e1dc089 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
index db0e059492827cb03b5f11cb97eb8432be049810..8bf29f1e783a457918af86bbc35507420a3156c0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
index 5f6b4af8b466343ded11f7c7c34dfb68f7565d06..59f63775d9795ac4588d923c86083b788a2c52e6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
index f8a3461cb3577674b2f36837571d11e54d428769..b222d78e6667636263fb5b06f21292a0808a3689 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
index ca6133e11259c7e9499352ec1988e5aad9af387e..f2af63e3b2ad80e0067d71303dac8aefb4a39648 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
index fa2f60a3a527e663a5386ba467a59680676b9ad5..5ece7b33b48676a8aa0ebd157c1e3e15c337ad87 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
index 5eddae1df66c1ca222d5d1dbe40dd6cca6b58b9b..0c0f5adababaa066b115e38aa4713ddd9a71455e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
index d8bb2104e289899d068c29f1af54c7c0b3438381..b708eff145765e8a25ad30bfc73cea58142573a6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
index 9a483a52ada743b1d86080e87aea00bfed823636..f18d4b663a3936a24c06e2d286eae5ab1aaf1d49 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
index d86b5f23418f8bc4181a097ef3b76e27de15061f..4d70039563c903d497d791dfa7a9a33fd73a45bc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
index 15df7ce946995210c8407e32b37cde3ae30eb3e2..19b9abe4f7ca47411d8cfffe9c4b72477127ce37 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
index 395f478af4796973b433b18125622a0da87b82df..4788e033b372a543b876f64d09a2baaa9783bd3a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
index 9a3148f99a40b3c4233a37cce271e36f84d65fad..e38ee9030c4f8329e61ea74deaec3f7703ae8fbb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
index a2eaa99a8a9281e57e2a4c0b41d0550d02ff16b7..efaa010db2f3e9eb90ddf532030f20b9ce8c902e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
index c6790664a200251a1b2711620d828d539ec5eaed..706cdb021da76e742a88a1da8fc7a7c610f11435 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
index 4e3ed857f8bfa72005ce21e1db33b6690ab4f215..7fe71266fa73febef74eac222bad17f7f26d0658 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
index b66fedd68584b34403cf740e4337066b4b7c8360..7d34078337fa425d714f526627b06d39141ed27f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
index b98f328b486ba1900fc35e04581a93088956ff93..e3465b8c46f25367e24451b67895b05726bc2708 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
index 0a2dd1d021c6650ca35bd6c19575ec93bdfb5ef7..dbbeae6fdee7faa8cda10dca696de4c316c74b70 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
index 612d9ff1eac5b31006fff938b3d4a49db4b6c482..4c9f8e692e6111de36eb76ca3a2c207f86b262c8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
index df86d3a5e401080264660219d6984b7534ec7e47..1b26fe54dd2427cb851dc5aefb8b00c9d2b29fe6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
index 795019ff2a218005776c4e32c39815a09b340ad9..9f7aab84df78a52998dbea20b97a7fb3a490ec56 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
index 2d150f1b8e94fe9dd8c7d860d019308edf7a1b7e..7d50cb183ec72fb860b0cdbf2dce1fb169241992 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
index 5792c6da2a65f92c33084e353b294fa576800010..8d46b68f82ff908996e5464aa61eb4b41f9c7b6b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
index 12e0a25dbe3c3e95b4a3e6e0f6370d5755d422fc..510563813e4d933b98928a7fbdf425d40107868a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
index 6239ca8abdb42baaec3856a2f48e314bf63ab528..d4445178752aec0d898e5d87d7a0fc1220f83e8f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
index f40cb245eff7b33d145cf53ce47248477ba90d7c..b544b35c98aee5f5cf0a210f16b22459c2e8fb5d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
index 7d20ab3e2e090003efcc3e2fba1fc7e210ac3835..2f0cdc64b5e3ad671faa05f1f1227abd71bcf35a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
index cab7bbd862acb1fade16fc455b4c6ab256e5783b..961606cc7c60a0b1ec346fa9a02e67a57e80e95f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
index 5ac2593d7b7e646b7cf370c8be37592f7c04554a..033abd95cb49393ea93638dd700c1dc9c93852eb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
index 56d8c7d922f11672bfad777b08656becce502f0e..539122a69a6f4380c2d9255070a1a2ad66e51d08 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
index 52f0229c7cf3bf88633212c3db6897da683d60a5..93f12ad2fc9aefc1f70386999142b3892ff1818f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
index f5f24b6117abf525b4163f5595f392e91a74c98a..147a05e1a1b3fedd8a19accfe93b27984d22f99b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
index a70f32e9fa3d514e335e0541f80f4aefb3f0b415..180068f9de222e8255eb5a981aa1194e70783518 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
index 1a1334ebad5e43015b49a86e25b57d9b174160a1..5569eddeda8ce96c18bc008fbb4c0ae6c0131cec 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
index 615a21fea831757c6746a1e5a5024d843d6be4ce..aefc2c6b226667e7b602e9a05cf7c71852384199 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
index 8c6c5d1b9cbef1fd77cbfa920c84c68db1c25eee..dde6dd22f2325c28d10991d34732bb98bb2dc3dc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
index 7c1c0bd32d4336fd922165c7e5d8fe0f47462c5c..5891502137a49e03321f774893ccd0231311f6bd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
index b3246e2b64727a45d69996b828b8a06cbf587dcf..31c789784c69aff026765694004d57813ef7f292 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
index 148fa2a40bb107d9e71cce1d8c7f51bca0eccf75..d3601429bad65b2b85b78b75089f2b76916fd8e1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
index 72ebb7f6c67fb303b87d2005702880c8df87377b..8a65424e19af188952f620797415a8756e76e264 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
index 4707bc0b08a147152f76663d1ca72d283afe2e6b..2428c87f254dfc5461c6e519bfd429a1d996ec5a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
index 67b4c4a239c1c15e973153dfa8914be9961dee2d..2a3c2bf1bbe0b5c98712066158d39bb4f1fc2b2e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
index e263b04e22f9d024ef34c2278cc8c9addd50df8a..0af23e0e6cf42f711487fbef1248bd8001ac7217 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
index dfad171a796d8eb9182a9a0882b56f8d30c4f8fb..10d28d854c95bbe2c3db19ffd230d433a6e843d8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
index daffa3d8b79939d3fbb8d31a9c17dafd5f6153a5..d92322210537ff73a88317f484c19df2b6656ede 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
index 1763ea90552cbea31f39eee1b1eca80a1534b267..c590875d8ae0407ab4e35a1f19eb2534112dc956 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
index b7fb15e12cc2f0e24320c1e2f253af0c104c1f15..c5359764f345eaf2f68313b7d948f6a60d091204 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
index 1fb180daf9a407abdbea700f7b46301c55538f7d..846933c0fb931866b6cf18170e52a8494daaf8cb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
index 0ada53db30d7bb63a0cdf9fef3bd252b30c634f1..2279eb072070e6fb288f88c57deddbea29d4f8a7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
index c7771ade4035392a457e5b61e05bdabb5a74aa42..78fc18807101c9bc5eaff349df36ecc24b1da06e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
index 0ecab137d2328246b57b91fc5df004c03d26098d..bd17c0977c4e39457fc5178bb8701a60647d3cbe 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
index cbce652810643d2edfbc97302d638ed149afeb75..491c7c52f032436561390547a57b48911a1f33d0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
index d8cfc1a4641b2fbd10b189885a9e150179c319f0..ba9973498cf7c491872f0229e7c0f60cc45856b6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
index 46757ace8b4a3b405848e26d8c1aa828c5570235..b314eb79214b04ddc856eb39783771ead8026832 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
index 9be1fd38d29e0660f12281fbb193815b8f9a5e34..404f7c2586b56164b8025b52abaae4391dcbc2f5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
index 6c3e217975edcae4de230021f5566535ebdbe3e8..b8befbcb98d7c780a076c674bcd85bf5c73259c3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
index 623a1492a0ac2313fa6c08aed2e66f90d3759a86..555266bd7ef102613743266e0f8942676ed91fd2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
index 5ad2954c6d7e252c9c37568fe2004931f4c77535..0a012fd37293f135a5b4324015f3b1205b7f798a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/06/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
index d0aab421f507be6ac3ea7a3e7ca21c0cfc3d5481..bd43a72c3100706e2668aeb17b624df4dd45e20f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
index 66d028b90d04c26482f56b60f27f8a8fdb0a8fce..3a43a205ed0edcd41e48155876bfb54166e43d53 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
index 0f05dcce08eddb15ca819b52272923a7c6e2731b..be5187fd8678ae5a55fb11f3d31c5289bea2b6b3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
index 7bbdb70745006fbf4c3480d02c6acf7db933a2cb..69102b8db288e464bdc53a062dc9def780fe8c0c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
index 95cd57c35fac163e229f06b36bda80cbb5d058f6..698d169a1adc605f0da3711d35f688ebf51aafcd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
index f018c3d3dfe464bcd46ced5b04b9635ca145ab3e..68b6095df53fe1f745325e1b117e0f7cf5a208af 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
index fa0c0b4b8e4b98322109879a99e8b293daf5021d..e4a9e2a1cc18948769c79293d0e74b836cf272f1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
index 112122e6fd98f90602ff916de8946f1e01d6c50c..d980d6b113b809a864f1e3092059f9efdced9aba 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
index 4a0db19511ba63e83cfedbfa36e3ad0a4344c977..3efcf97a25fe333ceb531bdad84720810e56b3d7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
index 8a069d93219aa6f844fac4baeaff88537e5c04b8..3f8fb1186b54fdc8736813f5fe579e9b8c793b79 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
index f9039db77e9882f4aaec2d08c7677c9312d92f1d..d797ae97c084af4695b25c0328b6fdc716d47272 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
index 301df308a9f5aae9a68a3898d66f4b13dba30397..1957a63ad23f49b6f3d458b14743aad04c29c466 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
index f8f7617ce87ad46f01593b1bd1db3d0f95e3fa56..7ccb955dc0aa04727605bc94692672e6fc8a2d77 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
index 23f2a266593ade6c03903456aca4e121c9f0ab06..7dd97beb75662db52d52bdaef1d0ba92743bfcd1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
index adc7340e84fccf57a649f9f38555be333b3ef240..d7681037ef9ce8f1b18ab2e4e6ca7358714c9a17 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
index b662703e1e09eeb5202a639fbe6615bac710fb83..940834d10c4accd5878319993373e7e0fc2fc4a4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
index efaf99b93e3913a63b5cca8b1d21ec905e38e877..31996f779fa1523b4445bec1dd01eb00f289490f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
index ca1a955da553115e29cb0abd6b03bd802729b0d1..5fd2db7f34a45985d6e1eb94d69ee70f62ba6948 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
index 38a2fc8705fb9a920e6716dcdc990caa3beba568..cc3ccf54915c072724a63b408cbb624f806c7e8c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
index 39fc20ce3da679f2efbd1cf8b1c06586d1e3d235..70669d88f3a2d989f4b590e6fd7bb93ec27dfde2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
index fb8c2a1e7e1b8b7dbf4a315207246696d82d049f..50229f143083fd41ac043c9661a1167050527aae 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
index f79a3528eee1035e3490302b1795a0b3dde65e58..0b27baf72d02f254e853851bc96abbf2d13aa1ea 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
index bbaa79495b171f8b3c38756bf90905df84b7938a..95c9b63c03bca72af2dcfc6890b1ef4ef4ef5e18 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
index 4966d9c400a146a7ff75605b9a7238bde9c0471e..3576d1911e7232511ae4c13d9a5c3ab9447c9896 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
index faea6cd261be7026f2a8896ce0d1bd65d6d458ab..c8c06c9e9908ac94abb77f0a2d3a60f940e9870f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
index daaef138df4535e548845aef1e2c657fbffa52c9..451e5f110946d8e07d941fdc255370e7852a68e5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
index c834a21aac164385380f4ae21949c6b5ee82be2f..11213f84fb410aecd0842c5d7d202a79e72b10f0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
index 2f95fcdcdfff88c0edcf1b7875113364952bc6dc..39ce19bd2ce4d186ea2c77073bbebbf5469fc446 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
index b3437ee5844d914282172f983071289af4badcb4..b3acc3dbdff18efa69267b47e41ec16074785236 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
index a75c8a311d3637abb257284b087fc1b3f047b8e5..c21f271a167b1c07f633b8fe83924dec0508529f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
index 92609f1337c160e8808fc452280d04320feace62..8b60c4bffb6a8bcbb1f2e08059e79311fbfc484a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
index 57f3e343e2d9ff389c9606307232f8d993c9f874..338546d50ab634316b9cebe4d08b3f9b491d010d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
index 3a48a1d8e05572051fdb3de6843d845ff7001a0a..014e848ef63e08eb11e88696b3a1ce5d8c121901 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
index 5aa051089d785ec5018c218dafb7cad0858f632c..0910457ba10e2e8d39d2731fec1f9360a26be6c5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
index 82d7abe11f5145095e26fa836772bac7f30f0751..f7bc3ad0ddfe09b4dcd9bb7514711203e1a54f9e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
index 4ab30f7659867f4632fccb72f03abd5d5bf6c649..234c52898940fde67d9d5f237db2366ca85bbaae 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
index 41426c36c19d3e0c97853c2a0607a555861c0796..fc8d612e730e03542f1828a4f2c1ac4d64153e02 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
index 5ebacf4e3e38dbd0f0113c34329eac786f15f23b..edd5c8f0532a574293fe71e90e1d300eba99e269 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
index d88fad7f4fd58ebcdbcab6a6d9ec57a649c853b5..c9e4521a17ffab7c62f6d7a3fe64f2a6b917360d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
index 5786d9141fabbe4287bf73b61daeca16ec738bd0..663fb7649f9250f74f5f4c59e8d7e403554fe189 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
index 5e9d75f6353915a3f4ab0eb83324e08d689b7e3c..28f800cc873ec4801690e02d23c4a9c581b3db74 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
index 0d07b7b199bc4187d3e489b9185837fbb4525c2a..c37c842f885e09af9ceb271d8fd02ca04cdf1f6c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
index 38890e631a52eb5541ff91647a74a19912624841..49111f5d4faf0d55076c78eea7ba7f7452806fdb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
index 3141510c6a7ea6686c0e4e1eddbe5f9e705c6a0f..032084b17b1ac0a1a128d203e040b382726d00c5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
index f8b64411a4079bd3b5995a4bd1b7d252bf53f064..b10bcdc957c15ae641f4a863365881c48b678904 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/10/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
index b1e4eb96938ec4f51bf692172ae0f2dcdef77acd..a57dc98e1e53aaf4bfac538c8db199017d33f24a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
index 6d36e827f9e5ba2cb01eb5e7063f04d41c55509d..5a53ad356e0dc8fce9b75a6415867d6ec0f2c95e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
index a2a7655f3cd49ae0be7e1fe1d2d689289e9e66ac..7c657cc5e8d187bd7eea528ee8e032f5bcba685b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
index f9852f7a6f04a4e4ababf54ec1d9ce75e7658896..815ee9debf05ae8f036971b70ab7720e1f7063ed 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
index 7bb3f375b2fe221fa36865b9c0b50c54bc65c488..28379c981a73063afe2fc4347c0771dfe608a559 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
index 806084c40bb16b8e4b691618ad80f8ab147a1e4f..c4820881dc7e082e27b0ad1d5ecb99c6745c1bbc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
index 58c7914fe52d1e7627f5c08134918f243f170e7a..2409ce6ab087ed205f0cd309a176ef9dde4bd301 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
index a37c26980136a46fce76af90e4def56d72547cc3..50d60eb74d973418e121419930530f8ff286c5ce 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
index 62b2a3eb535ae65940a8e249362bbf16e76f2482..2c067606452bde39e44e328befa91c9aa5788938 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
index fa77c027bb58b75dc16b47976d69c504bed7c0d4..810dfe33112f54f1b0f63c4a5004622ff91aff28 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
index 103b0b3f2aaabd91d61b720969be06173d7a9b49..f508de01b57f4ba343a1df32c4121c5dd905f870 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
index e1bcd7e678365712655bd8d54ba6b4ca0155f046..916b51900925bb72eadc8c47a4e302de2f890497 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
index 09a7dfe8652ef8edbabe7f4862275fec69e13ecb..3c965351ed491be0b8b262574e02db9b37859fab 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
index a421e153621585e452eaaf9c498ef643e27fb767..da261043ced8410dba72ef8ed40219b6d2a4becb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 1,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 1,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "02/18/2011",
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
index b7140d7b2c2f8eb4b3d192b48e2d847f0928fa9c..bd2a4b8eca2f856496bff76b698462f2a834bfbd 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -151,6 +149,7 @@
     "cache_l3": 15728640,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
index 963495a5235c6c8ef68074b2084539c111c62cc5..46378e809d9582b0a773409a2b37b64b7d137cee 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -151,6 +149,7 @@
     "cache_l3": 15728640,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
index d0c78240b7e5b66db1408c9dee6bc8685949c2a8..1bfe00ac4482c1d51528dd5bc28e6f97866cd1c1 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -151,6 +149,7 @@
     "cache_l3": 15728640,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
index 9e002799f569226fcf3ae91f1aa6a4f88afe7b41..b28a436e69e9243d2b3ccf5dd993b5cf7189ea13 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -151,6 +149,7 @@
     "cache_l3": 15728640,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
index b608c65fa4c497918761ab7fe7a9a00564321197..6be74486ff402409b79627741e1b994d3e174595 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -151,6 +149,7 @@
     "cache_l3": 15728640,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
index 156c2fd8baeb16650d098c32f2088e9fa6951955..7fff05a4d08df26db731df31fed0defa21c18ab9 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 12,
     "nb_procs": 2,
-    "nb_threads": 12,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "nb_threads": 24,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -143,6 +141,7 @@
     "cache_l3": 15728640,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
index 062b23b7dd8cc735a730b214c560bca59afc5b7d..5b234db8a9bdb650b1bebd3ccf2c696bc4c81d03 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": false
     },
     "release_date": "01/28/2015",
@@ -170,6 +168,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2800000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
index 5a2fb697d0b725bf7c25b8ed0a3024112ec724cf..742e1945b94c2d3df60f6c48c30a7eb6269b9177 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "01/28/2015",
@@ -170,6 +168,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2800000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
index 83d787868562afe046a6ef865eb3bb011a4b8e69..dc880cb9e820387dd6ca79ef22e78e40b591d26a 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": false
     },
     "release_date": "01/28/2015",
@@ -170,6 +168,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2800000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
index 742703d220a9fc85a8071d9daddbb11e488f7230..b976a656e4c9f1e964dd920e52acc6aaab0f989c 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": false
     },
     "release_date": "01/28/2015",
@@ -170,6 +168,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2800000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index b4b407611779b3a89624b2b6ca15953b2755da49..e7659673ee3bf2fd2b05cd3ab9fe07a51221e226 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
index abdb803d4d99c77f541106c03f368d0c25a36a45..deb02fb027e3515ae8c0425013e180ef2ab50435 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index d6eb217c766a7761e9d3693690a347a1908d73fd..ab7019cab0f9993fea408514d90b3ad74f0a9974 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index c00d9ac68e4f4cf8693204e1077c30f92234000b..2ac5b0a3bfd91f8771c97f8ce03472d8286950a1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index 671e671f84ff6c5aa9fd9b4f1f471a6cc5e5d085..4822883a04036a82bcda26e791bfe0a7a3da9aba 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 07362e0ecb74b5217c6c2de96ffbf894a95ee089..d24b774238487f402782f452ce089c1ee0cd4f44 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index da98822cd847c57ec41089a2f56ecf2ecb0e38c1..703fcd7ac3bdba682656ddfedf947858c7879be9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index 3546a29b81f178fdbb0a57437054d3070bd4342d..512b89af727f7a48670db837a8d4bd4c907efcac 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index 328a51d1b09d90be68084b88ccb1eaf0e747628d..ac23d4e596a0486c8fd87a0b8c8c92a8963ae30f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index 212cf2604cd0966404822e422bc4744c65630cb7..59edd4785bbeabbbcfac1c5472fc14ba8773d60b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index f44416ce9403112c3beb26f10b3a3d253c56f2bb..a9cd7a4bf38f90d34b0e442a8651dc755abd03f2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index a4ca55418c58d12e1845a774522b370ba0e9013b..b95163342f6bcb66bcca5298fabc4eb651a7cf0d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index f1b48f06dbe8db41709e32d5fc0401572593ee3b..66cf944084828411309910a6dfdebd223c9d0eb5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
index 0ce27302767e5ae9b97a97785d869ee34f7aa29e..2d15e42183ef490528c70e96a6a2df2494284a3d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index 786b1d043953d330acad6895e5fb93d544c03516..261a0949cf1d4db6493c8ce85aef63a38f595460 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index d803e0d7762037e12e79d5ba3b97f727690a4581..af0af2abae1cc7ce2a71f250cfb77285973fa66a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index 9b2fa497738a530a2303411e123791d9cddd03b3..5fcb5f4f49ae09f94afb8393ff69e8b332b3db69 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index 901e8111943d8e718cc50867af48d6344667958a..67477b73b7073e40f81e41e7891e14346784d88f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index 06370349697e74e53345a728223b54442b50ff0c..147c5bdd6c00058c52094aa002484b470fa3660f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index 9aae531d94a3f55d12e11f500d971e68f2cfe6e9..c7171d5af711be86b0d45663c3620d75102c34d2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
index 57eb03245f1de65e4b76e5f0600785f82bdaa350..7f7ccaa13a2a4d2fdb0105a5c0e82f4b81bb358a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
index b822dd7e1a83d38388a9c3f103d82d19441d3575..447babd6ef34490c1d6d3e3759f213c822d686f8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
index 37275135b47bffb0e0061234045eb5c0e5916a0e..8d23efa0a12cd2d0c5364c1cf37fedd114796995 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index 4129f40a1459de9d4dc81f323a6f8f52b1b7c735..a745e24200c287341f9563e8dc9ff5a4a4483c8e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index d88a7abb0c4f36bb66d0f3cd84f95c5fcdfea5b4..8d88fe303b033e3f56bed85a0e5c2d8f3681e988 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index 9182abc0684fbae0cc989032124d63ed709d0320..8fa6f79b6bc48227b0d9113391642214eb07794b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index d4ffb00dd5e4b5ae7bc5f14156d77f40669a200a..94a7aefbc6af5ab9261039968dcf9126dde99247 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
index abdf22fd9dd5b81d3a08b98114e591b89119727a..778fbb63c835243759714589bdaaf342c9fb77ad 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index 6eda14b61c35916b5a5d1fdca7e54f76ef2594ee..96681777abcf8b3c56cbda8ff9206d973839a450 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index bb0c31831a6bfe165eb0b820204cb87c140fcdb2..7d24c2dfe7f409d7328a6916348d8ec302a423ae 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index d358a011f38ada12e7f51d8b46aab76d4927aedd..ddf2560cb2182b37745ac0437b168950dc7e53b8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index 9c6db79bf7705e7cc49257a92b3e107cb7f62f93..283ef6fd308c107319af578b85837cefda95df5c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index 65f95778583de09a30a02317ee1f09c0196f5390..209dcfa93478447f96b2c838536742390f97a280 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "05/19/2016",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index ec4fad64cd4cde9e00e11313fd6a511247d4b8bc..5835fc5c0b2aebeaa2170aca9221aa0c059f4dbb 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index 2574c197722f70e43b52c2c1973fa2a4e31c7e19..a24fa35d0dfe710deae6c4e3c09288e4c1ff2270 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "05/19/2016",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index 725b830bf0fef6843d821901eca20fcaa5de8156..2f78ab5a6f5a9dc995c4a8dbad585bcc6029caf8 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "03/15/2016",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index 9918d2457c4af646ff11868c891fc9812b0a14c0..647b784f01baa50ec51bee5cc2b52420f90af2cc 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index b98e03762fa1e704430a34ca9abbc88e39df2f1d..6dd9e56e62e3699a32e71a13e12d2377cc8a455b 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index 430fb52cd01f34e353b9d1acb776c3cc6aedc755..438c03aebe756a7c7a51ec2337aa8729fd931e5e 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "03/15/2016",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index a5160783d7b58db665b6c8575e8453c555a8cdd7..591225a9c5c5fd3ea23b947fd2f91371f5174cb9 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -195,6 +193,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
index 165f426ee1c70cef9a965858fb8cace2ff06b4d0..2c0fad204893df4b7c87c0a86d27bd2f27011022 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
index 15f8df552ba5b0781ea0cd8c1b11235aa41016bc..7d4d2ce0c3c7236655c8f2ec40a05e395bad9120 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
index 1ab78be6199f9cac2c6435cc2edc18397b965844..5840b79d845c9b3c05e86ff3c1393a8882f7e032 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
index 911c6d81b29d6f3b11ae1eb49f7e49974893112b..2aebc703ae4f3f00116c6e1f62972b4975e467cd 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
index a2c662f8ef0146697bef6eb7a25717d09c107afe..1df66fcd3f638286d77c525cce904517697b0c5c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
index bc0bf04fac61778958d23cbd01ea9696c4f378f5..d08a0c0d766e14729d4079f3a7c30ee52de04d6e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
index 0dbad0ab12ca9708ee53c79798708a437e2c35f7..8437679bfc6898da2013b0d399e9b20a2e303434 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
index ae19730af7101dbf84c36cc67df12b00c45242cd..ea9d6c8546d9446b2a50bfdb092281caffe6be41 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
index 980b432eae08c2030fddeee4009e15d4c5955338..5b6639cb170d3345489131a2f7843f5ec7523660 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
index f3ce87e873826cdb5b3e770921eec21bf8fbaebb..569ed071d3b11af0dd98c9ae7169b3bc73b235a1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
index e10ee608bb76304a3039a69a56f87916b9ee21c1..e1b4b4d7736ba15a14059b3b436559330513be61 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
index d0a99ef9695b9695136bffc474cdd3bb3f824096..50acb81684f4befdd38df3c4a10d2c4616c12aca 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
index 90e7c05f0a4876b93cd0a2180941516350538de8..70db4b24c1d6007a4d23f38a8baf647ae28f4fbe 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
index 6d42070e7a9ed7ece2e3a9246cbcfd823634452d..e655b43770ef4c4f7de17832bfd7e58359a368cd 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
index 4be1aad2723132da78901790cbe82d6af76e686d..e354fadbd168bf90a307b7535b10d4a797c5dbc0 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
index abd7e97402d602a1d639ec80c1439b41815cfce5..4079e53532ee38017df1334787a5b9d8b6007a77 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
index bc6f456138ffb8bdc697f8c0804a2e8135828579..e195900e43078ed19e3eb94fb7acd7c9af00a92e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
index 238f3077c878a2768c9bc3606031d514aaaa75aa..8b9a78914a0833ea7a32c527bfed95f8970ee73a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
index b3b3f6f56daa5b1b0d43e82afcff0ffe0a5efb34..4b6987071fc2027d035cace6a3dc2bbc736e4ae5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
index a0c34d5b7e8e567df27ef5010f854c95095c44e6..ab102b7628a82902593ea5667c3fadeea257148c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
index 1122d666f5b13372a6feaca8781058f84d3aa209..2cec302162b91bfd88705e734d98eb452682b254 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
index 7afee8ae1b50c357a04d50bbbcb6dab75ddce0ac..259bd527910c0e2f007b6c74221ed9ceb45e9b7c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
index e0d76e4b404d44b187896d4b976dc9f75ef0153c..52e24fa016bc07e85ea03ac7296dbec27dcf192c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
index 9139bdcf7914f6c8e45ac6dbe7bcd7528eced04b..91624b997c0df71716987f6d88fc1346c51ce278 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
index 10c463750193cfb31fe25eec0c458ac819269def..df719b88ff16de08e99614709d49c30c8dddf790 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
index 29b654172128c779fb5b36caf12ea63af1b35be7..008da707669840794869d430101abb10567bc094 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
index e5cfb462585a9283620d202d5bcca2ca9b99b973..3de8c3cba7178c9c396aa91a8d39ea4301118582 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
index 379c2daa321742c457899201d51a126158b57294..6b89a869f3af0a22ea09393998b22356170b8aaa 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
index 228198f2167a2e27f587b5caf6b556b2f51324e2..e6ef1a3854c6120d39fb409b8b9ca68f32e595e6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
index 1b406b80e189744453001aef8b1772baf541a26a..2158707e185410e9025e3f5fb9305a07e0c60cc2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
index cdce69d28c3d3c00c547662ea8cae6f5f34a334f..d48ff039ebc02686f30dbe1cd2700695a320c98e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
index 73a26fbf556cd81173a636c2705df83bb13b4fa1..e06841715e9c0c5b5f93010792018962d42fbaf6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
index 8cae236148f445945c4e2d3629eab083534a838d..ec0dab20925f85962f2eeb91273d9d0dd913ab14 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
index 5243850545504ab0d0d0a03972758b78a9ef611c..cc314eb523233e212ab938e2f1533e0f43b38fe6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
index e01ed4b872e8d759d1029ffb040989ba3ac6ca1c..1f7713189c016e9ac4455dbac8e5b3ce51e257a5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
index 2a66198ce7ab9e16486ea2720bb06ce6abbcc152..7f749f525acb79eba9de2634be1e4712810bff68 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
index 2ed3d7457165fd3ac93cc5516c8a8226d8bcb352..81f371247b840c53fb12d6796fcb5f72f6c2f825 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
index 627bf0a44cd245d49c98ca0e7f6f582bde28a008..e6e7bd5522e045d70867c42ec08574b88bb9c9e0 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
index 40e971ea3f403e3fe1751e30a0969faa16e729d7..883597191814cbdb4cc9859a385abe988e39b27c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
index 5b27cc6348600dce1b803af76c1ce4782e48f8aa..338b174bffb81d165da005d98581e54206ee4ac6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
index 1ed2c3e7551d4f82914b20d9b7a54cddd478efb0..1393b30dffbbaa4777139167239f1254c7cc865c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
index 1f6a9b7c66429b98ada6db5f59bdc8c3206ac08c..1b37880858747357ba919f69c2996d67ba722688 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
index 7bef958b36b380c71bb4a299697f5f2278dfee86..cba0c95ba323c6862b1dd3a6fefa15b5ca0c9a61 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
index e00a2ecff73b7078cca6bb847249a4aae6925c84..3fd8b3c471445ab6e1af855291b5d17a54a37293 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -163,6 +161,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
index 69a6bceda6478a549bda68979b4c8cc00c440dfd..8dfb8471db5705b821cafb90f7de6298df5b8221 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index 02812a00b884e9a134d3864fbfe3f8e3b5c5688d..ba778147ff75b34e8a7dbe499557d0c4a2dfa48f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index 1e10c96ea8ec7f54324624f1bd2f49994d37fa7c..50c588f11504e973fc1db404e50639fc065d1dd7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -183,6 +181,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
index 6c0d818aabffa81210d7c2ae52bf1186a58c0454..2e74806bafa08f4c5388a5bccce50e9f2b59c405 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
index eed97ead9ee745fc32c2877dc7faa798fba3352f..55a6b75bd35e35f33de07671e4f175967f48c80f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
index 071b86e09108c8ef8bdddd1076e724287b13a34c..a8730ab9c6a44ce5c34570e61216905184722577 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "03/15/2016",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
index f63f92014d1eaa0320f73e804771c344f7e71a86..b3866a6674b9104e1985b38af58b7f2e9f6e3ccf 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "06/03/2015",
@@ -172,6 +170,7 @@
     "cache_l3": 20971520,
     "clock_speed": 3200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-1.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-1.json
index abccbf1258466ae73359195fd80d4b9ec992417a..6634a8c166ddb599b53477f18c366709d03279f7 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-1.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-10.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-10.json
index f158f1e73cd628d2639e6c9787f201354c7c9a3d..264c9218e1d36e9c5ccd4d62e80421ec650282af 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-10.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-100.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-100.json
index fa46578ea31d9d7f631481e89afc88d806a07d32..6b4c2fa42d31c4646059ef07ba7833c5a856c832 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-100.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-100.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-101.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-101.json
index 55a86d85787fd08a717894c1525df65517412d0f..0e4042a49538d46890c8a2469c6efd309cad03e6 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-101.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-101.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-102.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-102.json
index 417c85cc5488d228cd411e8635eda592045fd0dc..8d4247a6f3e7cb4ab6cec7f0bfb09a0985beae43 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-102.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-102.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-103.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-103.json
index 3401a9a29d0d24921507410379a36cbe4ee8986d..d827e5b4224c9c5c8ee7b538c0422efcf09dc8bd 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-103.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-103.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-104.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-104.json
index 8c88997d38dbf725f2be4134a1d40d8a930eab0d..7dd0ae67b14c1564d53bf8ad7880ef831378f15e 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-104.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-104.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-105.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-105.json
index 9dd280932f96e221dc9a4ce9b035550061789168..fc7595b33b6a03737ef862f09a6f87bff38964f4 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-105.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-105.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-106.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-106.json
index 6270d6793bdc85988941894770c4c19a2482c108..52dd3e7c08bbcf0030d296e1a662a0644fa5ae73 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-106.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-106.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/24/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-107.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-107.json
index 0f685e0cf4a3bcd863b795674db45d2739e7b534..70cfdf89319eae7d0713ab404fda22cec82bdcd1 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-107.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-107.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-108.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-108.json
index 48a8082edcbe01adccc509dbd5fc996002d75f3b..02e5d964766f419274f0ea1da602997be7dbc920 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-108.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-108.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-109.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-109.json
index d68d645c54870566af6190f1e4c9a05233239ae8..44a52bf7af3d6426e610dca55ecbd984c131f3fe 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-109.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-109.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-11.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-11.json
index dd53c1e6e833a60e3880541ac68863d3c719d93e..494ad936332b077846254ab7df3ce4efa498801f 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-11.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-110.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-110.json
index efaeac4f417e17af22aff477a82afffc88fa35a7..f1c268fe2437e6aae3fe695b4dfa91b18f9bb1fb 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-110.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-110.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-111.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-111.json
index 09991e0da60b094bee3c99ad4a97bfdef3eecaf5..ffe2cdb4842b536eb0b055fb03738031a2dd52dd 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-111.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-111.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-112.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-112.json
index 47b37df5a487cde406ba25847791c6f686bf9e70..24336272c9a177c296e46cbecb69e72d15596b20 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-112.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-112.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-113.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-113.json
index 2f92ee7fadc0cf1233a78933ff51d43e10cfcad8..9d77b3450f0a248fa2e1e7cc619147e8c30bbdd3 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-113.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-113.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-114.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-114.json
index d23f19dec38260e76f16e83603262ace5f53247b..40e649ae99696d6ebcafa468e219a4a831b5aba3 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-114.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-114.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-115.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-115.json
index da94f13671588909c042f83767fc5e0eb4584730..798052a81577d1f002ce7b03e36cf88731e8c39c 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-115.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-115.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-116.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-116.json
index 0f5567b412feda5e349943ba982f2eb343311308..5581bd02b9f839e8c333ae91e99458ac07364c6c 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-116.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-116.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-117.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-117.json
index 464fca294def352fd7339374e58474e171d70854..ea61a6fd1afd83189220bd9ef6e7914678d3e194 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-117.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-117.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-118.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-118.json
index a8b12d646ea9908a1be30c74a02322ea78a11c48..386deeaa28da3dbb195edeaccc36ac79b2a09ec7 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-118.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-118.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-119.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-119.json
index c05e31cc93375f21b0a188c78366c418b2e0368c..06518310b34c20f409b1281838ea0fda895aa04e 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-119.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-119.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-12.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-12.json
index 8ea414ffb7be3d3ed986e654d7a10ae7191df594..0644fff048eebfdd6d129a72669ab55a3f10ccb5 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-12.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-120.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-120.json
index 9de59ef574d46cc023e6fb3b471ae3e7664c26d0..b02d3707ca105d1d21f5668be69c19a7ffaac1f7 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-120.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-120.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-121.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-121.json
index 298b1e8ac3ca2f90a3b66300c7fcfaea22333d00..fe29b8cfce151f21f506a4bcc03e306a4a2831e6 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-121.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-121.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-122.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-122.json
index a8106b53e0c0f6b338c00dbf8a210e1299a3a019..09dbdc62e9fb0c0225fb14f6eff7ed2768085e03 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-122.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-122.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-123.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-123.json
index 8d29e38774ef7b1f6fa27c56ee86d3fbf4d52031..5abf98e628512986cc39bc602169d0a5e6105462 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-123.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-123.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-124.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-124.json
index 7a69aac94e87cde825dcf4c9918431486963e724..b5ec9c66050c861314a3ecaa315bac6197520770 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-124.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-124.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-125.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-125.json
index 2309fc10d84cced3f4df14bd60ff509377203ee2..230211f506e34525f321e1664cb8308b6eff292b 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-125.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-125.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-126.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-126.json
index 35b0f48b062e061968f7e086cc0b58c2b2f0ba73..589dc246ba5d7ddb3645ffe7ff86f6064a241051 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-126.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-126.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-127.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-127.json
index d15ee48898553bdb2591be726d3ab0c03a14071d..0d86de5df368eddef663b9cca9db57718619e347 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-127.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-127.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-128.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-128.json
index b3c95a4e1f8e794d68484b58121c65bb1cb89fd6..76891d99a042e6378011fcb458c218996d44b659 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-128.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-128.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-129.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-129.json
index 90c05ebe3e6cc90a72daee1b3d7b3a15a418c86d..7066ccfb6f85524ff7bc834a49f662d65e24c0a6 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-129.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-129.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-13.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-13.json
index b5f600494eda514ab1fb56c2c6ec6208df93baae..585c7d518e8adbfbaeb5a7ffed232b671b087db6 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-13.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-130.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-130.json
index c3b6530ffed7f7d6eddebfb57f960a7c2d860366..94e4c5319dcab0e2f3e4cfa608e4658fbcb4d3a4 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-130.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-130.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-131.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-131.json
index 1a64596cd7ffed3973e2c8e7401d437ef92bd5f0..1fb2aae190a9349ed797f2e161e63b04a4632dcf 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-131.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-131.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-132.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-132.json
index de32a1545f6c044f6a44882cf51d9b782fbc95fe..53240f2f463adba1c723fbd1ab15580df5033b2e 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-132.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-132.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-133.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-133.json
index c28a4e0f2eb5aaf26758e76ee7c8a58e2592ec76..5439f7213391a603a99c66473920ede1e1cf4ebb 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-133.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-133.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-134.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-134.json
index fba85d590b03e3e38785ce7af51632c7a569673d..234f20d030b3b3e21bf897f3ec498c950935cd91 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-134.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-134.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-14.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-14.json
index 87bbdf03e24bc1b6ba7961a6d8c7085ab51c8f2c..ae0780ecc20fce1d357a7a4dfbe9e9e3f59717d0 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-14.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-15.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-15.json
index 7ceefbddb8222df32b1652dff943b1e32798d5f1..fd9f683bdeb3e846a743d991da2516d2dc6de6c1 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-15.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/24/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-16.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-16.json
index 801eff195a39318d40607c632cf76404769c6897..ddf90b32947ef67414f7f55da86f25ea0f60af49 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-16.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-17.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-17.json
index 1eb7e32f693b8ec82cc9a1de8a3e645bbacf9e70..0b54b2f138c2b8251398140510d769c1101c6650 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-17.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-18.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-18.json
index a1ada8a96f6e4cfd7f5f283a28db3274d13e6dfa..196539416c2114be4f305dd6e9a182aba2b4e257 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-18.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-19.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-19.json
index 3120742a5893418e2d085fbee1e575cca8680676..1b866a2cbb4c5c5389206017d6f407f9fc42454e 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-19.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-2.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-2.json
index 688cec305554f2b5e17342905067b9ee686ad1d8..c71431d7d1a43eec2135b9d68dd728865a29ee04 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-2.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-20.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-20.json
index d9b28bf6a1419bdab2fd8a558a0ddfadc6498834..ef77ceb3a8271d4a7cc79a7eedc6c0d2ffa4ae23 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-20.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-21.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-21.json
index d45644544dc802760c086ab72d4a4137d13adc77..ac0ff497ecda6913b8748f6549d532abc095e097 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-21.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-22.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-22.json
index 5e00affbe7ee1bbfcde7f98567f46fc3cf3b4a8e..877a26874af51f216d9e313a31264792e8a4a43f 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-22.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-23.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-23.json
index 58d58485c54b04858bddb19ee9c888f79eaad266..6641cdc3a7206b3a1de80b17ffe3c933c116c15a 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-23.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-24.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-24.json
index 3adb947fae75ffbbf135380d8522a581574710b2..cb49b4d097ac1d60eca768f6aca6ce3ea8417ed8 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-24.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-25.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-25.json
index ea50a473fe6f8dfb20044ec1e5b3b9b4da622e3b..cce99ee99fb3a3bfd37efbc003df107afc9bf446 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-25.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-26.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-26.json
index 7671f6499c6296db81fd007b96f14ba6c0bff7cc..e5ddb7fcb68379df8dc73635a27e2b199492d266 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-26.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-27.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-27.json
index 4cfc2bb7c21efc0c459461c4073946496b1d8f46..e1707281679998fbb11ea0a22faff8e8c4cdeba8 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-27.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-28.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-28.json
index 0adfbf705889d5906679af9c09085f53c15457e2..2f16be5dad12f0645760ed02897802b9b1d98100 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-28.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-29.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-29.json
index efa5e4e2dab4b83fff428711a5c91c8b0c08bff0..73218940ad779ade00f6facf2d9b5452cfdca733 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-29.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-3.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-3.json
index ecbcb02785c8d93903f6483a932b5024476b2ec0..e4adc4dfe4f8b57b4949dabf909c4fc50be8ee60 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-3.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-30.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-30.json
index 0e8893a3cc3e8541119ff69e767c259e645a7b8a..6b5bbc497df8790a3f663341579b049feeb342cf 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-30.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-31.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-31.json
index ac0084aca93716b84837d832691e1d447e7da327..b78423f6ddd7390924ef916c2283dba271044ccd 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-31.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-32.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-32.json
index d6839abdadf1ee09bb2d46e9f211ec7626bd8539..93db9e8da989130fed9de4c1e001aeab2d0f872f 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-32.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-33.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-33.json
index 3b8a7133ff409108f2f750e6c36ffe01e18f8413..6aa65153f20b26bc957e4d60ef46fd742fd4feac 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-33.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-34.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-34.json
index 11c94db3200a982d239c1d8003764a537f85ab06..d464327d07bbe04e5c1b49223286406e06630fe7 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-34.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-35.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-35.json
index 8e55e381e1af8c52868328e4c075dd60e3aa2134..9d5c72efc13f225b47f8d42ebaf8253464148775 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-35.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-36.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-36.json
index 57e374434386f2a05dd84d083b9dbd0da220dcaa..8c07170258a28505e06e3b4f93369aabbaf66268 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-36.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-37.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-37.json
index ce5fd93affc26a9529a7a238ff642706bcfae10f..344584de75f64a49b9523712d485d33bd797e1b9 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-37.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-38.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-38.json
index 2582a08b57cb857315eb2d32bf64a3d8c7844ecf..84a1ca2bddd17585bb8a4f9b671868f5542dd7a4 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-38.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-39.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-39.json
index ab006e11eed6916a0d1239e4e7d7021b01a9565c..31f74df5ed84093724f586f932163fcd00d344b2 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-39.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-4.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-4.json
index 97dbaacfdd7525f44d74fe2e00f81c5ff5f71b40..dae23b3b5ee2ec60c9eecafe6388e5d405f24f2b 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-4.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-40.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-40.json
index d8e5d9f6b2e35815e4cbbd0d5629397fbf6c30fc..7c64508d751e1cbbd8627f2c834ab1f7ebdad0c4 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-40.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-41.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-41.json
index cf806675e549ad6d5e47bcc5eca678b6de23b9a7..e6983931d65391a094229f5ba9b6f430cfbae58f 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-41.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-42.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-42.json
index c3c3db90bca4d3d414fc97bf6563a4e467bb8d31..d8646d4b563912352f18ecfb0267f78318d9d2e8 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-42.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-43.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-43.json
index e34868de87fd90d816b5199f4f723eb3cd22ad6b..37e2b25e5c71b3b606701a90ceab7193dcc22081 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-43.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-44.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-44.json
index f93c33479bb42bf9ef382fabcd09d8096844e585..c5d33e547a612ff3b316f1202926664ce9da1007 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-44.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-45.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-45.json
index 5a42194bfb7d910b64fd6f3e38d1542f12581045..dadfa28274151b3ea6de34e1c057e901d0c43c40 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-45.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-45.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-46.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-46.json
index e6cfd8e550ab6bf69cff1cd36af5756d03c3f5a0..990f5cb1825df678d8aa4fbd3d5eec68cc0fd497 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-46.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-46.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-47.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-47.json
index 7959bd9a3cb639b53ddce6e5234c88d345855d02..9d57b772336d3a39bad87569c442fd86f1e06eb1 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-47.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-47.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-48.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-48.json
index 4d549335ec4523829945260089e1cd05b28f0a24..2933316aae54e2edef69e243588e0fd193934d89 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-48.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-48.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-49.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-49.json
index cedf5d6358862d8ad38889211d204c8fbc3074e0..1c0caaac4b38a3ffd3e47c6a8af6b341cf070d7e 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-49.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-49.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-5.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-5.json
index f3aea9827d5c9eded8b2ac06e79703b588e6bff0..0910bee7a3843db8b85c52a8b63e7941b8502bb8 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-5.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-50.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-50.json
index a2461f1f45521ee6ccd9fee12b5ab0951a3a5c21..3cae64fd64006a215594e37d5cf31ae4ba3c0545 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-50.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-50.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-51.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-51.json
index 0e728ed9c2d6c006270dd388b17ab3a903d05c34..220834a8e5cb0231585d608cbc159831bb0b0822 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-51.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-51.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-52.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-52.json
index 4e69a0b9428ca99a23671b8eb5baa13372e525dc..ba2e16febda35b431e7fa3f24d8d8244272218da 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-52.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-52.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-53.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-53.json
index c465e4a0b9886eddd7f7a9bdfb30706b01f8eba3..b691a79fc82b7bb382f37714eb77fedcdc740d0a 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-53.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-53.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-54.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-54.json
index a0c5dcb7d6b584a33294e8e4f33c260ffc9dac62..45cf106563be8dfe33ef349e9be964c1ccbd9f62 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-54.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-54.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-55.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-55.json
index b033bf50a6a8b8228baeea97bbfe2febfb37191a..bbdeac386c214e68bb18da5a6bbde5d40dd13992 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-55.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-55.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-56.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-56.json
index 99633c033dd5f381c838b4bb4861fe75c55b236f..4a2c397ec370915555961a8fa1f700d358d1b99d 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-56.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-56.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-57.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-57.json
index 1d186e9c26572f11ea9d2f72e31dfd1c26bc337c..e1a9def047eebf329439c18cfc1f7130547071c6 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-57.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-57.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-58.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-58.json
index 883356b0a3e5616b776fea1b3eb6ee2315409b42..a82920b49e7e9c2cf7e6916f2be9e43ae63d9372 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-58.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-58.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-59.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-59.json
index e30b3416a3a522ef332c1bd5fe70e6adea43d288..caa08e60197d33c4a0a6397cdb2ec384d7e71e80 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-59.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-59.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-6.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-6.json
index 94c6e270294abeb0345569fc989e145ecce7691a..3c7972839ef144890f5831d81c5c4f28cf259f69 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-6.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-60.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-60.json
index 2afb6c4b8721f3c6f632a8f1433083c99697044e..33bb389c621b53936dd799048b73b3b3a85a1d4e 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-60.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-60.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-61.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-61.json
index 5b74ebe8b6af0ae49a3ad03f9e55842cb0e47ea9..b4033c809992043547eec6c82b2c86839a178327 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-61.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-61.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-62.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-62.json
index a9a53b4f5a9e0f9a9681f800717f37b3df8f6a83..c1a8a0fffbe452047f5733159e538fd98e3089a5 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-62.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-62.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-63.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-63.json
index 0a7675fd69443073625d5be0a4a52547fc7bff7e..380da0ee4f697468ee121278fe7f299c1eb04ac4 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-63.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-63.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-64.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-64.json
index 07e4205f53c2a025126fae37045bf34c84b35ece..a538f2e831b2c9f9b8aea0ddda0b797a490549ff 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-64.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-64.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-65.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-65.json
index a905f4b01c1ded655e2b0f940a3235e474f31d52..3f180531fb0296b10f9f9388f551bf4a45eaa6fb 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-65.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-65.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-66.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-66.json
index f2664223628da0fe823fdc44e794b5de7efef641..cddbcf477fb1e6842597a26922d8a23427d544e5 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-66.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-66.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-67.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-67.json
index 45168096b78bb7979e09fcf63f0391f3b1f74967..7d999cc6c946b5e1e8e0e64da4d24984fdda4650 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-67.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-67.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-68.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-68.json
index df8ce49441960024e5ba2e61e826b46c0d467707..79c53ddb927c131d91d6f2e638a7cdd4e1dd115e 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-68.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-68.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-69.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-69.json
index ca0ad47726c15a4a6d86923d1af71f0088ec006c..03f6325d0b42c6bd6bc9438d3b5246b6d9c0a472 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-69.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-69.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-7.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-7.json
index a9749b9b3363fa8f2b99b4bc56257d2337b7623e..92834842e76edf7faeee861267f9e7a42684dd27 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-7.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-70.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-70.json
index 088ca74d99f16843272b5f121421d3596302ddb9..c69eca355121f7fb0588cc03d55e108a15e496b2 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-70.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-70.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-71.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-71.json
index 92eea6949d64d8d6f13c0651b57604cc341ef942..6dc0d53574c406577d279f40c5ccc03caa268d71 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-71.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-71.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-72.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-72.json
index b88a1cea71b66c03eb925cf20e4586cd9e413c77..4f70fb27943b0fae69db123743357acc60bfb960 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-72.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-72.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-73.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-73.json
index 610a1340d2b5f208f6fb28d63681801055af0ae7..15e586ecb65800efa31144c634cadaeae3382980 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-73.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-73.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-74.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-74.json
index c6a5c8a4639ef3218269c6b1c092738863c9cb13..fabe05a4136c9a116645d1427e0032d8386b4f52 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-74.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-74.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-75.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-75.json
index f73d9183d78e61f98420b80b078f1ed30a4ea0de..1eb6a6d0760ce0364ec5309d33d8d2be275afdb7 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-75.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-75.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-76.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-76.json
index 8f5efa296563e20a7722a0973b85d0f08cfb2156..919ff52cba99d4fac7e0280526425b62272817de 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-76.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-76.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-77.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-77.json
index d60e643857807d7199873ce5466ab6711bdd3a5c..50af1b51130ad275cf0f3185c238d2d81a1e89e2 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-77.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-77.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-78.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-78.json
index 24e26008782d2fde341cb4caf1f7e80b79b1df1d..4bd3c9b0ad4fc19b47de2516c0ed501a27719a04 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-78.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-78.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-79.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-79.json
index 1e770e13aef91f87de85be7cfd436ea27d47c226..5d9aa347983c5f8666efaa2c2e3c969947c49217 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-79.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-79.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-8.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-8.json
index 619cabb4e817a1e39033eab625850151bb7f70e8..51380313ea947c43efb423b2e9fbc997757c8443 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-8.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-80.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-80.json
index b952ec077bbb68bfc51310feb870814807a6d1f6..3a8a881ff4fe362b1d2d96d18099a06e50f72908 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-80.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-80.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-81.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-81.json
index be04bbd21c01b30da1494fb2acce9ab5a67dcfe0..82556294b6c016bb69a88fd188a68f0820f7ac1a 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-81.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-81.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-82.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-82.json
index 915013e1904b82942909426eeabc60546e36d68a..62bf447669b49ffac1fe9ac6a4b3839275d0cd95 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-82.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-82.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-83.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-83.json
index 4ba415f2139a2e9c8088f2468d81be780bfcd7f5..1aee996099d5f8af6d48e6fe18b4d05faf3fbef3 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-83.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-83.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-84.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-84.json
index 8f1770c91f7881fdd13d8391d86c2fc6582d9643..cd18c4fcfc4645bbdcbe5d0257b8ff598fe17eb6 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-84.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-84.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-85.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-85.json
index 3211b0b188b4ffe4971c6987616b2a9615abc17b..0dfc164f394439beded8754063b5f9b8db222e2b 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-85.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-85.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-86.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-86.json
index 75d82391893d4427f4ef89171455f10476a6589b..31f1e6c6500aae5cbad23c4d71f7ffca8aba23b3 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-86.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-86.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-87.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-87.json
index 632b9a91ce05296940328e9a452ee11c1e2e0618..06bb8059b0a108e6401aaf6cbc0304ad1b0f9a40 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-87.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-87.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-88.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-88.json
index 92a26a93a5299fb7cd15719e6a7ebeef4bd1e65f..e789b71d0bb645236814d66ed8d771cc501b8ad7 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-88.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-88.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-89.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-89.json
index c17a173b8b87c53603fdb36ee34c79d61eede685..6a4ada3d4413cfac29f8063bf09eb69a898dbdc7 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-89.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-89.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-9.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-9.json
index 82b74c1f6842dbeb5e560b5e8709cec6225a82b7..87e2fe672949b0659a789e7ffeba88a5a36bbc38 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-9.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-90.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-90.json
index 1b6c033f95e659c56607fa589db26ee3ac187f5f..b7723e21d8577ded85ceb2df8647bd0876bba0c6 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-90.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-90.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-91.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-91.json
index bad3deb701eaf95b54c443c35a5e87afdb079d82..1b87e46626dbf5eb1baf6106d9f2ade2ad1099aa 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-91.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-91.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-92.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-92.json
index 0e12e1656aa3b7d2864d068fc3acd58420063937..8447e5c6c3043509ae9f1d54efe6e56d173f23a1 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-92.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-92.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-93.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-93.json
index 32598b3cd5084093034d9489850f337129c4658b..1b7842179ba66586ad98fd2ed6caf81056241448 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-93.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-93.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-94.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-94.json
index f4105630418f7570754431769947364da9b80a3d..83e313a2d77a9be10b1bcc381d14d75d06ea02ce 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-94.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-94.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-95.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-95.json
index cb9fb10380851c044308cbc0dae92a22cd34cffa..709131779cefa65fdb69970432ce8e344989f190 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-95.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-95.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/24/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-96.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-96.json
index 9f4f01c3d0f9a2dfcfe95c23aecbd889f08c875d..eeb73e118d90d5718d5af6a56b959811d873ffea 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-96.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-96.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-97.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-97.json
index 04383f0150ed051ede0b0e2c89d0af6ac4e6917f..58a9889e8ccfff5b5c5e7023083fd10a55470d7c 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-97.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-97.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-98.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-98.json
index 56b3f6b7a980efd61aa819c85c429504953a4acc..89469d8d13137a3b3a4681bcf8350aa75f597911 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-98.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-98.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-99.json b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-99.json
index a2ae776c6726c3d18c8ba8dc5d74408d2f50c415..a426e9c950fe11e3e1648307d58fb2995f935c0a 100644
--- a/data/grid5000/sites/nancy/clusters/talc/nodes/talc-99.json
+++ b/data/grid5000/sites/nancy/clusters/talc/nodes/talc-99.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/21/2009",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
index 264a841c749d566951aded0b0d55756aa23d4599..41ec9d4b506ca05a8c414d07990a623cdbeca3f1 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
index 79716c8b07212a336b839a6e4654a6f4d17c4dc8..77bcd6c8d49f811ecbe3d17f3f3127d4baf7521b 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
index f06688cefa12b69a8ca85c9ef22d7a6146ec5ed9..5071fe5c24f0f92c08fd8ca10e5b12c14ab70f40 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
index 4c5e2113d9f9509b11f7a8699b97f7e307230cd0..770d497a3153a8a0ed2b6919635476824e00890c 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
index 60d17ba64dfb235df4e694afa1bbbfe27d115327..690cd4cf5c89ccef57f7b604d2d95806482b0f35 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
index 4b7952fe1d11cf4e95e9fa867d28e005230999bc..30ee01660d9571267f7e101494e67336ceb0f09d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
index 0ecb2c9dc6d6b649b0fe67d3629eb7ad19b2a2fd..054e6990a05d291346fcdd91aa097de256d5de0a 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
index 9a3a84d6e00ad8cb88722a87e82eb616e61ea15e..68a7ffdf0e550853c471697d2b9e23ba441843f4 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
index 01998fa532af58896fa08c4c0a413364ef1ef6d0..04c2f6cb1b2b1b270b909bfc8d41505bb16d14a3 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
index aa8fdde94003c807c93d7dc2dcd0b51a4d515016..6296753871b2bef53b48a3741276ead321d2a1f0 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
index cd8eec91cfe18f577a5603d2287c5d64650d3178..98528e54b48dc904ed34ef84588571758b60b8b8 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -124,6 +122,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
index 7c19d5779ebb4d5f426a4010b4af7f36fd67fd42..9ead157a08da5c72ea63d09069675bf3387f9327 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
index 1d4601930a912455666a368df5259ed713863dc9..d352c033a72eeaa2b2505fe96adf231632698424 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
index 6a4b78815d36449e191aff4bce3eb1292c0a0365..9a9535adb03891579f838feada0eede8dba3dbc0 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
index bfa49a276b389e4e546a69de820ba5d848fd9c0f..d1cc2b4d9bb634374beafa8bd63c60c99cd4461b 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "04/26/2012",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
index 9d71e4de2507ca432ecc4bd962ef09bc2f92bcf9..e9dba23e6d31ea23a0e0de7659faf011931da1ae 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
index 0049f36df72ede11df4ff2ab3d011655a4662012..56ae1887872522c8bd83292566318c22704d46f4 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
index 01b32edf2e703d863033a450c9000756ba3803f6..582e3135677477e4dbf82632b12d0949ea7d4572 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
index 4bc25c635f25a98ff042034d3b6cc182a0329302..1aa678543728a5ab90f356c144a850adc3b5159c 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
index ca4ccce34907db60f6c3be8a80a3346bfc97a9ac..ed638837225254eb59807cf46d19f333c461acf8 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
index f45e9bdb8fcc865cef1951eff6d2d0c8db0f8b24..24a1960e36236a4268034d166b36c764bcba23cc 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
index 59528a6820b2907b53fc651e38f0bc124f630ff5..87030703aaae1df7a6820ca8fec5db726d7b9c2f 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -126,6 +124,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
index bab747dc861b762b6f15725fddaee9e24dac1531..2bd4eb88b233bec9a7f404259c227f29a3d4cc4c 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
index c30b978b5ec55fccc39eb5817246b55d7e992531..6ff61ee9e800503d1b24b923b34b64ff391b7a2c 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
index b9253feea425cf0cb23981007da1da965134e227..d129eba8dc02f20ad6fbb621bc84a2b4bd295ada 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "03/01/2012",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
index d3aee3ee8212737dbc2e3a8bc32a45aaf102dfc8..88fc2c40c8868a2763091acc92a6899a4999b5ea 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
index 76a4762abbe4f4a6f105eaeb0b64a7dfc40a0f87..e9a1ec7fc1f7150a76c7cd2e23c61e93a1ad1667 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
index eb1b2fe2c458248484242574717d9d3ad15246bd..74b9c27e65948aeba636ecba378dccc4f0d7e565 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "03/01/2012",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
index 9c2273b89b21f8c20f2a0aef679325bd45ada49d..8fd43259ae720b587f37ba8e001d5ee1f6da8001 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
index cc62d0555eb4ae71bae32cc4b58078474984f31b..dc096026a9bfbd783ede0277f9eeb8f03b3b01bc 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
index 4f2def82cac1561223de90cfc34051e79d9074cc..04ed2a444a3ad444ce4d2d744e04f67cc62b9b22 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
index 69a094a9533141e2b4baedc0890d55054753d6ce..a06028dbf78315c9fc46aec4cde3ce1e170192b9 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
index d8534508ce83a210281f2d1fcd00bc30c8e534b6..bccdd21437233d91b403bda8cce0c6ca17980fd6 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
index 4c0b6957e140d19fd1a28e56844a7a3f17928c03..b6670bbbe382270fa1fe1482e6a210450657f1a9 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
index ef21528b652aa43d2466bb7e5220cf1d5c81cffb..79ed87820d0ed5ea45e517e7f0e30e96e20aba3a 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
index ea888d8935821893e6bd1e86e9204e3104847888..db49755c62addb3c8da6a5d88ca186192077ed20 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
index 144330129550e64189158e6dced294602bbf5de3..851422654409185cf1396e0636d713b333af6dac 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
index 5856f428960013e7a968947f8a84546e6bb9b3bc..71e4e7b64d0c6ff113183efef6beb6d098ae9079 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
index 64337f5ea4e3dea20e018921ef36b55ddf6fb654..f04cd85cd1a96651254cf0fd98fd6566bb46bd3e 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
index 0ff21a851f63267821d0ca82ec7420b0259406fd..b51b0fc6d9c69d2d01574680fc524095dbc6a88c 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
index 7d4b881026898394bd20b886b1a96fcebfe20c5b..ccd4ddda2dbaf8f764e0ad969491e508a9855b2d 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
index 4ebbb6b31b45e03b272e6a53e7607a99a7153adc..5e59e54c319cb25e26b288fb898406bda4f520a0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
index e5f127ef5c347dcce53c2388f8b4af3bfec788fe..e5c53bcfb21da6d1d428fd13927155b1b404102f 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
index b0ca5a07c392831fc51afb9c9674967da56944a3..88940e6d19fd0f5d264115eb1e8275f8f8289999 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
index 6f001a9ff4e130cbc5bff3af16af8a15f64b468e..6e902ef3ff0d208aa5adf2581cb643c52c4616fa 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
index 1c382cf99f79cd5cf8294d71accf9086f3922356..537c19cac3f2cc452c6e2c8ba2f3e7ed59bd89fd 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
index 612bc02fea3152699e74e356a865f52c1bfe9717..3350397c96b253ceb0988e23073313ee584db1ee 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
index ea5ad08482ec019e75ee793888ff8a2965c5b0af..6d144ec7536467a1bf4d78b60dcb9cc0d3886caf 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
index 650116232e1382a5e0a0969001ac227293d15698..c1302ba39ed35c2037fb041b040980f1ddd5fb43 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
index 4ea24990dd8c29b9d076de319a5ed76695d44606..8831773edea8088917453dd1705482de95e47168 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
index 782b74101e59cdf2ae7f29aade7056851b1100a8..1041249e91492efc4197c5bfdde0d1401f51b59e 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
index f0c50f12353b486e214c90efda375d95a4043091..e404128e33ca0b4a9cbc90dee8b8a33eedf78c36 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
index 548f889d33d83e026cb4caebd39ebfdede73a539..c6dd95eed4ca5b087e90b4c221daa89ed6f8732c 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
index e12efc7221edd83de2e6c62eb87f3bc3ec8af635..9244380f8653f9dd4e857da5c18eb4eedfccefd0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
index 0005b675f6e42f2e0545cae937de73da26cd833a..3ee76c05322eb129c69a45cae8e9882e97256442 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
index bf9b89ab5b4e871c36ae77f9e7eed56216cfd6ed..8b2876d83c9e4254ec1a960bfe3fd392a0590b47 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
index 204f7c7c8a6ad34c705f168720acb5b1d666af9b..19e2898db1a95c14ac12751df208fd46daf2028c 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
index 21661fc9b5ca2c2d256cba092125bf1a749ac096..37a484235ae4fb80e1aa65a08f4d8e13f4585cfe 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
index a1b8de084111e813f8ef50b2e533d5170c4f62f9..81cfac9f7bb73cb90d64ae26aeb17417196458e5 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
index 68c81a1f664e0c2b168ecfbcfd25395506e45f7b..7459a00af245c996eae027cfbbc502e55c355a90 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
index 21e714e6ef98541fc7afd21bc27298f819e2b1ad..bb438f25f2a5cfa1f5ba2f5d9c9b7587e50f5077 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
index aa14d9eeec15935aa2de2ffe6bb90e07de6b6520..46205b630ca9e5bd720116ef859de83d678c7149 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
index ed9aa328103947456faaba9485185e96778cf69d..755aade3229d2c50380c43c05454bfb408c50bdf 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
index c82f53fb8bccb35a8d3f98cb0142468490203d7d..7b9f6247e030550b221069e8cca3500b7a12b146 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
index cede0f51665e981216f2a860f80eb27259cc7464..4524f64bad9545d33e1124bb28195264f7c2b9cd 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
index f8399ebb654ca18f296ef5b1ebc6e1433615899d..7444e6e9b6f4c428c3b1c9198d29eeb9ff889c95 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "01/26/2011",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index b3bd83f20a8a8f2b5794d4f0eea4f9b9f378ae55..7e64f5c7014abd0d1e4f27869bf8f3a4ec63ed5a 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
index 298227df1a5f262ef7178d2856a046daad15435e..be39a47338bc60ba44a4818f5b8e22ca4f4b969b 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
index 722e08d56f5a7b58c13f603c10ed5aa85718b09a..78bb94c28e8bdef283bfff4ec44cc6c4b61199d2 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
index c29d8ec9ca54343d638e92bd8869dc392c20cc44..c8451cb8705cafadd33bdab2b3be8f37909db327 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
index 13655cb57c13156b59434e61ddf70285071d0366..7620a86fd8892d2c2a6dee256d9a5ad3d08387a3 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
index b80d51b47da413465f6a0e5229ceaa702beb8bf0..e40581a5ac5e9b54eb32d0510876a5ec09849cef 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
index b52e09713d13ba831d118e873bcae4bf5970e64d..f1f3758fb90437b7d2f951364c007769a32e217c 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index aa98b52ab2cb25361ef2b5317b83aedc932b050f..e89c6fa993f684fe13370229a21c25750e6bd855 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -2,10 +2,8 @@
   "architecture": {
     "nb_cores": 20,
     "nb_procs": 2,
-    "nb_threads": 20,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 20
+    "nb_threads": 40,
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2013",
@@ -129,6 +127,7 @@
     "cache_l3": 26214400,
     "clock_speed": 2200000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index ae7a592cf4b57361d229d1a4969ff0432fc729a0..2dba7df3895875a6903c64b4e13e892809de0d48 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index e528f5c4a1467c2b9a4729ffba77f7bfe695e94f..d5bf58f7628879aa82da7ff0c0859b96153077cb 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
index 5c0de480dd3c8b6dfa2dc5ba7edfa691e5fbc68d..6286aa3d68e488e35c1cd51c67c219420c57101b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index 5d92bbb406efadd697e8374126020ef603e35937..64242b496c3b24459ae4bc7da8da02388c3a6056 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index 2d59ea3054773766974c0bd4cc5ad9b9d41efda3..a1f873650e5aa78863abd41b375d3a06c9fe03bd 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
index 0f310d319780ca0b8c16cc4f85145ffacea365b3..11bdf9896b9665a4df62243fa19f54863f6b1b17 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
index 9dd6169d8845e49d0112cba95088f143d69be3cc..d46b5c4e53cf9e9feb7606c30bc0897ac99cb721 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index c29f044e6f436ad09e639225187ddf9aa04d22af..138a6c7ebd7ac54d1ec125fa098cb6a96653b70c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
index 89e57d3e49fa8b300e16da23462566e750f88312..88b1a3702b0244f39d0afcccc50d05245bfc6f97 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index 6e614a6df296e6fe8e99f9d709c2723150852ae9..c865c59c7c1e4aa432afb4f4d1b5412a52594ef5 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index d32fd1cef798bf9a7902e2bd47cd5deee3f0fbec..df8eeb74c1d1a6363e37f2eb39c833a8e377df91 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index d0d32c67ff9a2380af4e2851c59ffe1acf9bc368..fd23e40ca83615fff681ad1bc083af3261283c23 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
index 4d08d8d3ac7dbd68142395d57b6c5e975079856a..3fae97e1514554485516d5f151b98fde74e057ac 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index d665294df24fcc7a1555c9fc7f2af6c780ec6a6b..7ae79e8ab302383c2c3c432541071ac0f965c70a 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
index d91a8b45d0dd83bab8eb4c10bccc56ac513062e4..b4649065162884e17b68f30ba05585ba3366200d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
index 156012f75a45331313040399c11fbff5aba3b031..8586e579b17cfe48a08669a7df5d4a130b07e162 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index 0974e0520f739912f797d4050b03bfc5b5830f53..8342505e354b5ed4cc26999377cc80ccdc3c32c9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index bf33cb3d67b70c35690d03bd2af64cfca8392fcf..345be0bf5a60a22c992d1b84d827b65b54abd10e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index eef46bfcb79a0dfd0ff84cd2fc71d75dd63f667b..c8a5fcb510458ea3aada357de4befade265f5aac 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
index 46c1ddbe493b709dc07e40786b27b244d8aebdac..e7f537566d23223ec319357c952a64a16c6e2c8c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index ad4f2b76e1a1c25e908792e2d3204dae48e328a2..cc7e721ca1fe3dcb24c3ce9b8538e3a39f409a8d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index d5ac572de3569cd9d37a5db6ef71ae0727d09e7b..7f1283acd570f3ab91bf8cf509fde9f4a29bb81b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index f27b326f7434cc9f8678d8c7312c704c7d3dcbc3..06740f9464d953b82d67a86080f3541710f58fd6 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index d38d98b8e6c5cb3a4eec03adc7f12c140baea5f1..e73f5e837fbbc3ee2f7fb3e894250e3fa3b0365c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index d467efc4c9f7fc3386a0406477ed6e726ef503a3..9ea9c32aec40589fe5d9028a5799815c0584546d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "08/04/2009",
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 fa90b147a31abfed7a3567fcf07a02492995ebdb..19756aabaa6edbfba9dea8c95c4b836244e0f0a6 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
index 592635ccfaadc32d09dd4d272c296c17e35f737a..059156322faafac2676c5f90775242b1a31559bf 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 09e6842617320c92b5e52df399464f3163c0c761..dc7217a2457f27246aa2b299279853e3d2b2b2f9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 2945ad3fb07105de8086d51faf7b39e8f1c86fe7..be15e85b0abea0e657b420c9e69c02bb242269fb 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 0e2755d66cf7a0e1c9058b2f9d3acb60f144917a..bd0768e520e633f33d50e13c929bc003e7e64ffc 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
index 516c1a82df63fae15e4915d9479dc4eeb6435027..b5dd2a69db6c174c687907595eed634b685bc196 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 2b70f6df208fc644f58026fcb83be98b5fa3796d..2fa0777bd8c19768be02527ec0367e9cd5d67e60 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
index ab1161e8cd5918905e7b34a196f32f2582b416fd..020b389a5bb5a1706df8f321845eae7ea01e29da 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
index 30928fd70d4749fcad1b61bddd081f9097f5299b..5758d5db4cb916f01623110b1f18cc4887a3d27e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
index 3676d6d39a7f21477fcdf9f1318489234e25be9e..cb2c629f6a55fd16db3ee06bc00458d668598407 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 ac8ebdb9dab2ad8a15f12ba4c405ff74a5bc2e9a..a15694f6b5103b508a1c30489273ea6ae91a9f14 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 9495e331aca2d1447537ae137533aed8688e2c12..be668bec85748ea5d9cd0ff472e5e1e851aec189 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 9fa4e9ebe86edbe951577f4a79008c4424703c53..1b45117a1d3e51c9a26160b58fe0eb45cae12512 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 dfe9476d99a9efacebedc2fe6f1a09f415079437..5d3c7f8f9105c574911bcee7f07f3395b4f008f4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 ec8a7699a221faeaa185e0e2640c871ec09f0dc4..fb54728a5473b6faad94145074ef4186e4105808 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
index 17926e88b6462695232d598977cd6497539e9506..419d884f3f0d8e4dd693f5ee76e86743a9d2c32c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
index e809369a549c450e597fe8862149d918b500e5b0..7833fbe30ebfa5214ee104b0b92ca9004ad47898 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 11191f62d9dd6eb5ca61310bc26a63453e0ef993..3b4f129a091285a10178113b4406f025e7d1905b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
index b8a7873d13d68abfe55978735ddaefbcb76e2139..00ec60f0c1741468b496163de14a73782009ffa8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
index f425be89c7f3f978dca46d32866e44543a74a974..b77cad1ea164c7f9f27b3c11ef961fff411420a0 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 b5c6ccc4789ee7608225be0e8a498f835bbc2e0d..4fcb6835dbc72cf99eb4a263f39943d4192a8795 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
index 0b2c1556b807aca8d0db18fcc286789d5d47bb91..2b28e73a5e2e807c5aa1a9eb1fa9a49c63b3df7c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
index d9f4dc24d4e419b74e9082427b99fc04ba453b0e..6a099747ff2d061b33c25a0096ea0676ad1e39f1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
index 8d90ff80f5948696434a8cfc96c6102c632dc482..5654ece2965f84ea0311333d790da99a3731c6e9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 56b44b5f95a89bb8835f82434711378445a16f4a..66cd8e98b0cb67e2a1015ce561081db2b24457ef 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 c0c2bda49a00c49c651adb41f3fe8231bef14f23..680de6e7ceff915a03264cc0598ad7f7c88fd715 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
index 46b4d5a47fa6a737a8b0837ee761f629961d961f..fc48891943cfc9f07a975d23022d03303a4787e4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
index 5e2866b8103958139ef9d7779d19df8409c3dd5b..a3e3f79dcd5e690aefaadb9a9d54d6c28ae2c0b8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 1cf2dc147f86a5487ba293aecd56be808c6da3cd..a20e14603f96104ad76f2549eb9bbfb680b6acb1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
index 8f26bb4c6db37b7fb739554a988c239fe6860435..bbbc810ca78b6c8a7638a6a11f693f501dd96721 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
index 9e99e917d25ed18007ad8822abafc9dff32346ec..45c29c208147808040e6360e65d782e41ef4cbc2 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 d1c5c17000f16c912eb90f555244e9828c12d690..421a66869e2f7f23a9d7a57acaca0fd2f1f3e16b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
index e4afcf15f5427029bd5e41a17302af8c4aebfc34..c5a8d0e003b0f98e4b95dff52be8288d5b60d6ee 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
index 307d04d63314f84d370f91c552898948fe5581dd..e266b38dbdb1bf3e239c25f76095dd72daed26e8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
index c51664d88260ed4265af75d12559dece8f4618ab..5d250f2a841c861c10d66277370e59f9032b9832 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
index 920a116478515df3f37a9c8eb42f4cbad76d3751..92cab5d369b280d97cda3d279481be3d921b8d4c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
index 5107a3b76f5f4133e653cd06ec5904bfb8b238c1..cbea8d373a7d80fa6ad9c44fb85daf4cb7e6dc4e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
index 7574efb7785288054d9b03c47de376596ac94e55..3cd1a3487aab64bfccac6d37c096440d6db084dd 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 0fdaa593c09c41b6b4e98714ff14143e1a505597..931f3b18d83ef5e873c4bd2bd5c07a3571af9465 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
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 c5b327d6bff66ffd1600d2e787916f6d1951ee4b..5cb96eb51defdae8080652879128f8cef6aff49b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 24,
     "nb_procs": 2,
     "nb_threads": 24,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 24
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/06/2010",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
index 233b7948a8529c1ce89bfd24d32fe00e4539ca94..3e832ec692e98a236f10e057882f5f1ad9e1161c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
index 5c1a4623d0dc4cb579b47ac80c20e6805a8cdf29..aa17c9ddcd4f1fc02571810d1920ea59bd95797c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
index b86a5205668087090bf2cf6b1f4325528ee4d19e..490ec091cbe26fe9cdd51c153e5d5031a48dac85 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
index 795f4f7bc03a37f363d25a959257a8573c310d77..2ef2a8a6b4f4ec4ececdbf969d26f5dc91270dd5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
index 9254693daef2e37752467fd0e617d49902ad8317..7b31115e15ca08a5b652423ea097c989e8939ae3 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
index 3e4e1b4a1ee580c3fdbaabb9f188e22332de548e..eda880ddd5447c4aa025906c11a496814c6f62ee 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
index 50ec77cb85c777e70407ce505d06bae0bef54837..39559bc38cfe7dd574e7e6b1c19fd3b0a71a1d45 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index aa850a2b6290af9b30a165a7fd4b29ea58d4b7af..f5b4f3944fa3e1d0f87382242a8dcefc7d67f94b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
index 3efd484a5cea8c38566722c4dfe3691ffec32a1c..983e04944622d147f2d0ee75a94dfade7aeaad4a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 9761c50036664554a11d9c2dbdc38fc346114626..6ad94cff3b2f758c44b88b060cd31557bedf0e19 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
index bb2e3a65e3553343fa0bf48021e7bee7a03e4380..3e1bb0af36631b3fff80289e8f4f728113b5dd28 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
index 0b7cc1f7865bcd127ebe0e4a8007d045b7c6bcd9..9d503d5892201e4a58a87306e03b1da244c695a9 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index d55424d9b2e2ca96a90125c3d1d4baa36a5a9ff6..2ea629850e7c1b5108f6c5ea2065ee94660abf34 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
index 713347e6ff373d789e836725a54b12ffcbca22d0..7efa523f28627a7751634f89ce0c27cc8f73675c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
index 3d158a097618a08e33c64b6d28506c09b123be97..d498d31bb4f2953a4a01e51ed724b9118c9d979d 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
index ce0536d38b0b2413883ff0f64dd929451cf8c35d..3e4b5e8b4a677873f4826f600e9cb82ced1a8686 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
index def6597a962f1f9b3f8e7a54b0f8976f3b45d399..12052ff68350fdf5c700bed859f74d12247912dc 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
index fd666bc36dcc44f65469cb399759c26a4ebc86b2..b6b06339bb2123f8327c33cccf9412a8c71d4cca 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
index 4adf1c25b49f398468d6e8197ede25188809a9a4..576430863bc0249e8ad6a41fd9631a13f7415cda 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
index 4a6d8b58cb97b7abc1353bcc63f39986cb90d6e0..1471e97c3a90b927dda356cf0d4d53b20f69e59c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
index 7d9774f6af72ab8f1bac1411e76c886a87e50844..59df6ffacb2bb6df5cb9097cde9e68f101b99f54 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
index ab24e79bb9fcdad686b4cb41bf0d759c669dd57f..7cc5ce29e3dde56b28bacbaee5fdb1557c4c2ddf 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
index eed6127d25c22ee2fcd5dce83b46c5ad60e7445a..cf3012c839905213a2e2b2b57a5daa8a63f7ce01 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
index fb56a2878b42061dad2d63d34c44486da459667e..720f28f1c104acc36603980ddf229122c0404c51 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
index eb71308fd866772e012f3e20b5806ce65a9b0bea..0b1ed40717f55470ac1d29c5d86d40b4dbd4194b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
index 185263169c35e4ff23a421a9167b2055b952585f..c44e62a662c835323e5ed8daeb0d69a3447367b5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index 3ebb1eec49c0270031ce2ef0a1f217359d0fd6de..36da3f63117e700f8387ae09de36931ecc7f4dea 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index a40c0c96bca6a5bd7469ffcf69bf099f0813bb2e..5f452fc232c73f12abe077f33346c6bcb808e566 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
index 69aec0f1ccdda1b15587345743ea8e622fc0aec3..2d495020b7bdf75d6319ffe5183a694957f177bd 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
index 4593f2dfca6e0f05ee7464e6453935e34c9a3cbe..cbdb268b2bc4bb8de8aadf80f3ed12c499b9e8a0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
index 97bfd4fcca4f41d98475609db77961fc8f94ef2c..6bef6fda4f140e4143903d7e0c0fdad3aa2705df 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
index cd211ded9235da47db75ace0336cc9f3984b7537..9a1dfaa41c7ea3c783d0199ed93a881e275ddaba 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
index dc932a456c082bf431ec0d6fa915ec25dfa92b18..b5461e5ff718f172c503a053207282a413c9acc0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
index e67de02945fa08d9ced556151f412223d97ad2ac..1dbaeec074093d709752a400246bd4865d6ffb3c 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
index 19d1a07196f3d5d225989cce0cbb26836234cb61..e1b505dc5bdbfa0661ae2d186b1a76108c81bf7f 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
index 50ff147fda4fb9f0c8b7bfadab139645db6ee5d4..1d6b8261fcddc4ae23d70f1ac5d57681a2c4ccbc 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
index 4856af5c82616c94657dc1a999ab80540d7de67a..fd29dfb625e817c0572388d210d608c6554fd0ca 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
index 2e949fd4df9376e9170db1d704003cdcd15c3dce..b98be1cc581d9163c1ca32fd7ae21d2213f88afa 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
index 8e39bdee5dd13e92bfae13dc320dffaaf00df1fc..35f5e679431194207f8c95c09c9ec183cd30f5c2 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
index f10179923a4e3449202d89a7cb45e6063a5507ca..accf5ddf2869f0099674ff51ae2e884c669da8f9 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
index a47038f63ac7c6092a3c7ac7550ed1ebc0888948..cac4a0a612ca8e3861e92d34ab19cc86d04707f1 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
index 88f7a44b25212e99591fb6327b074384b8e563e5..432ef419b1a1ffb28c68e483da6a9504a3fdc87a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
index 691bcbee07ee9a306ad227e2dad768b5c771fb97..f44d2193d4c4dc6c9026adb1e8208ff23afd0095 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
index 2499d47da018b21bcf833f2523674838e2a7fca3..85305b981c2a61db665bf33b80a7aab2ba5b5d2b 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
index c5c541c20c9764b9de876c434d80453125255ece..a67c71d6b62cf30ea7e83c8946796691b1f2de86 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
index e6ac1aea42d18e77d228e2114bd126db5c244527..1831c1a2dae26588b689aef3e2dd047f968f2e81 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
index 1e6ea12f17aeb054f0417e317a8827b248ce997e..5b939ce6db7c4de221c323fe2b77a5045e8867c4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
index 7d3e60128513fbb4e92bd365a1c69bd2ce1b185c..7e8d1d1e50d7259f44a8a2054908110ed26a0e31 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
index 0e73ee9fb2131b41f9efd916105dbd1fd34aca3a..73ca57e69b32ff9df6076ad17aa869e0f470e8ae 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
index c046c092e00c475aa7dcebca1470f8d5a8ba509f..1e7bcc16b3f3b40d34409a0d3dac9d3706a51561 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
index 84e05fa8f4efa8e41f1ea7e8a4ae6f4ad887eb5d..43e23aa95b08945066a5a4c00e7194c4812f9554 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
index 6438d0767bdf2451a5e587dcd25aa394a3ebb0c9..6d6b0ebb17a06b8b6f0d1c288b805751c89de5b3 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
index 111bde579f83008760d0ad806c656b0a726a53a6..7f6437601e1097d866aa0a02f97b8ad657dcbb58 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
index 7aaecc33b0e878cc9188d9ad1a99b91568271397..f33a9c7bd4e158c6ea08f4064dfa47eb9851a31a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
index d0f54c973d6377d70794b9879c0ebada98ef7429..109add5338c03be18f07fd86e2dc6ee81b355e42 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
index 539b9854877a4ba3ebf3522e5cffc43e1b296b1e..da6220f1dd5fb6ba23f119af65322f716fdb9723 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
index 301a0594f8380738161fadf575235e50d4af05b2..9e72df1444113b6a4ed227aff004cbc59020284d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
index 6e0306e636ca2ef7a1cdd36ed509804f25fefecf..74dfeca0979222ad0de21248b345e1cb3aa2e894 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
index dfced0fd2721de9dbc6bfa5b9ef8544fe6e3da66..9dca3f63c157994da9185eba11b414eb627a4db1 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
index 93ecbf4f5a8dbfa736ce9486ad9fd66f7b9b11a1..ab03a03d0f66c9c402892bc989c2780b9f48aeb4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
index 549c915590d4b8f133c7722983529d0ae502ef93..8a2a0d8e3644b5134b3fa7b27ec6794caf9870b8 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
index e96438447bdde87814798699fb81ac2c402f6b49..bf51a15ecf7afc864d254fa77dde029cdd8ba489 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
index 1439cbf9aa17c3d0a9ee672c8580d0c5d22b28ae..324b7e6af06702c03fe9ba7bcebff417f12ebb55 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
index 314531f09701b292252b9662ee51b8ade9d05aae..44206ccaa61b1e5a08e1016cfea269d4b851df80 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
index fb1792c9970f07568a2dade07f65029a0f7ae51d..aebc6fbb18a52561cad832cbe953c78982c7a154 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
index 9760a73ab6e8fe18849159b15794078d0fcf9c01..819d2495275ca23927222398f575c8bb02a8897a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
index d8de437f49729b26b64fa9ff22b1b6378d1b8e09..62611b4c2776aae3c43322667d4e4df33d04492e 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
index 67c715a3d2302e8aedbf3199930a036438b5e415..5912277ca60140b07bf8baea9571ddc06a50b081 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
index 843380c0331c1dbe84d85cd95d82b47c5a33d6c7..2ea45bd4993da96130cab023782eba042c8ba1e1 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
index 8104897dc97d78fa662a7189c95ab7945f980dae..f9c5bc25ceede02b902cd9135e54d3fcc466c046 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
index 255d14a3a4b27f0a51b00b3220f18f70242e6279..341db9ef50c47968f14b4a018a0ce912d890d67d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
index 260afcb57f26eb3730ac4bfdc1a32281c68f1ee5..22d13936fc5063b6e06d4d2715fea4726753e35f 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
index 4c929aa3d7e945711fe894dbd5a166d74a634cbf..ca921ff1d00f9b5dce38e2a698a2ed04f5e306ef 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
index 4b9f6f113741eb86dc80a76270e1134502959c2e..050a2517a732eee20d5aed20dcd33463c0901faf 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
index 748ed32e13874618c1904d30c84b97f63e627bc2..190c9407f61f89bc491e79ad7e88e4da88236e97 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
index 322b1bf191fa50f03e4e5345e812a51e4e4afe4e..1210a8c6a082c41cca7ec44479680d3aac0128f7 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
index 671c9a21021601f775ab79d2f8d9df32afc2abf7..3049ccaab04887d0d06060ed2511fdea58e0d0ca 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
index bb83ad647b242094f3b238cc7b3c92a7b19b5c2d..7615ebe4d94afe2381e748c66f1cabfc2f673cc8 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
index be21f9c9a9625bd9729539e25a9d8a73b399f65c..a2a674f35014337d87d3ebeb4988cce2237abfb4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
index 77b820e8a0d281acafcecaa3f0a1a8af5ecea1e1..aa6f6167b8a9116822a26d839dc619a838ac6021 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
index c7614a064cc5243f7515b84777b1c6c291cd1684..beedaa70ac44114a0164deee8e63d3f3b1e7a62d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
index 8d6db08f7e45993b3490de4552d5d132060e5d8b..eb366917ce1dcade8c2bc8a28e3bd1b4e3a80a47 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
index e529ec619de82abb5161ac795f830aabb93e0f0a..395a66a8bf1fbe9a7713b44d2896b51716ab7102 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
index f7d352a772a61cc2e4afa7c6758a5ee10492b85b..633f9057675e5dfc69ce43f589c94e39a0397082 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
index 4e5ea4a373e7e13089828082c694e7a0f982bd0a..813db8dba660d6d822263ff1a7cffb645a1ef103 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
index 22a5d6f495f388a80ea37975692d900a0884a96e..9dc8b628a76127ad71228af074513324fe19d25b 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
index d0d6400b07e633b327ea611f71468b1c866c3a67..a235787fc84fd0bfe4bcc904fc0df5ea76c71005 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
index ac2ad60845244bc2b6ad05ed74b6165e13a603cf..352c402be3f31ad4aa0bcd7c4405a7cd53fe5a18 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
index 4f3ee0d2020cf4023e420cd661281f02a372203d..b539136c140e8813ba10d461f23ce4ad8a0ab533 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
index ba42d6affbc8d017979330db3aadefd6814b7161..fc8e5c0d7476d2a7e11c4e227b83250fc367013d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
index 604473dad5a9b9d9909d9598b0b346f6e763605a..a5255c66de337349393179039390541f0ff841e6 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
index d75fa42359eb6f401e12f146aabe4e359a019b99..bda530663f1ca537594d7d40b7eb756327b37e03 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
index 156ba0f5748bd3f1fc514800fe4cdb3f1341d615..ef4ddd0c984aa0769d68bbeb81f1f75eb5f8553d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
index 8e0186781fba1fb9d0b22482061695b0b6572156..3f39d56c784740e48e4b4222b00dd897e526346f 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
index 88fca12c05128f5ef92426ba6bd7e61a0ddb9943..1adb6cb916a5459edb463dfc4e9146fe3b71b36d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": true,
       "cstate_enabled": true,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -134,6 +132,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
index 968e38693909d8c7dabf711c30974c8cb833900e..dc2312f8c9889ff44c543d1204cecae170ca0b16 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
index 0afd183c3c42a25fe364b0906b9cebd0f874bcd2..871aa017edbd0f10ed822c51d1cf150c8a439c65 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
index d0b0dd8e5ada9e73e9ff4e3a3f44fa88950708e1..9e9148010173a21a2ef37b1efc2cc5d51f25ae19 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
index 1fda17b53b999549198f6e96009a251c2b2aecc1..0bcc5649965ebd0535ef7755149b7d9e6c65b82d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
index 9ab0cfbfea183904ff59645b1d7e44515e9900aa..f1d7e9c0aa58d6b3b342064d7afd6c2ce2ca1aa3 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
@@ -2,16 +2,14 @@
   "architecture": {
     "nb_cores": 16,
     "nb_procs": 2,
-    "nb_threads": 16,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 16
+    "nb_threads": 32,
+    "platform_type": "x86_64"
   },
   "bios": {
     "configuration": {
       "cstate_c1e": false,
       "cstate_enabled": false,
-      "ht_enabled": false,
+      "ht_enabled": true,
       "turboboost_enabled": true
     },
     "release_date": "08/28/2014",
@@ -132,6 +130,7 @@
     "cache_l3": 20971520,
     "clock_speed": 2400000000,
     "ht_capable": true,
+    "ht_enabled": true,
     "instruction_set": "x86-64",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
index 74e266a7447b3dfda7f02bf7a6d3fa10b757a3ce..710498cf57439ba7345371483bca416d368170ef 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
index 9a0a5480f800b72444902beffb24a7fd3a07846d..fc05fde98764cf2bf97177b929d83e483bb5e7ac 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
index 88ded7885134373e7891705abd895cd76088bfbf..42b6aaa1507c54b61da2e5a2d00a5c6202e73de3 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
index 9d205ab8d2ff1bd2bcc70d31bc0914a986042819..5328f99a7d97fdade7fbc9ad2faf67acb2679b5e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
index b48ecabd1f14636ed5dd0033c5275f1455925253..de4956a7e22c11d7b3b73724c78284974d51623b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
index a9d997a495592d62361840b2bc8008b15b246175..4a0ff6fb037dcf02789289090b6b496048af023b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
index 3332cae7b4a08c798d26cabd138ab4daa4fc1c92..79a287a01b68a070221c8b8d006a49c64e23f1a9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
index a4185bb3bae830f582a373f2c449db1f1db72482..1039074a215258db6a3879c444d0c9689cf87806 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
index bb96bb88fc8e17ffcc551a861ab3397a2e0f2791..2246e8f4163baaa07aadf19cbe2a70d2a5d0ea84 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
index f73824766fec6b23eb513cbf0afabc03582d673b..4ff4c1d82244075b726db7603b8402f8d15f1fdb 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
index 7744895c54338f2e2bd68297511f5573d7926b26..9d2875694f42265275d7f8fa0beea0bd45c5171f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
index e4504c372df479a8bc189afd47d22b1201b1b499..30f133394d601dcc011fd6cbfd2f6ba8ab279ce9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
index 5c51d4ed2182a519856152b398291aeece86ff7b..9cb5c9ebee3fd4fa75023c0c9ce6b06e9fca947e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
index 75399f654aa47254701dc3ec90c48edf314bf6b6..e798e0a93687d2180b26f591d7b4cc26410a5ba1 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
index 832c7cb9de9de96c74b508900405248dc456f06e..c987e2f2bba0ba9673e83ea73e0807c44dc5de51 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
index 8c986f6e342307583ee7ae068afbfd7a932e1b22..153f9d12610002955cbc29e55d163fdb3e01c61a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
index 6be30ff0a55107921ed39859d8e7a5984fb0eaf8..439ee31815eac9f6bd7464a53fb93fd0b7ff3b5b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
index 95f191107486e214a24735c8da71e8603b62cde4..82b2a8265b0a0eaafea4c6e94d813bcbbae6c040 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
index fecbac904fe8bcdc3a6a820d80bd552fe40f3dd7..8842b07f4f92d78d4c73fc38a139eaf77d4212ad 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
index 7f016cdf4b78d2af6e30c5979eabaab0fb3fe363..4ef61aa6bdf4c328212cc3c1f491caec70c12c23 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
index 615ce1338751b605ee45db93ead7f630d620153f..4b598e7e75cdca1263b628904bcd2bcdf64a438b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
index f9bc4b9d95ef43ea440fed8534f2b1d908e1965d..eefe7c39fe0c0be96795d0e122e7289100e991dd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
index f7928760c623e14c34181fe0175a6f59a6363b8c..b9b87b062ad8c1e5e220a33b62ebf9102dbbffbc 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
index 5d494f20d605105d65617f9295549cedc76560bf..83fb78d14b5af8630536501390793290f0e3c5f9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
index 37f89d102437caee524175f134bc149a326ea260..735f0944e152100984316550b8de29621cbfb697 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
index 63e6ab50bc14e8c4f2d127d982b2217925435c67..de0ed1ac93b19301fd3e3bdcc3a2182692cf2635 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
index 3208617102070fa8a118dcff468d21c68fc940ba..e2c8aa89c54229a39f8f94ba0231ad9f6560eef9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
index 877b43710274a692c5620d51276c41031c278449..da3a84c7398248e633f074d243c055ec9689e83f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
index 14cd562ede1b9d418cc27a36af40151c642ebbbf..9241c4950c1cef449b9505f61e8d5fdcaadfec40 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
index cd1fdcabf1a1af83e997ea68e8847dc65af1d8bc..724b600c909897adcb63498636f2a55f4f19ef33 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
index a409a57047623d6103167050f39ba1bcc37dc0c7..5a9a4cb095ac2a5aacd00a9b6ee4362830b6ac40 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
index b726ee3d8c149c25f018d6af7fb3de365709c68c..8f64aa3401159bdb7f9480dba5dc8b489b0c4add 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
index 961a0ac166fb40d55bec65b6cdc97fa5b7e0c1bb..50e6bfebc34cc1f22b45a820e53aaace7b24da3e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
index ed1f7a6d9f35330a5398e168c3db53d6c98a56a4..545fdbf62c380968239bbd81bf1a7586cee9f78c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
index ae9da34c85f6907136fe12245ad67c54b0258ff7..1bcbde4f7d42fe178bb63577300f2840b19b527e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
index c869f5ecc8317009df62f631425ad390132d88f1..236b0ede016930ab6c07f1f72b57930789547e9b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
index d5feeac9db2490037deab21b7deb4c08106a6649..c82755e6bd85f15bcd6bb9a7bc3f51d37c871d4e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
index ae836e8ddec8e607cfca424fb31e6e16dc8534e7..b0b3e6a8b96e59394b5b6c7abc89726a528f1e43 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
index f773b439e791458f762bf89274d732d46a467ec4..8157a588d8276d53a5c6011cbbf7854bfa0b42dd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
index 2dc658c3b9053ca9f1f3a8c5168f59d018b93d83..538bacbdb32deee909d79b6e60071fc6d80d8694 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
index 65b0cfc169f80aa6fa319ead76d1d035a1f69c45..915cd03c314d3e0c19db40f6f49e8b6ed4d38041 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
index 2c05d4f98938f4f013d499121de9f229233f53cd..d046975b618641f886df65372b7b0d9b49f0e7b1 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
index dec5d2f53595bb5a76e6595e14b698a325b455b8..b29233dfd41e3c5d0d8d1bd9060906c8b8b5ca74 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
index 1d9c7065d356e88f2781237ed238dea37d13c995..5aa997441c238c4c1f2945cc58446d386c5ee56e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
index 2f660764b0de0d450657a19f0ef9172bd38d1b13..546b3b0f178b626954727b3c18bdf5668a6cedb7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
index 2210345d1c7c3feca65c3613e51a7cac52e75e26..7278cd6df791451c9205c0c4788f61ad35e3015c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
index 43b2e1f6f34936bbfa5900a4aee6bdfb9d982a7d..303a51122d418231163494506d16c0f731375714 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
index 7b02c1277551c5c0b94894198e72c0d6829f3869..b6ce18f6da5bab9a96deb6f698d74874487660e5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
index c3f940e677b50a5d765c0de25a80fc7e90ee173c..fc8d18f4392fd4dc7c7dec45f75798b4a65ecc43 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
index 8dc6052d22ec789ccef740b5b8001d3186bd3571..1912a69bda95082b3372e490859e82767512c3a5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 4,
     "nb_procs": 2,
     "nb_threads": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "12/13/2006",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index d7593eb3947c3691314644c4bbcda518231d07c7..ef0e516fdad349d22dbb09b283ad87756899070f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index b3b6066a1e2b7c1f93f804b300ed050fae00c7d8..7cc8c52e9b61ab5060234e9f8386fd8475cbf4f4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index 73f4664136ff929405a54c7084fc86e47cb9c1ea..e2b680b7d697099a4cc8c7d317ed2e1aacfbc8cb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index c081148502758d7a39b6d4d59eceac5213c5ee4e..f8e9ff97a6f7701ef83a46c3ddd1f496f6a776a4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index 3ff2502576c19c3147d6ff676f4aa3b97c41f6fe..e96ce25e13f1e7eb3cdc9b01d322be33cf647e7a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index d803726f9765df5891ba4d61c810c0586a8eb6a8..8f185cd5c30623cdab9023820a464fcf22e7b2b9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index bddbf9c940ba5695fc647b0a53d54f7e0f3732c8..f3bf2a8e4b4598ab9bfdd3ccc4d0114cf503e009 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index 7de39797dfeb8590127daba2aa4cbcf231892f42..bacd6aee8157c32089a474e0c94f196b3f146412 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index 49e4f6f780d51ad9ba77a21e22a79becd60b8245..28269231ee5505bc3609fbf76133929d0a9ccb71 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index 64135cf8e4176412da5a65d52909ac6b142a4c94..1efa7fba16719954e3e36b4037948fb8fff6d7ec 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index 3f8cc393e7bb95511e2401c50b4d3a8b61e75b1c..66280e2ffec8c3022cc79c0da96135d92830226f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index 0f42bb813c2a5f573f628c02b4ab16b7c63a1a03..ab5bfbe9d409d9e145b006dd48b8d1789edd16da 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index f10ab1d5c8dda4379d3e0b8e120e26f3c3fac8fc..9845c3b580b136cdbee07e1e83dcec61af7398f6 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index 202f13ad7f03660607f544046fd02d4adbc4bd01..ddb80bfb17a23b97cbb1297eaa13cca2182a1f36 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index b0302666e67c52f96838c031b3f102cde7fda1d3..e521217517d5fb6b9ba67667b58786287d2155aa 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index 9029efe5f377854ca511f4198985b58888871ae6..23163037571cb5359d2999c788c382c1d0705f25 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index 5ef9dcccb2ee620018ff55a480211f62e2d103c1..9e5357a1246cd250c4e393003c1dac37b32caab5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 3c694decd86a6ce1acf35ab59f6588210f13c780..ae3a6c8591fd5d3cdb7006de0542a62a8ae9f8be 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index 3669cdbdc901b61332ce4aa5c8e3ee38ce64cd27..e84d82adc52aa42c3d47308749a9686b38bb3501 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index 61d5372472fa171820097946cd7c0f0eaa353f5d..6f3aa2bef7b68233335edaa6dacf76cdaa97ca52 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index d4e63cae1cd067c8e4b1bf96b2e282498e76537e..47d83dd7909440b949baada94a61e61d7f2e5c41 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index 8107b627fc9a42566b8a8576a3e607b0aa4cd734..23dbfe58567f6e619b3c1b2ce252f0304502b2ef 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index 3a5826271b49db172caec81a35382c26505a0b36..d9492d1634170e57bcf6cb793aa5330a3cfc9148 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index f2ed0258a0e36183c4c96485b87530e239cc1c95..0e83b9f26c04cf10c3ceeecc8433617e4adc60c4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 69abb6c97a7d356f405637f07f58b7f51664d70d..ee2eef0298e78e2e530b719ac1cfbdf64c058fc0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index 6589e37c52fc2d087f47141390b2941744392833..17c8ef6686897b1ee80795566a21e1a6346aae91 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index 0d38a79821624bfee06c760d91f6eaa6983c22a9..24bf5d3369174bc0bf19b6335f6afd0a823b08e9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index 41e8e280edd574ab4e844914503f2a9c6d33d68a..e25d479af2756c5356b2476baa51c97a32066690 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index 775a6eb9a4d576b87e00822407cefc0d1cb4bd48..9c024f810a594044a911813900e088613a79265e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index d6697f03c51fc09985ffa2b094dc5a66985f845a..0de4488357b4aba6849e6305264b9c664fcfc26d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index 3901f9ae6636b760eb19f3d4b1719e71b43e872e..6a80d4b4fa8a6afe3a9a407a514e0bff38abfba0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index d05c40e0e7d2afe3fff6d25de11dadb4f7185685..90b83139b9b504c771e7cd7323ba00f5e4b94d93 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index a9a2eda90e136f072ce3a50f892d9af83909fba9..b17e41d542d4a9895966a0d7230639ff5b4e030f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index 6a2ffc95553f331c7a02f64cfaa1782b0335e748..18bf63a5745b31c89cc209cf9704692f218be5b8 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index 9e258bcf74dfc4236bd92d733198c19f63227336..687c36203554fc74274c9d4bf372837b021f0226 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index 70a242f58d1f43dc6e6737ce73e50f30d0097186..390d886f1fe845a5d2943c44863bb220860f82f9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index f5349d17b13696466cb4625ea79d4eae2323f2cd..3952121d48e54f143374fc0415d88af7ab2af17b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index e5d5039d9d49f10b8bd014c191d8ae57531cc6f5..4b1bf1bdfab7d690689c19e0ca8bd59dfbde75ed 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index af59d859252a34da6b68b34204c28c141997a812..38638a4717e05106046d2a8bd5b32b0597afbdc7 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index 3c53c97569f542fea4e04444a042c1b020e12113..15c35eeca704ae34865557ca2bd8a837654373ee 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 306a36d077ecfe4be873180645ae8c82a89204d6..386bcd9b4f45f64d941831cddf4010971e09f4d6 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index e4693fe151ae5ed8a45b5993c9bc8ce9f6b3ece7..1417e1b436a8714e1709ec7de2ecf91171dc5da4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index ff6f6564844af9ef2277c603175f694fe4f36180..e6bcbb2bd56001d14252dd1026146741065ee234 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index 190e05e4906be16ef5da6f7c69a16ae43493b578..575a85dd620f0f6c7cc370b99ab03612c14a3764 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 3c6a211230d22b23aef70bb66dec2546d1a290ff..f0a589342455c5730bb9e8ceb1b68856d854b107 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -3,9 +3,7 @@
     "nb_cores": 8,
     "nb_procs": 2,
     "nb_threads": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 8
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "07/29/2009",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
index 1fb978365b50776951218ac4ce07b2504b402faa..b32e8899541109311fe30b2994db9cc44c788d40 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
index 03bfb92a5554551d7f45c27a71777b824e48d7b7..54d11981669db8e714c9ad95ffc8effcd58f9fc9 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
index 1811bdaab7275939d8fbd286be204de2aa0c4116..d9fcd7850c048ad45efe6f68dea845926cb2c5f0 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
index bf0722e600bb3cbe54934626d2e7a717a156526d..b69c8aeb7fc9d6e0afb1252a4c6e612a2ffff097 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.json
index 12cd179184a270b94ae2400db0afeb691dd82d17..dceac7f6073b7bfe6d1fb75c01a5f500a2869254 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
index 2623a7db9db36e6dedc058ebde62dc89ba31c5f3..a9c2bc4f112707e9129ddcc523210463e986c6ee 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json
index a329a9c53b79726fdd4802744685ca2f888b7e7d..6efa84ea7c3234ac87c5f1afafb45f9f3064a0bd 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
index f99ecbf818193e50a8298df0f082e4605c015e6d..ac16a274788244f803bebd5f5305b80d5d22c8dd 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
index 75b6a8762adc57d853f5eb517fcc41126887f434..e54d23de45bac9c7a9b786edc02c6a2e321e175c 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
index 2fd1f3b58addd8c34a5ba54a2f3aac901a24fd3a..db3e2225d34ec5a2a2aed061e061edbda91525c5 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json
index 9e2cc483c647c91059da3126eee4258b33bb050d..a6698bdcf8eb375ffdc2652222c6f32ed23df863 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
index ed7232c37829f24b5253b6b5a7639eff248f8eab..8bdec96dc7320ab5e489ec72ba0af0dd493dc681 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json
index 17485c5f3d77d5c3132c8eb5f68e9da07398c6dc..3e00de59377f1487a2389c1eea6d5796e6ddffde 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json
index 30b44dba6a487b4e4deb7729375c69bcd58ca20a..d1d0e1d68f38db0fdb52ea5f9095aae4733ace8c 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json
index 8e68796959ea958f36847d64280894225936e3eb..37c37d5ae945294df0b95f5ac4b10aaf7e819d3e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json
index 756b02134092e3cff438c7f854b4f50ec2233f8b..82dc8295aafeb60cb88109c5d1f645abc007a754 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json
index 5401ad58125316b31ffda4fc118fc7e621d19f21..baa85e5cbd107e1054dd53f3b8897d61b6dd60e9 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
index 54d44a64cc8f9b2782e30215506e131ae17868d6..02bde30999281868243c8ec354710f03b5d86b6b 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
index 6931ba4507c774280422de412a74fe0089d5ec99..83ba94069364cb6694a12a228665aa1a3189ddc9 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
index 4692316555b43dc49a772645129f64389c79918b..72db31ff1890b7be0e58dd9f967eea0290262618 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
index d9166a2d015271c684033bd168ad0dc55213bf87..037a21c3dd6d1eac79e8d7ff40850633667cb9be 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
index b88dc618b15794e05ab0479ac1633dba40f99d59..a487811f80cac7a8ed583d7412a3ea906a11d778 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json
index b5dc160acfdaa6e8f67d847aafb709865bd3a05d..3621ac0b2e61f63778797a89a9973e637b9391a1 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json
index 25a0477dfbd60cc2545300f80dc28ec3259c00a2..3770a33e787b00f7f21cc85bed5bf436e5cc488f 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
index ddbf4a08d7d96119dd2dd3525d542bb3b404d986..fcd2d9439a109fdcf5a0b83ba35538efd35bf63e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json
index 6b9dd3cbd5d6919474bbafe294ba4fd85b166278..3460a78523a4e71df7c8d98e95026d2e0da19067 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
index 2d649eb72998d59ce4f801e480505d28c238343f..4cf56343427383fba0aa646d0861774d0e84f67a 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
index 37b04bdff98982e8dd729f6341552d435b395ab9..02a235dfb9d3c11da73faa1dbccf1c6c0321ed7c 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
index abf906813c74bb75497f9da2548626fc26ea0e51..44b40e512f238bf5b2701d12df4bad5b81cd0932 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
index 39163075de18402003184c94586cfe3f78679da7..70e26708e9acc5147a4517ab2acb3b0fe794062e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
index 63e18707c4d80945c6ac688de727cbf6c5c40298..a80397fa04d535cb69a9fe5bd6c12c0af914df1b 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
index b22b54c2225945576e829d940939f29a26175f07..a3ba5d3c9509797a3b03b96fd21234b09862b6a7 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json
index 9d8b5e2cc7caa5fe5c2822ed8f4dd71dc184bcd9..7d3beb2c3ec7b3fc39bf6c3c8b2bf34997b8e8c2 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
index f3faa668062d820945df22ef068e6eeae746b41a..3187691e1a3d58b5fe33efe3c7d38c22915339e8 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json
index 81adbb041dca0749df61d228a852c7e291baccf4..da2023da5a915dc35421379b4994a45f60c96747 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
index af163ab2ea11b689eeb4857e710e5230e9ffd2a4..ecaa11d54df039a58f165b0311e0af8ccde113e1 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
index 8bcb66c07329876c4dc4ac236bace51ca61c84a1..33bd1dad28e9dd30bdcd4901e1203228b7c4f36e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
index 576adde52144f31c68a09460c48125d0b5bbc3d9..0b6a3ba181d955a2239b29516cd15c5e36baa8fe 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
index 96ab695fe9ecab5078defd42996306c66f2c88ee..82f9a680dee40629c5218f1dd37e20660d488fae 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
index a8c1d35b1973fd0959989f807401f126d117f285..3ef6fa03d7a2e85b616dad3db25f61e560ea6fd9 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
index d9bfd011e6348105940fbfa5aae89a30ecc515d6..43fb049df27e70ae9c60d85d3c863413223dadc3 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
index e3e6aca858aeff3642b856d2e2fc98e850c44568..d8944f8176e740e141e779dc8ea72afae637a3f6 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
index bd00657a69179f90b9c34a7599940f84c81d170c..d8d207ac9a6edc7354d512094b060ca9f23da715 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
index e2d4566c39731599d75fe8940bfad1f4fecc7778..7a1b2861f1f02ff5c2eaba90a32ab2ec4a7eddf6 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
@@ -1,8 +1,6 @@
 {
   "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 12
+    "platform_type": "x86_64"
   },
   "bios": {
     "release_date": "09/17/2013",
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
index 3d7c4f05dce757b7181755a55933a8d2eb7824f4..3577611386669b7b70205cf36d8618b619453262 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
@@ -6,8 +6,6 @@ adonis-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
index 9d16dbae53b66d3b2b8caf1099b0724c669c0e73..e99af8cc7edacd09e1fa8c2c231945e8da448c28 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
@@ -6,8 +6,6 @@ adonis-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
index 90896b30459db55c25e4edacd858bd0d171a3ed5..93476de17f57d0081af16d0fe45f746a512c70be 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
@@ -6,8 +6,6 @@ adonis-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
index 66becdfe6b6a2070fdccd815a2090ce22ca9fc7f..8d9c97ada6c6ae1dafe725457c6d7a1125944851 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
@@ -6,8 +6,6 @@ adonis-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
index a089e5c327537b760da24f49c22c000c936394f9..c0b5f99d481ada87494640b068fae267ae7dc3f1 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
@@ -6,8 +6,6 @@ adonis-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
index 8417fcf665034894453cd2b2fd5130b0bab41b6a..103fad57826fd6ab66cf0586affb00cc5e81bff1 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
@@ -6,8 +6,6 @@ adonis-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
index f89b95841571b234f4b7e0688fb22d98ac30fb32..542cb08367696faf6c413671cc1e2394c02c2f13 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
@@ -6,8 +6,6 @@ adonis-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
index b81512d5c804b5847a8552640780c9b41b0b61a2..a6b632d731fd3ddb99f38c5595ae102b0766e801 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
@@ -6,8 +6,6 @@ adonis-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
index f22f0f06d1fe4869ec96d935b004a1cfa74a1345..fd62c1acf2c55a0c3e38e25a87db5f4ad4ae02d0 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
@@ -6,8 +6,6 @@ adonis-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
index 8b020302723ba24b95639e64bfc603e7865d44b0..cb04e763b0f7c2b947b866172835cfa5ed75ceca 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
@@ -6,8 +6,6 @@ adonis-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
index 2e1cf9733a857b8bf74a4cde94786aeffbed3bcb..6d8a7fec3f0613930e49899ab851230d30a80d00 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
@@ -6,8 +6,6 @@ edel-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
index 1a54ce9a5cbd3856700afeeb6ec0b6af921f5594..81ac9a48d088daaab388155efb80cc44aeac3c0e 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
@@ -6,8 +6,6 @@ edel-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
index 24e2c55b0affe6abdc4847ada1367f2bc5d39b04..c6574ff7d30fc50c5b0decbdd82d5eb9b7e89218 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
@@ -6,8 +6,6 @@ edel-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
index 0ecbc0e38dfb44bd3b6389e6f9ab6b8ca991c0a4..8edb7e533d7302d4542c408671ff675339228825 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
@@ -6,8 +6,6 @@ edel-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
index faa9dcce6ae564f3f5f8ae4e6c76cbbf64fee070..e7b03093505862522ee37a838a5b1284332f2740 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
@@ -6,8 +6,6 @@ edel-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
index d78f5b91a908194bc2f340ffb9accf5158647182..0a0a55d3d37a4cca1d39b4c44b5b35b9db632dd1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
@@ -6,8 +6,6 @@ edel-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
index e1a66adc7d595a6eedf91d7b39578b403a9f306a..c25f9a94e276e3be5f9156aa28dd708c639f740f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
@@ -6,8 +6,6 @@ edel-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
index 48ea296384735cabf130cf07218e9e95e1fbd625..3c89ad37e29be1406dac938a545b21c48007401b 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
@@ -6,8 +6,6 @@ edel-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
index 348fca21e15d6b6631e6f116a2f72d5b33efeed0..5479b280176a27cdbdd6c6f2ad95935db26c8b68 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
@@ -6,8 +6,6 @@ edel-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
index c6d97034c5f394ee3682d955614829a7418cfea1..1c08c77673c30f8b4afaabc55a4cdedd55682231 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
@@ -6,8 +6,6 @@ edel-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
index deaa7ccaf4f4458e260c11c84afe9b5bf4199de9..3eba2e8938df8e6c9d32d1942085af9d8a9a65c2 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
@@ -6,8 +6,6 @@ edel-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
index 2505d42f592854f73b2556cb42796dd807915d39..3764d9fce5886a72d7d367c67e73d3d6b4c3c202 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
@@ -6,8 +6,6 @@ edel-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
index 08462043387a79b0570bd5cf58cea1dce8760818..c0be1923c550a51c74a6aecb1a6e3f64726bd814 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
@@ -6,8 +6,6 @@ edel-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
index b28f07519736a38f1d33b4857db460dd4b191173..edf966ed619c09427c99861665a4c1f987194d4b 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
@@ -6,8 +6,6 @@ edel-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
index 6de438b6bed1c244c6f200485ac43818ea89d81a..f1d2b53121d2571880d50ae12068f76671fb083c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
@@ -6,8 +6,6 @@ edel-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
index 60ba87987ce511a35ad95f6197bb8e477c4a0932..57a16eac533dbf249736996fcc25e23fa2a2c8f3 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
@@ -6,8 +6,6 @@ edel-23:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
index 1b2af146d6c1a4e40f43cec59c8387a8a664c19c..cc8f042a30080866a2721f57f0b28bfcaf37cc1f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
@@ -6,8 +6,6 @@ edel-24:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
index 18195e4f5faea3f09e2ec61df782c2f8da43bb21..665f651868b3570dc721a714892ac9d2c659cbcc 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
@@ -6,8 +6,6 @@ edel-25:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
index ed5ff5b74d5b7d3fea6ae104a2bdf52a10efd8be..6a7301ea2fff97832b73d03778c62e750e80a030 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
@@ -6,8 +6,6 @@ edel-26:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
index 488058c37f54da6c8e28272e047941c3cc1c9d15..6d50366d3f271bfb94bc800bc0f643bb7dde5fac 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
@@ -6,8 +6,6 @@ edel-27:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/20/2010
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
index 321c5b8813b2c8d89162715085af2accda565ab3..c614e8b8623df0f6ab9966ec54a9f1ad483e5d87 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
@@ -6,8 +6,6 @@ edel-28:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
index 8e65bc7d4ea37a5b7f88c7fd46f189849cd627db..960f4c2926c7bb596429c8ce70bb0631b13cc766 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
@@ -6,8 +6,6 @@ edel-29:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
index 1ab03f33cb626ddbba6d10b9b17033c067f699ec..88b07e2724df27eb34deae8c3d3332185155a2e7 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
@@ -6,8 +6,6 @@ edel-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
index e9d1e2e65fb7f8a11337451d62e6fff7683b6d3a..1916a0a8c386df36271971dc8c5088266bcea95a 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
@@ -6,8 +6,6 @@ edel-30:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
index 3d9e6c3663c1aed1e8b0414fd16fff2c802bbbdd..31af4d4fc76e03692b37903eea4a521ac181a3b2 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
@@ -6,8 +6,6 @@ edel-31:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
index 1cc9afea782fc00a12be311518d8ebed03aa7d0c..1672a8dd984b060f2306eeecbee30652e480083f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
@@ -6,8 +6,6 @@ edel-32:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
index 109392a495918cfa71b8d234ccd252b402bd577e..5103dcecd6a0a75a9b3a0e8a01e5c1ec94656079 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
@@ -6,8 +6,6 @@ edel-33:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
index 02d7628ef71b04b138191b95174de11762966cd0..34175f6a871329802494ffbfa0521e84ec1a036b 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
@@ -6,8 +6,6 @@ edel-34:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
index 7259bf1348fb731c4ecba164911ad4a14001f664..610eff41024450f59c27b3278e44836e17637ab1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
@@ -6,8 +6,6 @@ edel-35:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
index 9e0ac414bbb6a2b7f7b4bd591ac1d435b3323837..556be99edbcd1c0e794c81a2014931ef6ab52a35 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
@@ -6,8 +6,6 @@ edel-36:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
index 90009bd3069ad89d04d320f361ba9e8669e64c25..f3a6138585b74e2c4c2fcb810eded003393642df 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
@@ -6,8 +6,6 @@ edel-37:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
index e1c499eec6706fb9223461b59fcad0b9df19a083..77ad47f0e2bb1d741cd18b06a8a715de6578c6a8 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
@@ -6,8 +6,6 @@ edel-38:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
index bb3089e5ba8d28fe10fdf9204dfc1f2c387d284d..6ad75001f41e512888857ec5decf147ef123f1c4 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
@@ -6,8 +6,6 @@ edel-39:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
index d14e38851b9b6598f1e39af1fb57289c1b594c78..c198d5f04c8ab9e9c6c62decc9460e406a4dfb48 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
@@ -6,8 +6,6 @@ edel-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
index c148ed4298a95bef640484443336d0e1755d0f27..4ac3b03ca08bc276a8e2b35ad3d7508ee5881886 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
@@ -6,8 +6,6 @@ edel-40:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
index 69ec6bc85746c28a9aabfee9d1447fb4d69f3c7a..8535a5e6c7434dce03c6150249277a8baaba820c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
@@ -6,8 +6,6 @@ edel-41:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
index 54146ef1f30c26443fb2a85c1cdeca97cdd8ec3c..65ed69df4f06383d00401d51a3d5cf8020e99ce5 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
@@ -6,8 +6,6 @@ edel-42:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
index dd966e16813642b482f4314147fd3e9b580b3a76..e8d869c5ec1b18f805808990a8787ff8f0116b22 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
@@ -6,8 +6,6 @@ edel-43:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
index ff448192aac449bed827a4b542b08b6dd5a4f574..2b7bbae978207bf8c7ebbd4174b51fe17fd159d9 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
@@ -6,8 +6,6 @@ edel-44:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
index aca9bfdaaa7fe06a9e3fe2261e055847403e1732..6a236b3346ae879ea967c47ebef9f868e8e766b1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
@@ -6,8 +6,6 @@ edel-45:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/20/2010
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
index 0f35bc3c8afe71c305898887dc36aed421ba305b..3f17cb757af4b93826b328109fe14d46b14647ea 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
@@ -6,8 +6,6 @@ edel-46:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
index a7af16e1977e812c24ec14ff73a7c21182684fc3..57985425e459a8cad90b900f98542067610fff23 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
@@ -6,8 +6,6 @@ edel-47:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
index 8dc5f54a7178c107608d925f1a2ac30bb3e1205c..e0c71e1d600b42587469036b8a9150979ab5e699 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
@@ -6,8 +6,6 @@ edel-48:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
index 3eb79d1e6a6458bc848169ccecc04b683de6fa8a..d18b3f0aee492659221ff861e98662b720da1b38 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
@@ -6,8 +6,6 @@ edel-49:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
index 1d805f40669c2e522812f693828bba30b8206c4a..3619e99f9b1242099e893e4d39df4d6d0a22f7ab 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
@@ -6,8 +6,6 @@ edel-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
index 1d781a4c690af5e7d07e5b94b14cf41180526312..c997e673bddc0c763c2f406dfb52a0d0ce2ce7ba 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
@@ -6,8 +6,6 @@ edel-50:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
index 87469ccf6339baaa04e728564a245f1fa0a25e46..b479a1cc2f0708bc61855090e539320bebdf83f1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
@@ -6,8 +6,6 @@ edel-51:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
index 13b25bf0f0dda8a1c8cf7b4b26050593d13d6c93..545b66211acefbd7cb6ce0bcfbaefc18e2e38f02 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
@@ -6,8 +6,6 @@ edel-52:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
index 3d0f99eb12a31b67c36742bfa7e5f1baeab702d5..1e1d6ccb3c2b5fcf68a93c167bc5a732e0c56dc9 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
@@ -6,8 +6,6 @@ edel-53:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
index 847f5b8ed322ed4c99900ab019faa68f74f0ad3d..f3d272a86a5172ec282308d6d649e0e59a724c9b 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
@@ -6,8 +6,6 @@ edel-54:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
index 2522c243ddb841553dc8116391c657081047990b..57199490086bd8dd20a28fb3e4853cb6ac97b64b 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
@@ -6,8 +6,6 @@ edel-55:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
index 5bd461f4855ac007248ad8ead5d36c1de477da06..2a8c6b196d9eda6f93c2d7d16c8e5568ffa30ffe 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
@@ -6,8 +6,6 @@ edel-56:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
index 0ad7861c6ab58724be827c19b1926d1cc6e1041f..f1801f672fd0d255f24b85159793c52b016d1d33 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
@@ -6,8 +6,6 @@ edel-57:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
index 7426401b426ad2df74479219f6187f5e9cb68d4f..31054d66264f803fbc93bfc1a7dcdbbc46baf535 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
@@ -6,8 +6,6 @@ edel-58:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
index c6ec79e35a8bf7dfc6b5cdbce710c0cf0aeb9750..583d85838fb06bf5514c4981e7ed9049f6e5dc65 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
@@ -6,8 +6,6 @@ edel-59:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
index 03e0636c6b6f7a8f556602dfcff521c13be412f8..dc62b8d8e933324262f448a0ae5337c931b99cfa 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
@@ -6,8 +6,6 @@ edel-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
index 927b21b153e9b79b1ed22c642a09c8622cabe684..dee12e5e880e95162b28af41140e78934449be1d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
@@ -6,8 +6,6 @@ edel-60:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
index 9771b5830c3ab2f6c272e78ac075fccf8fd11046..5549ab76cefdb8c64c31857c75b161302a8766bc 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
@@ -6,8 +6,6 @@ edel-61:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
index d841a84de6b77c5ee384b73c436d2f28fff4d083..15564098731558af4619f9c52d098c421aedad27 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
@@ -6,8 +6,6 @@ edel-62:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
index 8bcae325aae4b95058ee5dc15b3d8cbf4f7f6fca..9bb04fd8419fd2b9edfb723d62c302c60002985f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
@@ -6,8 +6,6 @@ edel-63:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
index 2a0a89e0abe1395e9e605d3b273797a48dbb1250..605f3ce0e3490463f4d96dcd4cdc3e6e8cf0cf5f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
@@ -6,8 +6,6 @@ edel-64:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
index d9e12ba00f6b58b11347a13971f3247c25acfa59..e5b7c4789975fd57937c4dab08bd6222c413a8e7 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
@@ -6,8 +6,6 @@ edel-65:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
index b4429da9465cc4d45344c5e3c5c71834845d4aa9..72fc1ce87724d5aa27d39cbd1fdc1840edc94309 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
@@ -6,8 +6,6 @@ edel-66:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
index 921702df5e2072d8d7a46714c09085db8e2384b1..ffcb213ce8f89fab81b9e90c8ab048faf12b7cf9 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
@@ -6,8 +6,6 @@ edel-67:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
index b837c210d994f323e395f13119092498b70e5019..56c4309eeda9b74ec32197e2cfb9fd18790a1942 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
@@ -6,8 +6,6 @@ edel-68:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
index 76582c3425740c7779468670d7789555d8a4aa2b..03747fe7a6b85d35d1c44df827aaa3794e8a59b6 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
@@ -6,8 +6,6 @@ edel-69:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
index 6623213c36862add0bc2be09ef202f26c66947b4..876316ffac3c82d92573672420f246d00fec5a85 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
@@ -6,8 +6,6 @@ edel-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
index bf99a5cf4b4c838d095cefec39e3cd75555d9b90..41adba4feccfb4a48b3da11f7b417f7b6d6d6dc4 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
@@ -6,8 +6,6 @@ edel-70:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
index 35497ebbae7c191ca065631cd9ac84dae9d75620..a23f04e5cdf5ce54bccfcdeca6255e5207d311b6 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
@@ -6,8 +6,6 @@ edel-71:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
index c6ce367d7d4d416d9e3af8d11a036ff6aa70cd4b..33511906a6b7a420fc9a910cf8ab8bb416aef2b1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
@@ -6,8 +6,6 @@ edel-72:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
index 7d3be82aceb88a201dc199e904deed910b05cc12..508386e9ad2777dcb0f46893eed196b6ef071220 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
@@ -6,8 +6,6 @@ edel-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
index 729d11d6325d1e4137e9b33fa14183ea11824417..f75017d187b742526003a4dc9e16bdc43d84ba2d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
@@ -6,8 +6,6 @@ edel-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
index 5ca6cb8b02c608c056d43d48a258224f44d73bfd..110bca9026482f318f14bf10a5744f24bf190165 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
@@ -6,8 +6,6 @@ genepi-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
index 28334effe09f44f1eb163cf86b4c2ad9eeea25b6..95bbd15b1ea27c35d4d10fb3ec882304643567a5 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
@@ -6,8 +6,6 @@ genepi-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
index bd2e774e47ae765d8c38e9b84a98254c4726fe35..c10634721aa7fce8cfa8faf80138be852aef59b6 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
@@ -6,8 +6,6 @@ genepi-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
index de68b23c60a067c34eda15b2890726c398ffa988..1c01368c920bd17549f0b9fb7498755cb1a9eeae 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
@@ -6,8 +6,6 @@ genepi-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
index 1e0ebc73d470738c3ca63a23f5e11e2a283f6f51..21012ddecfebb97e68be5379b55f2a45e156ffe9 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
@@ -6,8 +6,6 @@ genepi-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
index a7e6031f47e2afb94277376f59777fd1c7093113..18a078a0e101c561e63b76bdc261236a6f0e0bb9 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
@@ -6,8 +6,6 @@ genepi-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
index a21ab24c6726dffbed00b620ad9cc14c046dd3f9..4095e6bdf36e209afb34ad5bc96753cbe0321def 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
@@ -6,8 +6,6 @@ genepi-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
index 71481616be919b699061c2701d056c8cde56cf85..5a3810092d1546377a509e95fe7cdbe804df92e8 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
@@ -6,8 +6,6 @@ genepi-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
index cb2100fbf51dccfebe825d6b1504b073e96f0a78..8dcf772d773728fb03c48a4345d1a7b01060148d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
@@ -6,8 +6,6 @@ genepi-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
index 1750fd65574b614ee9d987398c3cd506b0db7b70..a644f6523f927c36fb7218d4227d9bfe49eccb5c 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
@@ -6,8 +6,6 @@ genepi-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
index 2dfbed8f36eb6a684e658d470d7d4479f2c271f6..a17a64ebe8bc1644f4a8b970352bef84c2cef3ab 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
@@ -6,8 +6,6 @@ genepi-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
index 852faede265f1085a50d9cb7640385fbd4cb12ea..c98bf20e2562ec357cff4c0b1fecb17dd8ba701d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
@@ -6,8 +6,6 @@ genepi-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
index 347a977eca486b28f3749824671cb36ae71e382c..a4ac5da5ec3f6f2c5023bb3956070ed349a2bb3a 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
@@ -6,8 +6,6 @@ genepi-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
index 7ad84375e6e109782c9b460c3d4c1ade8ea4deb3..26ea1709014bc16d5460d10b30c22789d9782cf8 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
@@ -6,8 +6,6 @@ genepi-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
index 2ece089945e495d768d520d8bd790d3c43fe8ad1..9dc281351b173c91bfef4070d1c12f6cd4a39a11 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
@@ -6,8 +6,6 @@ genepi-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
index 35f1e15d78e72ee8e0fb36a0fcd083c151130887..912895da49a44f2431c568660289d062adad8a34 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
@@ -6,8 +6,6 @@ genepi-23:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
index 7753b16c853828a45f4871cd70f6ceec25c5336a..f354b29758a5f55b17c8ddf0644ccfa440d21acd 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
@@ -6,8 +6,6 @@ genepi-24:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
index 40b943e446044ad1bce411949784bf7ce36606f5..c0d790902990017d286ae1acad37a26821bff0f9 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
@@ -6,8 +6,6 @@ genepi-25:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
index 4df291bdd708c12f4967050ea3ea826f132a973e..180f34cf1dfa7dac8f1b044949e94b0a0666852c 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
@@ -6,8 +6,6 @@ genepi-26:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
index c3862613742fe13b3dc5cdc0e7bc679931fddc75..d320f947638715e74cc0d1863b8d2435bb2870a5 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
@@ -6,8 +6,6 @@ genepi-27:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
index c7aa3e2f6f45ff5f997f4906e20c014df7898bcb..a6172df238af8e4711defbbf0a1e480096a40a4d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
@@ -6,8 +6,6 @@ genepi-28:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
index e295d395d3ae1ca10d1df0d80d21bfd79166594a..aee16f739211406960352512579a20cd22cbda09 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
@@ -6,8 +6,6 @@ genepi-29:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
index 696e20b4b5be5ade9e9137ffc4b74364b96e0062..029f3b5df133a6549e65787205593342ae79b861 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
@@ -6,8 +6,6 @@ genepi-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
index 656fe95b26ae0606a1fc39d1465fe8d9285805aa..46e0a75a89383dac8df15dc731f10ddf5064064b 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
@@ -6,8 +6,6 @@ genepi-30:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
index 19e5086a138dc9763199ff212546ac62c58ebc16..db6c9465a22375a4ba7cd8b5ddd780121f246388 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
@@ -6,8 +6,6 @@ genepi-31:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
index a7eeb79696c5c4d5526b4da018807bf1de1f884e..7a0e3b4faa55277273ecbb62cdbf9dc72ebbdb82 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
@@ -6,8 +6,6 @@ genepi-32:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
index 4b9a573647877baf3e91f75d4cf154c4f79ac136..0739895e26681696a752ebdc495b60b97ebf54f4 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
@@ -6,8 +6,6 @@ genepi-33:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
index 3f12892e163b8fc8e702dda78b950be0114f5d70..a2babaf583a294633c06e02bebdd2b2d79d9e1a5 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
@@ -6,8 +6,6 @@ genepi-34:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
index 858b15177015d8adae58b4d4e6177e1e4d878d97..bbb80f955110099533df7ab95a2b7deed748c34c 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
@@ -6,8 +6,6 @@ genepi-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
index b7ab36e3a03ac55729a7b6770696cae1c90a35da..706e5b2ff7aee144c20ba932b4d9cc19d9434898 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
@@ -6,8 +6,6 @@ genepi-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
index 0b2ea12ce8a9e7ff38c1290df1a1bc052cc0915b..4d13d57dd0204767ffc57498b03a42ebce907b83 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
@@ -6,8 +6,6 @@ genepi-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
index 0b02a2021c82fd327426d16ffa1a4bb8c5ebb9e1..49ace7ace5f529a1968d32fead8def6cd16f26da 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
@@ -6,8 +6,6 @@ genepi-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
index 3ee4c9c6a5cbcb8d5e5b95b7b193cd466ce1ae8b..b9d05fb35a7085e58e2437859c622951ff60521a 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
@@ -6,8 +6,6 @@ genepi-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
index 131cafc7219020cf9fc4aa799f2814b9d2fd3a37..4fac40f35c1038e60d0df993673b0efd899a1b21 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
@@ -6,8 +6,6 @@ genepi-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
index 74490531dcbbe1ce5059bc18adc2f4a3ad65090f..3c6986449a671ed2d775570ed513f0b1bca286fb 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
@@ -6,8 +6,6 @@ chimint-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
index 571fe0bb26006168597b80e6bfe5be040183064f..231bcc88e086ac91a3ff349436053a5a8d50e4f1 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
@@ -6,8 +6,6 @@ chimint-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
index d42ad20e0cc60c44ed4280734c555522f624a2db..29b30398a06b34e5036678fd55babbd40f87eb1a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
@@ -6,8 +6,6 @@ chimint-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
index bb248a6de2c510ea3789d010deb88177b754a78b..640b059d9316f47903ff66704fef00de01b32e09 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
@@ -6,8 +6,6 @@ chimint-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
index ccc5766ce33ae537394266897e07956cbc33c381..f37502a6a9fb6d4b1c2161446e5816971f297575 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
@@ -6,8 +6,6 @@ chimint-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
index b759a8fe0129623684c150ec26f22bfa07fe3c8a..ae3cbd9185f131543b323a71913276e2877fcd7a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
@@ -6,8 +6,6 @@ chimint-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
index 2eb587660f452e0e31a3ed6f9b4e900097311d14..1dcb453aeffc930b3124fcbe5a75463410741f94 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
@@ -6,8 +6,6 @@ chimint-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
index bd7c4489b66c634fbe612e582fde332887b8ffb7..7b0a4ce3be7d91b0ca71db922fb583bff6351dad 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
@@ -6,8 +6,6 @@ chimint-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
index 796dbd524362000ff1968e4452d6dc574d9eff0c..90c5d788c981cab1241772ac9b3405032b88d46f 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
@@ -6,8 +6,6 @@ chimint-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
index 9f1e662457dc792ab54357eee8f069b431a3b783..06e0d81991ca358802e3c50d3663ba573b567122 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
@@ -6,8 +6,6 @@ chimint-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
index 03c8c7ee911dc41c9543bcd8c77993427a612288..f3cb646f370a94ddb92f884140163630b05ceb66 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
@@ -6,8 +6,6 @@ chimint-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
index b94865e1168c9c029ff26b7efdee3664eae17a98..c0b895fb2199acdf1b3b4246997e35c6dda1c9e9 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
@@ -6,8 +6,6 @@ chimint-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
index 486017b3ceb3cd5a4c53b0fabe1eb447b42ef7ed..3b2e3fc9de24f018627f1b61c56f62340aa65775 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
@@ -6,8 +6,6 @@ chimint-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
index 5ac86eaf5fc69457ef2cf28a0f3966ecf3bd9ef8..736c0e1af97e031956482281a3b10f2ca97d1531 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
@@ -6,8 +6,6 @@ chimint-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
index 28bd602e838ff9017e9b3d4cb7855de2bdb876b0..3593d9231e17f08dd2a2939c450c8336afaf8f6c 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
@@ -6,8 +6,6 @@ chimint-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
index 65af1fe16a696ad982dd618aa6caef58e4050075..ecf07e19537296f4a7539ab57e029cc4e9b2787c 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
@@ -6,8 +6,6 @@ chimint-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
index 178c2fe45557150f9872a607fa7b5abe183ec2c8..11d8d9e5ac446a3d487438349c7ebab70ef93f59 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
@@ -6,8 +6,6 @@ chimint-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
index 3bd54391040094cd1f2b76fb19b1474d53a25a81..8bc0173b4c7c36a58fb4bd2bf9acd861c1f4ec38 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
@@ -6,8 +6,6 @@ chimint-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
index d5fcc11cbed4291299d9c92942b074e7886669c0..803b3b6ca17427cc1e45dcf30752ac069b8af767 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
@@ -6,8 +6,6 @@ chimint-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
index aee05264d6dbb85ccc723679415bc2b77c6d0bf1..203ec702b92889eed72426f885495712c90f746b 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
@@ -6,8 +6,6 @@ chimint-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/22/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
index eed2b04d70183d9410b9d82b5fb83549985a9a83..8046edf78b86d093d87e802ec41ef4e2a403eb52 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
@@ -6,8 +6,6 @@ chinqchint-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
index 4ad7ae983f317d32249e4d6b443e7b145a148ce6..aac3df9182a22938cbe3a2b0ba6759a0080bb77d 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
@@ -6,8 +6,6 @@ chinqchint-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
index 45294845dc305beebf5e215d42efdcf4ded8eebc..792732113a8beb777ca06420e09f15761cf6144c 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
@@ -6,8 +6,6 @@ chinqchint-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
index 353f0b8eadcf479c960a124070c290adafa4cdd9..48198884da99ca65848e72d8a305e644f16ba27b 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
@@ -6,8 +6,6 @@ chinqchint-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
index ec76fdc15bfbc6a7d8b36a036c87de9a55e6d48c..7093716c8a2dd35e3bd3ab9c1e92f72224f410ca 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
@@ -6,8 +6,6 @@ chinqchint-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
index acdfcb5d833f83f160d663177630f4b39f122800..f45dd372561f4567e07c080cb5e1bdd3bb67fe83 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
@@ -6,8 +6,6 @@ chinqchint-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
index 84a8c2b352fbfd165455927727429b44ac356918..fd7a297263945b27155bd3ef422f30ca17f88c0e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
@@ -6,8 +6,6 @@ chinqchint-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
index 01173a0bce0352ab1681f76175a25a64a63ec8e3..208085172b9dabf28f547e72f04ad082054041f4 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
@@ -6,8 +6,6 @@ chinqchint-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
index 20272a25eb8598fe3f2f228949a370a84b25fef5..a8db970c4a0c40a21211911810262cb0acf749af 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
@@ -6,8 +6,6 @@ chinqchint-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
index 704db82d1d2e940b8e1ae4dcceb7959db9aec8b1..0f0e1a35d7610196f7206e26a49ae10a4c5d01bc 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
@@ -6,8 +6,6 @@ chinqchint-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
index 023325dc33d474b275fde7b582cbc6225faf3e99..fafa4160cfe85b0ba58e5414093ead01a6999580 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
@@ -6,8 +6,6 @@ chinqchint-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
index afc888de4ed4bfcb8ca2a8f5e0b11902da6c2f1c..ab388c746a8b82229913f80253ad428be50d76f2 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
@@ -6,8 +6,6 @@ chinqchint-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
index e685d26ee2b398af9b96c8628f0e9453afd9eaef..b9e106cfadd5cee19ead3d9ce6c96a677a1dc02d 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
@@ -6,8 +6,6 @@ chinqchint-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
index c9675fdca78249d791b3dcae9381086121e5eaba..b8a9543b829ccf80101c021fcc6e8b8c3f7d15d1 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
@@ -6,8 +6,6 @@ chinqchint-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/09/2008
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
index 02333875c9386a940ca042f67720326a1221932d..fb4b5c235d8d10ccd4f906feb3dad51f0d2207d2 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
@@ -6,8 +6,6 @@ chinqchint-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
index d253448841631874420bfd7a55839e3e07c7596a..b0c6bb81ec98cd060580ed50bc6e13d21a78170f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
@@ -6,8 +6,6 @@ chinqchint-23:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
index a1d646c120bdb18b6cdb13cdd1c81c0e2f6b07bb..eb14f4c0e0748235d82fb70adbe05ed3d7dd7abb 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
@@ -6,8 +6,6 @@ chinqchint-24:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
index 8747fe1396665c33201c276fb0767aa14f4e4d71..bc2480481c2cb8dce5fad93200a27ab6b3c1fdeb 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
@@ -6,8 +6,6 @@ chinqchint-25:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
index fd16301ac824fb01050081ff19ab4b2422052871..d02ee9f955545ec07eeb33791206e63030deb10e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
@@ -6,8 +6,6 @@ chinqchint-26:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
index 38d113ec1ee9549872ff868a34d01c588abf4b9b..b0e1743256cd8eb0bba4e1fc620797d2215fef43 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
@@ -6,8 +6,6 @@ chinqchint-27:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
index ca78a7448648e1ef0ff3d845ad9ab6846b0218ec..058fbb2d40859f6c7a313ae3ac1d083f8d407413 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
@@ -6,8 +6,6 @@ chinqchint-28:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
index c329baeefdafa146bc195d4e93f8c6298343de02..931b0917b71da1b5051117fdbca3bed9164d8c95 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
@@ -6,8 +6,6 @@ chinqchint-29:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
index 95a3b45ad969d7ded985fce8c13f7d3439e05e43..b3058999cb5968ae00778d04ed2bf1d1c40a9136 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
@@ -6,8 +6,6 @@ chinqchint-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
index db32ecb14a9c1cebc09f346bd2293710e90b3d96..68adb437c306abdca1054c27085e6be2525cdc08 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
@@ -6,8 +6,6 @@ chinqchint-30:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
index 0aa210c3dc2274e6a27b76db6470494f81a90865..885e1d9512631e8595f4e465daf43d3ec1cebd0b 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
@@ -6,8 +6,6 @@ chinqchint-31:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
index 1328e420ca2e2265cf686a84c2ae8fbdd153b698..e330bf2bc2ea4e13b27840a6c1db1e9f487bc096 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
@@ -6,8 +6,6 @@ chinqchint-32:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
index 81b797b76d82bf4579a4c365d3b23e8c27cde312..7d7076ecfdda47dcc086a1058475d4a0cc7df8af 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
@@ -6,8 +6,6 @@ chinqchint-33:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
index f0ef050481454ceb50d232fa893a37fe9a397da9..4a67c2e8a7d40095d567c6b9ca29dc10e440acc1 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
@@ -6,8 +6,6 @@ chinqchint-34:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
index 38f27a4c8a6118e0d94e134b058acab7cf7319d7..94dcce08ac8936fdc30db9a2b1ec66dfa4f5cc09 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
@@ -6,8 +6,6 @@ chinqchint-35:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
index 7683c35086bb777b5f86e1636ff5b677bdcbc0ee..ad35278287586c87c8453dcceac33a127def5a8f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
@@ -6,8 +6,6 @@ chinqchint-36:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
index 6d771f6fcff7f38a71031d0b4ab30048f401cc77..32d03ac2310a6070b2d7ed01e91a04070a15fd34 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
@@ -6,8 +6,6 @@ chinqchint-37:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
index 08b8188c03a5bae5850a0715a32c4c6ec669a842..7bbaba148da9abd085ca37ab1e6ca89b1ccb73e4 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
@@ -6,8 +6,6 @@ chinqchint-38:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
index 3c0ae3f53d61fcef61f33a4891289266bed613ea..23d92bbe9e405bbc3f601c9df5a42107212e9bcd 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
@@ -6,8 +6,6 @@ chinqchint-39:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
index 9d574eab7ad5fd819a8dc20055bedd7a075f3f83..de84b51d4d97732c99ffa1ef667e982f141df61f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
@@ -6,8 +6,6 @@ chinqchint-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
index 4ad06cbfdc161f8c15c2e30427af4b0be5bb705b..d4bafd2af794cd5534dc3874486a201ec4c8af11 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
@@ -6,8 +6,6 @@ chinqchint-40:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
index 06984f61c32c4d4b1d82788db42fe6f82c5e5661..14b6014b2d25c262ba73e3460f23bd59d9e4587f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
@@ -6,8 +6,6 @@ chinqchint-41:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
index 986c6105a9c161ac4ea0074df3566a5b7f516b5f..a1d66ce50532d726ba5ccf0582050ca3ca9e26b4 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
@@ -6,8 +6,6 @@ chinqchint-42:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
index 05b6ea9c73e476ab2970a012d3782f41e2cfc452..8a85aa4e0a2f39440fd18242968fcee4a26480e0 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
@@ -6,8 +6,6 @@ chinqchint-43:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
index 58b5bafa6484901054f443d17511f02bbbb9aa93..77055c6e1e5c556b5a31cd9852ec40737e7603b8 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
@@ -6,8 +6,6 @@ chinqchint-44:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
index f07cb800f37ad567b1a8e8115850a991084abef5..38090f8f16cbe9488c7a0a1159fc1ee39ed80fb7 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
@@ -6,8 +6,6 @@ chinqchint-45:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
index 32d78be64b6589367b5338ad1f41a3e2f65e4e74..fbc955e6ed5b2fbf59970a54499af386ee370acd 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
@@ -6,8 +6,6 @@ chinqchint-46:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
index 027d39a14133d89d362d3f81f6ee18f36a471ccb..6aae198aaedd34ff4d0efa6223df239cfcfa0760 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
@@ -6,8 +6,6 @@ chinqchint-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
index aa9ed77a0a649dc985a77e7e4f1257d49bc99b83..e766a580c4ccea382d8fbc2e162d221adffc37a2 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
@@ -6,8 +6,6 @@ chinqchint-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
index 4b275e85b36af9fc105429640c5cb964e8b82cad..d7e02539bc8a7fdaa7ab2b69e4330dac3cb8e465 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
@@ -6,8 +6,6 @@ chinqchint-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
index f3aa6b013b43de5f67bff90404483426ef0fcde8..25e78e858132901ee80a9e02a082b183aebd7af6 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
@@ -6,8 +6,6 @@ chinqchint-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
index aafdef52739eaf9b5eb576f81c508fb13ef4bc35..3b56b2951425abcafb3e298039778cff4dda76cc 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
@@ -6,8 +6,6 @@ chinqchint-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
index 8b34c519bcd17f08278d5db13454dd3569a870ef..cc95b6e875f4a763fa7b141c73ad090e7a2b92a5 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
@@ -6,8 +6,6 @@ chirloute-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
index d7f3d324aaa715f078a29e104cf08df83fd032ce..bac88a1d62c47b7a8bd5438ae6bc32c3bcff875d 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
@@ -6,8 +6,6 @@ chirloute-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
index ea28a9645d5e47312697bc2e1cff9b596379eae1..1dde942e5a642437e3b2f05660691086cdb91691 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
@@ -6,8 +6,6 @@ chirloute-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
index 57bab98398e5b41d1d30e7d731dc911d2aae4332..5b3ea0016fa2c15cd804872709eac12406d3b787 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
@@ -6,8 +6,6 @@ chirloute-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
index 750245f1aabc281438df6b0b3e58d38df63b1b43..397d81fa5f4976605a00d0b9f4448b70d583c1b0 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
@@ -6,8 +6,6 @@ chirloute-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
index 8831bb144e680c216d31f2695824878e392f8f2d..d1deab1762eeb1a42a05d953e9987daa969b1e75 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
@@ -6,8 +6,6 @@ chirloute-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
index 5a1c295756c0ab208e595d4ab72aeeb97e390454..1aa3f38ae1b910061b1bad3129cfb56524c28448 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
@@ -6,8 +6,6 @@ chirloute-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
index a919c2817e05ea5dd058667e3fbfbb3323e52fca..4ee2c9dce2a27c571e4f4014d70c9fdd824094e8 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
@@ -6,8 +6,6 @@ chirloute-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 12/23/2011
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
index 61e10e9bacbadcf7bf0eece29a38b6bb426e8c3c..970e924d1310ab8a5147b7567068791520c4a974 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
@@ -6,8 +6,6 @@ granduc-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
index 99a5aed2d2505316aa1e4c9a86342568e490cc97..71879bb682959b36c658f91c0670d402b48c069a 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
@@ -6,8 +6,6 @@ granduc-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
index 83972d13a6db4f0a96b9b2c992ca992e3640f23c..fd1b6744cf5bff7d8222bfba14726bbd7e78e85a 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
@@ -6,8 +6,6 @@ granduc-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
index 4024fc01547cc9cb0d28a2aa845689f6d560a317..2e229dfa04aedbe423b9d50097f039c6a3332453 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
@@ -6,8 +6,6 @@ granduc-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
index 5afa2dcaeb0c86c2022a63fbdd740c02c917eaa0..dcfaf37d137fec4e47cc22f2ad6019d5c34b23d1 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
@@ -6,8 +6,6 @@ granduc-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
index 19961cf99ef80cec0e981f12609563443e5e2dcf..579aff2051ff95684c399ece457279d5e0b44acb 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
@@ -6,8 +6,6 @@ granduc-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
index ae9720ecb61be01401800bcaa20334345e066a38..2aa6cc19f822524e34f097b77e1f0ee0e2fdebdc 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
@@ -6,8 +6,6 @@ granduc-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
index 40304fb8a13edcedf4ac7d6f656fffbe5b9266de..1ac8eaf0c6063ca5c34c26a5a560d1ba43fb7d6d 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
@@ -6,8 +6,6 @@ granduc-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
index bc0106fd8b9872752025db3a1d844dc9f2ad4047..a08e53f6325de631e7a0591a3a5a75f58c1ea0e9 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
@@ -6,8 +6,6 @@ granduc-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
index 088f4d22b04efe682d40384e70099a6fc5bfa597..6ad259ff64ae6a3ac5f5a30e82d6a61cb4525c90 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
@@ -6,8 +6,6 @@ granduc-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
index 9f9ea87259100c18b10ada836252fa0440b9746a..39e4fa7786ba1626ab467f279181ffcc11c5e80e 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
@@ -6,8 +6,6 @@ granduc-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
index 01e64b4a9778ad27f789438e5aecdd1267042f3d..5a06754049c49890bb05837a3714bd830046cbca 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
@@ -6,8 +6,6 @@ granduc-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
index 34aa3174f32325ff3b41002ea4ce601ef662f003..9c92eb8ec66ba33e1b227d036499c70a6dc1fd18 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
@@ -6,8 +6,6 @@ granduc-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
index c194039a003758599cc249806537ab11bca283e6..b58406e15ced74a3f110881164ddcb0cad908e59 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
@@ -6,8 +6,6 @@ granduc-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
index 3100f1558eda2e0766c0c4a50c9906164bf81a76..91b195fca4b7a1a11b8f8356b89992c39739428d 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
@@ -6,8 +6,6 @@ granduc-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
index f8a17292f596df80f387928314ed4f7a39ee6e84..042fb5fa3c02a80bff9a42e9c2eb65a47c0ac0ae 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
@@ -6,8 +6,6 @@ granduc-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
index 376d4b09c354fc736615f9fe0345cd52a5c63353..d6848778140c92a7c012f9d5e8a78b983bb813ca 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
@@ -6,8 +6,6 @@ granduc-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
index 9bf198e0472db889015fad72cdcdfa07ff401821..166a38c7148063274e7eda1c6ca0db0a5b573df8 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
@@ -6,8 +6,6 @@ granduc-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
index 30faf93f45e8b745ffc733b14f9dfe6671ae7c1d..f08c0537e0eee9687cb4f088c00adad0ece40328 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
@@ -6,8 +6,6 @@ granduc-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
index de7b4ea1b4e510b0ae24936a4bad0e2afa951629..fc7dfafb8a77139b8d955a5a6ff0cd6ff3b4d814 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
@@ -6,8 +6,6 @@ granduc-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
index a274f3fd27dfe8f8821b61bf4bb751d06bdbe23c..0576ad9abcc644c65db8c23188cac39a9ad813e6 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
@@ -6,8 +6,6 @@ granduc-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
index e6d617d9288122efcd23088c16b31cf61916bc2b..ed4928be5671eaf2b138a42c2964b75135b748fb 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
@@ -6,8 +6,6 @@ granduc-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 10/30/2010
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index 8b825d21d2f0a066b8d8c57926f6799a48ccd673..4ae62685b0cca78d78d14654552b303f17bb4a73 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -4,15 +4,13 @@ petitprince-1:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-1:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index 022b4f648c7f4635839dc7ad8ee266f137b3b006..7e353029186495a07cbb2cdbdf6ce142b6ac834a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -4,15 +4,13 @@ petitprince-10:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-10:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index f2192d0ff986bf8838e151ba4ec23d471c1dc314..b76d47f812a82c45e0bd48b3af320990cb8fd249 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -4,15 +4,13 @@ petitprince-11:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-11:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
index 3e95aac61a9fb7253b12a3d34be2a462ff4c8afc..ed387c4a8138aab796bcf8cd45feeb5196c402e2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
@@ -4,15 +4,13 @@ petitprince-12:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-12:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index 250f6683cfbd71b5670c124effa78238f795defb..18b737c90cb9cf1ebb5da3bf4e36a2159f5f3250 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -4,15 +4,13 @@ petitprince-13:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-13:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index 4c9adda39db1f64e6447fc7fc9d0baf3ba3b257e..208900f353dc27340a37c0333619c379cb001743 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -4,15 +4,13 @@ petitprince-14:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-14:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index 4ab7da4d49422b2aae3a5034859af8834beb4e95..c6368d6be8117f1bb03e3fd984c3caecbb05182f 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -4,15 +4,13 @@ petitprince-15:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-15:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index 25e72acdf30a7d8d4af57263d9e7080aca3d4c85..e9b32ab7d64fa241302ca3586ba4ea1f6c55bb42 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -4,15 +4,13 @@ petitprince-16:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-16:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index 5040e7992dd64ae227b17f6b1bc24e3ec56f72a9..87c4e6dade4f4e4ec10d5420ed2c0f7a2234d56e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -4,15 +4,13 @@ petitprince-2:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-2:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index 0ccfab811db23ece3de267cfcb3a328d8185e6d2..f9be7a11cc4664bc3a7a6fda42309469d7828e7c 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -4,15 +4,13 @@ petitprince-3:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-3:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index 5351651ab97a1d8219859440b04614cabc5c19db..3b5e02d186d7df178ebea0414bf6e2018158316f 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -4,15 +4,13 @@ petitprince-4:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-4:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index 49eb488a484f7300151f0f454c2e047f45793eb8..43c7dce7a1bc8ec3d2c2a7831bdf7d122509dd14 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -4,15 +4,13 @@ petitprince-5:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-5:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index 9074697e8dd8d8769bdd16b0541f3cd67ddde7a3..2f360cb3125fbe04984e1d95161f552432bd637a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -4,15 +4,13 @@ petitprince-6:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-6:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index cf433b7e39c66807aaf88a6783bdc571593cc99e..105234fe2a1067628008d1f9dbd49467fc539575 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -4,15 +4,13 @@ petitprince-7:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-7:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index 8000a2944cd907e5a63e50992c1d538d595f9061..731e3c56a591f4a9ed7eec656a2382e0135c1b98 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -4,15 +4,13 @@ petitprince-8:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -60,6 +58,7 @@ petitprince-8:
     cache_l3: 15728640
     clock_speed: 2000000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index eae8f395e30055b70dafd88024e0a9d3d500635a..58af6907732742fedffd006837833eefa739373a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -4,15 +4,13 @@ petitprince-9:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/27/2016
     vendor: Dell Inc.
@@ -59,6 +57,7 @@ petitprince-9:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index b195c9a0cbd97efb3d0dcebf774dbe2a3ae80838..5064bebd6168cd9fce8738ca77ab8a7c55dc9a08 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -4,10 +4,8 @@ hercule-1:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ hercule-1:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index d0d1d6b166011c3890c9650a6d41aa546c6aa5ce..988e7bf576fbed2f339d5efa3dad382411872554 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -4,10 +4,8 @@ hercule-2:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ hercule-2:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index 91996ea3a8aba2a2cc62a953b715f0a417cf4c86..899634db5406f99ee2a140fa63dedf9519c8d453 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -4,10 +4,8 @@ hercule-3:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ hercule-3:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index 6993856d8d7b1981a1be6a97b9bf8e7bd63a0646..45e285b8551608c814e0bb7bda9d9fdcc1a53387 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -4,10 +4,8 @@ hercule-4:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ hercule-4:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index c2e9c7e19282afd9572715aed0b36c04f9d7d006..ab171ea8406c71b02c50ae2359e4a63939fbd0eb 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -4,15 +4,13 @@ orion-1:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 05/10/2012
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ orion-1:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index eb1a5babb3450135e721ce2610929dff48e335ec..e4306c7e76c91c299b5708503ba415be7e0f4906 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -4,15 +4,13 @@ orion-2:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 05/10/2012
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ orion-2:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index 30d006c5dffb0802701da3965eb84233a5695bb4..9e3e81b4e16960c4ae77e0534e5dc87b54e26e1b 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -4,15 +4,13 @@ orion-3:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 05/10/2012
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ orion-3:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index 984875ce61634b91da30cecb2d754a041f89e5cf..1be5a50d8eb53047d19a817cce501c7cd4af53a5 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -4,15 +4,13 @@ orion-4:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 05/10/2012
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ orion-4:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
index 723a5beed1413fdb0313cf11ba96b0d64e385f53..32c5e1b1f7f80ffd73fc495d4c6dc0966a57cbbb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
@@ -6,8 +6,6 @@ sagittaire-1:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
index cd7430dd024dd1ae6abf820b7583017fd18cf655..696f5cf670a6f904342926be8d7bca4046a7d689 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -6,8 +6,6 @@ sagittaire-10:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index e44211c4a9a3325b223603df0cc6fe336c0ab516..c35d4c3197b7a3034ff02cd45425e12372db334d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -6,8 +6,6 @@ sagittaire-11:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index c56a2c7479e5c4e265262783b0af9bf1374a3195..c9df9def3bdfe1cd55f459666e746a265bc612a1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -6,8 +6,6 @@ sagittaire-12:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 5d34d083b38cdd03b4103528fa86425b90d09438..84ffb230e392fd7dc49d008f230f9a3be95ffb39 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -6,8 +6,6 @@ sagittaire-13:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index 3993c3908acb738559a3457e0221cf82f0452c88..857176b07368a22e977bcd75b3bacca609f9de42 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -6,8 +6,6 @@ sagittaire-14:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index 1a968d2d1f272b2f819b66f8618c2905f396d307..b9f7aee0e6be4cc54f4a79826c79d5f1b1cb52a6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -6,8 +6,6 @@ sagittaire-15:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index d3512346b4bc6df8528fe75a4399575cc74a54e0..3c617265e246e9f49661ac2e8e5ea65dcc897576 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -6,8 +6,6 @@ sagittaire-16:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index c33799e54026a019c0abd3195adb41ca0d4c2678..2bd46ada8c1830f8c59d0e5d4b4b1325bebf01cf 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -6,8 +6,6 @@ sagittaire-17:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index 97eb88fd2b5cbb96acb29b5f693f9f2c52593a24..3b1b63f7cf85da5e432f23af86f8ce3d691f077e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -6,8 +6,6 @@ sagittaire-18:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index 55a4777062bb6771c1c97dda8273faebb0595374..dd0006e304a45d5c904b76d2ad9efe334effa5dc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -6,8 +6,6 @@ sagittaire-19:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index 03555e97f3d30114ba45fff8862319614918dfcf..fec549a8ff9747a8fe6c577ac4a706645a38e7d1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -6,8 +6,6 @@ sagittaire-2:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index 6440d62a90f647ab270705a4e20310e683c1bd9b..6ab2ca05fcb9ba614a08b7d9143047c3bc5d5f46 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -6,8 +6,6 @@ sagittaire-20:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
index 4d0641eea5ea5ad1d7d498c9db5ce03b4fd108a5..3f06ca125da1ac1ce717a833a34b63e7eeb50954 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -6,8 +6,6 @@ sagittaire-21:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
index 226e49728a4688b135c42756277dae2b1c2a3f63..78029552c5aff250e28b2c1b8cc71fc4d30fd4cc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
@@ -6,8 +6,6 @@ sagittaire-22:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 03/02/2005
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
index a41f1529648b9e8a776e68fc24376d2ad03bea4f..c012314021eed9cfc5c4a98cb9d9649ea4aa4f0e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
@@ -6,8 +6,6 @@ sagittaire-23:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index a9f0e46f66c1a3e87b3b5cd86352548c272c3b94..f3cf35e854f1bf391d1d91dea897441a9999a9e1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -6,8 +6,6 @@ sagittaire-24:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
index dfd41c40be7e33133aeff8a5430ac43ab2e086b2..7e4a436e55c80c7698bd7515992f3a85c015124e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -6,8 +6,6 @@ sagittaire-25:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
index ccd958f34475109688fd1b7f9ae35354220cb46b..ed6075dc12814dfce9698ec3e67ef37b47103482 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -6,8 +6,6 @@ sagittaire-26:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index 56d231d8ed7c70a5be9e5a9da3fc39daca28e8d5..84ad082806034946dd0742d1a18a2863686c8333 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -6,8 +6,6 @@ sagittaire-27:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
index 8c3cb22772144744921313a1ac3178e8a23e1a80..70f072302e209bf301e208819af0a347238375c8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -6,8 +6,6 @@ sagittaire-28:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index 5725c89e4b862afbe1bf6b50b23c254542a88d9e..15e7e392c7c57c70f2158e63d00cb87092824217 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -6,8 +6,6 @@ sagittaire-29:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index 6e2d723abe79713427a8750b169daa9e44b15b45..f100b07cad4a224f21707ba8f700a7a4738a35b2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -6,8 +6,6 @@ sagittaire-3:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index a8938166d5558d1515cf6afc1ef630369327bbcc..d432e19731e08ffb924a9379015fc45acc2a772d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -6,8 +6,6 @@ sagittaire-30:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index 827ae15e02a34b1f900f4895d74927c4116c51cb..c59656e4f9b548abe56e842ef69da548cb72984a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -6,8 +6,6 @@ sagittaire-31:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
index 48d5f09160114a47aa35c5f3f2ff14d796da9ede..5979372b29471553eb6207e6c07c85b94bffe29c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -6,8 +6,6 @@ sagittaire-32:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
index 41cc2ee1c8d26c423c50dbdbb2fd40f0acf9ecc5..b578d80bf094193c0b266a2e2b2e7101c78dfa82 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -6,8 +6,6 @@ sagittaire-33:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
index 8ae3e73d86d123dd07e7e820d98f97bc8fdaaac6..e9b9adce4c9b1fc28cda9647be771b2f5b24757a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -6,8 +6,6 @@ sagittaire-34:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
index d8bd29e14ba38dff8ce9f4d8ab2c83e8ec74e908..3f4e19b8318573fb02c42f2f0ef965238a91ca6b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -6,8 +6,6 @@ sagittaire-35:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
index 99457d7fc5d72996b8e7d4c2f1052b142c258704..a26af936b56c73e91b44d09154762b27091e2ee1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -6,8 +6,6 @@ sagittaire-36:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
index 94b6b4f544e744859ddc2228ba8af7ac4146e910..784a6a804cf848d2e751c87587e3de95f2b3f094 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -6,8 +6,6 @@ sagittaire-37:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
index 7652e2ba51f31cbc94ed1c3a38f44120037ccd22..33096201712333c988112ce2958315621f9bd2d5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
@@ -6,8 +6,6 @@ sagittaire-38:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
index 04687143b0272968ee49206b89e3baa81f92404c..5d6589ead6f853d180e424afdf3b5340e9be1a10 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
@@ -6,8 +6,6 @@ sagittaire-39:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index 823dba228c32aed5d80d5a30d606f0c75c630d74..b843d0274cfee9e52767619573239b177327864e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -6,8 +6,6 @@ sagittaire-4:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
index 74c5f7b583382a974ca6e877f30b8e2515b40090..49e3dcd0b9a3fbd3bb8337a6afdb6fac6c194a36 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -6,8 +6,6 @@ sagittaire-40:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
index 1f5abb6e890332f08c9196281db01aaf49ecd222..0edb25f870e155ac658784a5a2baac30c2ac1d49 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -6,8 +6,6 @@ sagittaire-41:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
index 7e88fac7f6e19a91a46ca46ae12680be91fdcc6c..37e9199fb71b4598f9a552dd39417afbf8660573 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
@@ -6,8 +6,6 @@ sagittaire-42:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
index c90a87cc82868b3a9be4cfec995323febb40f29b..e18521265d391575f1bd7acb03535752725d6a77 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -6,8 +6,6 @@ sagittaire-43:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
index 7f8ae72c3ff4bcc28159294c89af886c47ac8afa..198418f7a110552bba23f362d3763b7fd8d5f7c7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -6,8 +6,6 @@ sagittaire-44:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
index ab2b1786f278e205f28534e9992d1f878f6c92ae..60014959f4afec2cee102d7142a0cba737be19f5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
@@ -6,8 +6,6 @@ sagittaire-45:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
index 7a8a0035de591c4230337ade2fd65fe8ed9a19e4..8a2b8bb024be86e355c2b2406e1f94ea83823502 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
@@ -6,8 +6,6 @@ sagittaire-46:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
index f2b8ad1fbf50b39543849e6d300b122b68a7826b..1bcad8e23d92b080a54d822a92a196739ec0e057 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -6,8 +6,6 @@ sagittaire-47:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
index 6e508505ae878946d6e522c9672df4992edfe83b..7a5dc2412a82374463f8ca69856e1d12aace7418 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -6,8 +6,6 @@ sagittaire-48:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
index 085e1b3f7d5bc68b54ca4f0c35da9bc3700e6c89..47ec39b15ebcca7a8fc74704b1f85cb855469301 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -6,8 +6,6 @@ sagittaire-49:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index e4d93745e7439ecab9b171a004b93f062c65374e..485ed0611e7bf48e76a361f06bae8a99ecbf55f9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -6,8 +6,6 @@ sagittaire-5:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
index 6848a65057061eaff4be448088c9aef8440c7bb9..7e5b75e2f7ab6c6fe7d7bee309aa9b23f11f17c9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -6,8 +6,6 @@ sagittaire-50:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
index 202a3af002f73705c544d3d0bf4448d67faf37ec..5bd6536d093da25e861d41450d9c4827e183d9b0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -6,8 +6,6 @@ sagittaire-51:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
index ea0e7b8302b543011de2810bf39fbe6b744b4a6b..85d96e9aebd7fc79099eb7177494937e3bb0934d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
@@ -6,8 +6,6 @@ sagittaire-52:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
index 5446f3b7ceebdb37ba56d54da44969655fb9ce78..2e84c1c10f9f2b66968022c74064be73bbea32f1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
@@ -6,8 +6,6 @@ sagittaire-53:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
index 58feab02f174571ee27a079d1d61cb02098076b6..35c2592287e86f9bdc74d6cd1e8c0038328a7b5e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
@@ -6,8 +6,6 @@ sagittaire-54:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
index c22385888d5a850cd208d62c5b7336c6b7bf7722..1aef2ed17b4dc20fd170bfb3d9679c8fe59abdd1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
@@ -6,8 +6,6 @@ sagittaire-55:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
index 0b35e4c76e984e57e571c5061e45f04ee07b81d0..6735235116d4f99710fd598b840ba6d0bb0aec8c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
@@ -6,8 +6,6 @@ sagittaire-56:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
index 4d6771e7de2b8651e6c3d35a71223b3ef628b4bb..849a9c87dc16f8c7b97540613eb3ecaae777f722 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
@@ -6,8 +6,6 @@ sagittaire-57:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
index b1bed96a4e1cc2280fb92df634f6f0494d731ea5..913df7b439a3ac6e3e5a7ca8f94c24dd5667c6e3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
@@ -6,8 +6,6 @@ sagittaire-58:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
index 9281bda1d8774c4a4da0fd02d50f2ca4d8f7261c..c839c07cb0dec68ae75d01d8535b8f210ca5d75e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
@@ -6,8 +6,6 @@ sagittaire-59:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index 80a9593bd1ac7f6279f27bf1cbb21ed2d2ff7beb..75d144452e80d07b52cc4b51d73a3b9bb0bc45dd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -6,8 +6,6 @@ sagittaire-6:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
index f15e6c69d0dc4ec91f400273d982b7a292542240..be13ff9a357fa9b3d043938c869e0dd993a24814 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -6,8 +6,6 @@ sagittaire-60:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
index 126d7bdc453afb4aa662ee7acc5ae5cecb5d2f00..3b9eb7c69da5e0a2cc1855445efe9bbd6728fc35 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
@@ -6,8 +6,6 @@ sagittaire-61:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
index b0f83110f2dbed2a53180dda5f8ea4258449d145..3ec1420e9590fb8aac673627075f42f05d717959 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -6,8 +6,6 @@ sagittaire-62:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
index e738d33788620d4e690f2704fcaf51bc6d90a9d6..e7918aea27b8afc8f7f4d88537af2a71a291bd86 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
@@ -6,8 +6,6 @@ sagittaire-63:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
index d7ab5d75ca9a7211c8c1cd1d1bc02415905447e2..d9b1a9dcb0210e9245c6e0ce2e6abb4e72d2aa61 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
@@ -6,8 +6,6 @@ sagittaire-64:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
index 1ad4c842ca58f046def76b4298028c4fee694920..9ec6ce60b825ffec16be1fd2dedb310d64737bee 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
@@ -6,8 +6,6 @@ sagittaire-65:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
index b1c69194edd0d393b3cfafaac4764eef0454e86a..ab9e0d639bb3d802d5d3aafbbb56e77b7330aef5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
@@ -6,8 +6,6 @@ sagittaire-66:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
index 0966d00e7bd2fccd036883c011ddfb60f64a565b..a201c0ca102e48adcc32b661e98038db4d954c20 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
@@ -6,8 +6,6 @@ sagittaire-67:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
index e74f3c8275270e863c0674c858d57aa1fe1c8549..8ef773e6e4b2e0c06577fac5b17e6a9640230377 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -6,8 +6,6 @@ sagittaire-68:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
index 396489267f5e5e77fcd74fe35df6687b42542ea5..3ceab5f64ba6e99b4ceb6cfaf9ec2e23fb3b5a99 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
@@ -6,8 +6,6 @@ sagittaire-69:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
index e5e1ac66c03c6500fe5e0f8a818f5d4e2f4bc6e6..c09fde6e54a30bc14c9dc91490632aab3a7e4bc7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
@@ -6,8 +6,6 @@ sagittaire-7:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
index 52e2c8e39dc8056b32f4df17e665b72084ed2dac..6f4ad0fce2f1915c945bba8038acaf9da97dc86f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -6,8 +6,6 @@ sagittaire-70:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
index 981c2e4ddc58024acf089c22c4dd7737a854ea41..ca9aedc72e01e3b8051b85aa5e0e884c50f42538 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
@@ -6,8 +6,6 @@ sagittaire-71:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
index a2f48a8bc27fd4c96f353a25e5c177531b6917bf..d17c9b79fdbdf3300384520259b0895d6c5133b8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
@@ -6,8 +6,6 @@ sagittaire-72:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index 8170550362498f8b4b92a92a9d829382a1a565bb..b31a96c50bb324e342a3f34e45e26fa51c15f477 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -6,8 +6,6 @@ sagittaire-73:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
index 212d0f3a0cf064cbff6d296ac1e3313e5f975c5c..4a724a1aecfdcb5b12d5a2beeda24aae7cbdc9cb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
@@ -6,8 +6,6 @@ sagittaire-74:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
index 1b31489d0d5a01789de302aeba8cbe7bcea3b6eb..a359e233575d53bdae897a7061879376b626e5f7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
@@ -6,8 +6,6 @@ sagittaire-75:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
index 9b0ce4ca6186adf545ef0c8500ccb4d453897a78..f309c4159fc12bad80aacbd5fe98cc8b4215b2fa 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -6,8 +6,6 @@ sagittaire-76:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
index 608b7e19244e55814992cf03b872d23c5e5584d6..259d65c292ac3e21b194105db04b4092431e6f8c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -6,8 +6,6 @@ sagittaire-77:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
index 88b9bfa54c2bbe7c77a12e9095bed2f47b247653..50343bbf0d4b9190ab7ffec250a43078ef2b7ee7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
@@ -6,8 +6,6 @@ sagittaire-78:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
index e145d339967da947383f328e0632fb976aafb1d6..cae6b3df722416a341834420366e08bd7c8851c2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -6,8 +6,6 @@ sagittaire-79:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
index 0114cf26034c40e5746b9dbfb6d268b89de629d2..c2a32ae0eacf84848ce95136fb3b427f5b74595d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -6,8 +6,6 @@ sagittaire-8:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
index d5784c346dba11a13a53a1f589ef4a68d1dee468..28fedde19e2675355314738c73ae60d89d999486 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
@@ -6,8 +6,6 @@ sagittaire-9:
     nb_procs: 2
     nb_threads: 2
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 2
   bios:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 22377601fb70069fa00c1e6d715175edb970d9fb..28e2f1d7db1d40cf3cb6d7ee4279c460c5bece21 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -4,15 +4,13 @@ taurus-1:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -98,6 +96,7 @@ taurus-1:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index fd4e33301d0806c52dd1185dc1fede5893898841..7850707610ac03cec7c68ab7b7e77c24ac6ff50c 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -4,15 +4,13 @@ taurus-10:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -97,6 +95,7 @@ taurus-10:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index 439cf20f9844d63c2842908ed73dc03d17487426..0e6632beeae7733b7ed9c87d0ffff63f8a19a472 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -4,15 +4,13 @@ taurus-11:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-11:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 934b2a9c8a09210862840f66e02a85434359fbd2..d98dc8744fbcd7a788c6b56d8b308ec41d584191 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -4,15 +4,13 @@ taurus-12:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-12:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index c2d08938f5858274a13367d85067bb61b04bdc75..3e74fd7f5de23fa9b6469be92d5c0ac8c46347e6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -4,15 +4,13 @@ taurus-13:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -98,6 +96,7 @@ taurus-13:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
index 8cc8bf594ec03b30aa09dd6f882e5f7b1836edfe..c52609d3b8cdf61ff3a370c5b249f67a7e9851c5 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
@@ -4,15 +4,13 @@ taurus-14:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -97,6 +95,7 @@ taurus-14:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index 468b102133870176bb8dc0e8e21133b4006d6e22..a7ed6e0486eb599f873491f9bdc8fc375f763edc 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -4,15 +4,13 @@ taurus-15:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-15:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
index 27fce93f7b2b4188b612efc16e22b8a5838e331a..895750478227b4bf2bbb093bc76aa45327d8b1f7 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
@@ -4,15 +4,13 @@ taurus-16:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-16:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index d5aa9ee06da31b79dc8360e3e174674d4c983902..922a47f9fd9807cddfdd6fa6f8dc73825d5a450f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -4,15 +4,13 @@ taurus-2:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -97,6 +95,7 @@ taurus-2:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index ac36f05684dec0c1565469547e64e9d4eafbc5c8..8b1e0f3bf240c438f757414f26c35b3b644b6aca 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -4,15 +4,13 @@ taurus-3:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -98,6 +96,7 @@ taurus-3:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index 45f1b7e62a7ded45649c4ae70752498c707f4ccd..0289c395416b638b63ee932775d0e1e8ebaf5942 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -4,15 +4,13 @@ taurus-4:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-4:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index a9e27297d985cd868bb6ba12ea66ea26bb4de2d9..48803b63286c9f588f95ffe0a27a4c0f03682a18 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -4,15 +4,13 @@ taurus-5:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-5:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index 6fd0990b1bd288aba892ad23667c9061abef4a1d..b24475b4091156c841fc1b8f8c6e8144b10361c5 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -4,15 +4,13 @@ taurus-6:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -98,6 +96,7 @@ taurus-6:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index 0f9e645ee28c10aa7701e166173fd075c173fcf3..f3a949c7468fd20e912d44b93801d2642fca3395 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -4,15 +4,13 @@ taurus-7:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -98,6 +96,7 @@ taurus-7:
     cache_l3: 15728640
     clock_speed: 2300000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index 0389c9505e6b613401500806c3f8db2bc4b7a444..d1508a7cf4e15ed9c9bf91715ea56a4845d7c3a6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -4,15 +4,13 @@ taurus-8:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-8:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index 96e03b777dff3eec4472da213df5158dfff50d39..35ed2b521e0eca517b444a78247a89b34801d881 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -4,15 +4,13 @@ taurus-9:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/22/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ taurus-9:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index c24251da188a5964bc0216147af7c4dcfd6e99c9..82d37501256bfd80972003e73a92f92d117f4330 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -4,15 +4,13 @@ graoully-1:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-1:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index a39a34d5702109fbb06c50e6d25c4a2b4e503ccb..743a54804604db5bfd882ff48c6ae8f565a9bb05 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -4,15 +4,13 @@ graoully-10:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-10:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index 795bdb2955bdea6b910ffe27bce0d5ced9055129..012a8b684e83b5fd12e8c571868f1c9ba389b518 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -4,15 +4,13 @@ graoully-11:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-11:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index a28c437b626073c0bb7a8daebbc4d91bcb4d89b7..82a4412536505c726796bb979a939614c23ed23e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -4,15 +4,13 @@ graoully-12:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-12:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index 90f71946e85b83d44f1877edff31338f1e63cead..b08366ae64a162b7807007ac5f2851a9ab8890c7 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -4,15 +4,13 @@ graoully-13:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-13:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
index b406c16e91d2602faf167cd9988492ae52e018b0..7cef207f918162d148ffc4bf2ae1b2b9fb2d8f96 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -4,15 +4,13 @@ graoully-14:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-14:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index 00abdd3b8d73097514d393e5cfb02f1860b2c1e8..fed3a2a4dbd2837573d5d977237eb0694334dc0d 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -4,15 +4,13 @@ graoully-15:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-15:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index 4e5058f9fdbfe2fb9e134fc9b3d04cd3b2ab93a6..a3aa17f2d98453534514ad473c72d1c7cf8c1454 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -4,15 +4,13 @@ graoully-16:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-16:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index 88ab83660dd061abc671299bc3584dac7166954f..fd24e9480ee6774ae1da723b80287f2311e7335f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -4,15 +4,13 @@ graoully-2:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-2:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index 1be4060856dd6c25c34cae92a0a131eabadbb7bb..0e65751f60238e4e7b6a8117c4ab0aae628f4b67 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -4,15 +4,13 @@ graoully-3:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-3:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index 8bffecc23db79bbeb6890a520c2678204e026c59..07ba27e8180a7ac0f65805d79881073b6b2bf056 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -4,15 +4,13 @@ graoully-4:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-4:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index 2d7f7bbd021b41783912e12dfabfae905d35c7c3..4501c37163f7347563c37aa91090aaf2fdac81ea 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -4,15 +4,13 @@ graoully-5:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-5:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index 6b40d3d7e35aa2a18e5ef2437eaa1ccd231ace93..4f93e0d5143c434190ce073ceb9e8208a4351ffa 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -4,15 +4,13 @@ graoully-6:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ graoully-6:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index 82e306302d57d26352f665724665dd9ac29969e4..c252ef0ae6e553c58317f9be034811129b4d91fa 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -4,15 +4,13 @@ graoully-7:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-7:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index b9f57d06d766893ef2abf5fbb73a872cf71f2a79..b4948f2ea1f3f8b113a2059301534cd8b252cc8f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -4,15 +4,13 @@ graoully-8:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-8:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index a3d3b4d1d4d7b444a1ea8d003a7dd987786e9457..daa5db543afae4b61c4422b87dd3effb9d454017 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -4,15 +4,13 @@ graoully-9:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ graoully-9:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
index ad3e47ccb60890894dd25a3e8fad7bae28741f57..5fd121f11e094856936121c691d2d084a757cb26 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
@@ -6,8 +6,6 @@ graphene-1:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
index daba76cfd8a58a3354272a397729fd99bd0f6c23..1fc841610c71619e2fa4cdb326d5fa869e03a745 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
@@ -6,8 +6,6 @@ graphene-10:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
index affa742fb9b559a84be1dc1caec45b1d7b537e04..faad345068f5e1a5ffc4858bc08e83e43c426fcb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
@@ -6,8 +6,6 @@ graphene-100:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
index 031db1aff2fc623d78eafe006ab69cc1fec06dbf..0c8d528da56518740f3bc0d483596c6ae7700fc3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
@@ -6,8 +6,6 @@ graphene-101:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
index 10e0e721890d86d9dbf6d34bf71154c57ba0a099..1e7258142deac60fdee9a9b0afb46967c6cb0fe6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
@@ -6,8 +6,6 @@ graphene-102:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
index 301d6b12cad4bf33204ce27eeb2b90c4a292c643..614b8b4a64e10e009f45e40b2fa2b25097b20946 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
@@ -6,8 +6,6 @@ graphene-103:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
index 192fe580025f8ad2bc599f3e2642ccdb66892956..0c346254414696fa7a32516a4028ffd92e17b058 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
@@ -6,8 +6,6 @@ graphene-104:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
index bb5213f2928874b5b8a931845ee7fa6147283cd9..d3d45dce0a3bfe5ee9295a47637b8091b7f9b11b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
@@ -6,8 +6,6 @@ graphene-105:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
index ba0d45bb7e673c5772c2f9c3a3cbe16f9471d18d..dfd9006d16cc36138e3b9c650ec7dd0d7471fa4e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
@@ -6,8 +6,6 @@ graphene-106:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
index e1798dba8d1ed2f3337498b42b64c83f5c577908..d601c3e2b053fab5f0e67d15b7563fbd6b74d6e6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
@@ -6,8 +6,6 @@ graphene-107:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
index 1baf7dd323d56622988bf2dd505d4171c8745247..9b3423965a829573af1e3d8c5e5e6a53e6324930 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
@@ -6,8 +6,6 @@ graphene-108:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
index 5e7832abee0097318838ce3db0bf5150579cfe8f..84a46e4446bfa450b51501e1b697491bfb900dd4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
@@ -6,8 +6,6 @@ graphene-109:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
index e36e7d013bc7cf11287f0d669d603b8d2ea56028..05c90a95e17114e46e7e7585ae19cf8c42329876 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
@@ -6,8 +6,6 @@ graphene-11:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
index 6889996ac15a96b57533fd694dfabd9badc5b5e5..b01c44f3bb5378e81ba1b7510cea1f0e4d10168b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
@@ -6,8 +6,6 @@ graphene-110:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
index f6cd387a0af135a1ec104770f47309a28cf683ed..a615dd82424fc3ecda136f65ab98908a6fcdc070 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
@@ -6,8 +6,6 @@ graphene-111:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
index c828f93630514dbd544472d477d8062142c6037b..f2d0d66d579d8da2fdf73d2c9c6c3783b02afa90 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
@@ -6,8 +6,6 @@ graphene-112:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
index ed0ab3fc6e74687eae897ff2e4ff9678b3ba020a..c0a3967d01c8fa3b824e86abf1b0d83479ac362e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
@@ -6,8 +6,6 @@ graphene-113:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
index 3f83ce3158181da91c17bbc1adb9c7757b3bb47d..8500948197e23a02dd4a7e5e8067fca95a77e17c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
@@ -6,8 +6,6 @@ graphene-114:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
index 026a5c59214dbaf1d95d8abacdc04aef607d5861..336f2c09971ca23c0743a60deec3b2c27f598794 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
@@ -6,8 +6,6 @@ graphene-115:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
index 11a114542c1a7a3abde9ed74881c6b398376fa80..c6fb4f88d1ce994f4f875ae533a2c17acdd5b01c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
@@ -6,8 +6,6 @@ graphene-116:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
index 99ace016e8f7c3d1f511b7e08413b2f551e4d3d5..68335fc8dcad7f0b55c64bc14a760d93e5cdeb78 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
@@ -6,8 +6,6 @@ graphene-117:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
index 230133a50586ae6c90504d0319da4e6b1ee644aa..7c2f00e61869da71c6ba8a51745b84080426ab1e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
@@ -6,8 +6,6 @@ graphene-118:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
index 62a348b729bdec2c683f369ef37e8b8dfa767e06..f9a6c27f672c5b060b9db89c53ecde03562ea039 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
@@ -6,8 +6,6 @@ graphene-119:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
index 926541969f126ac778e6bd4b1f23f22f501267cb..eee29ebdbc8c94b87ef393c7042d6f8dbc8c6272 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
@@ -6,8 +6,6 @@ graphene-12:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
index 896f3e20a9b8939938992e3837fe5ede21ab6eb3..fcfac809cefc9f158d2e001c592ed68505f3d1d9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
@@ -6,8 +6,6 @@ graphene-120:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
index 1be434eaded580742918d2ca3756e0720f8f6b46..aa93e52847fd272ff97a462ca4232acfdbab5266 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
@@ -6,8 +6,6 @@ graphene-121:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
index 4d85e45563341775a7ffbe71430cdb3702820ad6..1b5f70d83ec22512076270dd7b8b402d3dc53e3d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
@@ -6,8 +6,6 @@ graphene-122:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
index 071115ff920a35f55a457e1e96753b90d0a85da1..4fb6d6aba28d1f4befc5eaf7367036cea49f4909 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
@@ -6,8 +6,6 @@ graphene-123:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
index 5532c41f4297ff98529bebd483843210880d620d..e88a5c4318d3972b976dfddd5b642542edd13117 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
@@ -6,8 +6,6 @@ graphene-124:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
index 1fab0950453f755642f833aed055560e0029e6f4..f0884a4081524865cea6183b59e2dc40801f18eb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
@@ -6,8 +6,6 @@ graphene-125:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
index 229e8f014c4680f57bc75d074aafb7779d8566b4..790ca2bec579d3ff5c68b6d6d3538a168a7c3c3d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
@@ -6,8 +6,6 @@ graphene-126:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
index 81814cead08be9cb51e713b13a90fabd15eb2e1e..200f772b642fe78dcfb9daa841934134e82a839b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
@@ -6,8 +6,6 @@ graphene-127:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
index e91ffa52d612122aca8e15ee9ac06cd24a318696..cc2efa71cdd0a888d3a77f137d2cbc4aceb4dc52 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
@@ -6,8 +6,6 @@ graphene-128:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
index 291abca9fddcb342b7eec9f150d118b3855e811a..65a1fea60f2841eac5b8d09ecccdd494479dba2a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
@@ -6,8 +6,6 @@ graphene-129:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
index b40a873c660bc86e5a6b2009b2a4aa803a6fc4ab..b782943b368603314d87bb110267e8bc0f5bd490 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
@@ -6,8 +6,6 @@ graphene-13:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
index ebedee8dfd8101f39b6cabc10a9339b8f90f9860..5bbec3b898461e38f5dde3d118be7271c45b2d29 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
@@ -6,8 +6,6 @@ graphene-130:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
index 5b19c169685b78f878c0a0e03ad905b7bea198cf..286751f65a0e96065820a616254bf40050a8a7cb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
@@ -6,8 +6,6 @@ graphene-131:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
index 157e6a86375f42e5763364682e3188129196a136..34709d1a59ae114a56b39153814e7e9bf7e71baa 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
@@ -6,8 +6,6 @@ graphene-132:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
index 30fba2e5557079577776e74a5c98dcbf4e5cf917..db398dc60e6f673d30758b81adec8118febccaa8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
@@ -6,8 +6,6 @@ graphene-133:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
index a00c5ef24dee51af413c6e8552cff14ddf954d5f..b49ca61e7b7d6a1da2f80a77eb28ae1700eedad4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
@@ -6,8 +6,6 @@ graphene-134:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
index ca62c1da3e72fa6b0ed3097b85de1a913abfa406..0d7912627e3d26eb891b070e62f02d72976a2bcb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
@@ -6,8 +6,6 @@ graphene-135:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
index 2a229678664b4cfa8da4e9057eb2afc5868adeab..0a835e7daba0a2b1243933b44ff32d6cf5329384 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
@@ -6,8 +6,6 @@ graphene-136:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
index b765fdc4c527218b5ae5366582f1723e4fd47d80..29061d9a8b193d1dddfa4c885c8464e1b86199b4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
@@ -6,8 +6,6 @@ graphene-137:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
index 330ae4a5c16d389b2be17406d854d5a6ceb56b70..8baf42a8d4d41829b63670e7e0352aa2114f7277 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
@@ -6,8 +6,6 @@ graphene-138:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
index 93bb52f1b9edf5e545e4885742b1f1ecb08ad88f..6c6d82228b001d16821bccba64fc56ddced3b3b8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
@@ -6,8 +6,6 @@ graphene-139:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
index fb5bf4e4792f8c6616df154c6cc626ad1e3b5a2e..8adcc1505159c34a5d34e81cc3f545b1b9b0eabd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
@@ -6,8 +6,6 @@ graphene-14:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
index d1871d1619bfc1771c4b34fb7b3bbf8151d7a6a5..b1085ce005afc99be6bc2c9d91e295dae65ca974 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
@@ -6,8 +6,6 @@ graphene-140:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
index bdccf70d9ffaf94a125cdff6a657884a959f3e83..5929f5c8310c448319832e1abda57d1a995f1133 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
@@ -6,8 +6,6 @@ graphene-141:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
index 60b5699991b78d3b6c515133f13365f73b22c028..f0087bfab7b3764956ce6e16ff13b348cb81b54b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
@@ -6,8 +6,6 @@ graphene-142:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
index 02988fb34e152d8dcec3790de626d66f61c6d0e5..50b46e54fb4f981f4892516ef33f4989ce26a8ea 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
@@ -6,8 +6,6 @@ graphene-143:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
index 622b0b10976b942d411c4c04e634f0db1daec51f..f0232a85cdcd380cdb27e9db804e3cf48ac3f3b3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
@@ -6,8 +6,6 @@ graphene-144:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
index 452f15a7821fe5e8fc54632cdbe1bae49554dd97..adb8c9cca7274c892639b4d2d2e510f85cac540c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
@@ -6,8 +6,6 @@ graphene-15:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
index abe7b76c4787f958c7589cea198c60f4caf6d570..25c0f2c38e032ab75ade5111d245bf6ceed101c1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
@@ -6,8 +6,6 @@ graphene-16:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
index 592065868f8bb67fe22202be1661821cd1e6ba2d..56e66baa49c385d7630a231cb9232c5975acbc87 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
@@ -6,8 +6,6 @@ graphene-17:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
index 3203538993c95433bb23e10759d2fd3270f33335..649e0c41b6a8928a600106ceb3555a359151953b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
@@ -6,8 +6,6 @@ graphene-18:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
index 1ed44c4673d04b83575823d4edcec9511c653356..324a482f0dc9c095900a912d0068c00debf783cb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
@@ -6,8 +6,6 @@ graphene-19:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
index 175ed11cf34b65de2dd0bc994b4e6deeab4fdda2..8890d97af32916e1167a52d4ec7235667e8141b7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
@@ -6,8 +6,6 @@ graphene-2:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
index cbed01ec970e8fbacc8e945639dd1daf3cd96638..c836ab02ada97f32416651a4c1dd6f999be8581e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
@@ -6,8 +6,6 @@ graphene-20:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
index 196ac608e686a571876926b99dbb290bee78f054..c3bc857f4f938114fe873cefb9e579c7ef5863fc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
@@ -6,8 +6,6 @@ graphene-21:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
index 2ffce6767028e078b72cf8014f2d22d6ebcb8110..d6da86df4eaf5ea1c8c99ab8f13439e2cadf7350 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
@@ -6,8 +6,6 @@ graphene-22:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
index 53c751f3f75027ac7571fc1e1242873f074e5b1e..64cf6e6cc03403b05cea1c6e777fc20dbc6381cf 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
@@ -6,8 +6,6 @@ graphene-23:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
index 6cd39fff18bb902379aee1da69f0a06ea80d9fe5..f3c311b43356ae95f7b8a0732d3308d6bb5b63c8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
@@ -6,8 +6,6 @@ graphene-24:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
index 8c8027be5d6c1e4a6ad8c257325352dfd8611fed..15715536b0aae87a47379db43e89db6de21a341d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
@@ -6,8 +6,6 @@ graphene-25:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
index 2ed1f8497b8106754e453597941b72c9c11ee231..7f40588736449d18137b4367337f6369b437aacf 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
@@ -6,8 +6,6 @@ graphene-26:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
index 6b7ae49d7735b1dbe25376437b6308708ba66092..3e5e054c8c6ae2aeaa60ea2b4f6561a17d6d58d5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
@@ -6,8 +6,6 @@ graphene-27:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
index 5c2c8ca9466b1fed158208b507d12d6687b4f448..3e6df24cefd3212fc7816310e6f72bbb26a24938 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
@@ -6,8 +6,6 @@ graphene-28:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
index b0c3fd3bbbe3174d0c0856436d5894c10cd9749f..69fa93c95a0e3f40ed524d42f3bc3e2ccc383dff 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
@@ -6,8 +6,6 @@ graphene-29:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
index 1ca7b745624a866c34d3356234c50e718d45671d..53a01bac1fef3bee657d931d9a4e40dba0118401 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
@@ -6,8 +6,6 @@ graphene-3:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
index 0b93fb68a77360c3bb5bce69c5fd66d205082eea..835fe3c5113e6e19d3bbb6f46d0b40e0a8ce67bc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
@@ -6,8 +6,6 @@ graphene-30:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
index 0df40ac17b02828bf9ca3e68bde257139b99c305..4dbdf31498b560170d76b42cc41a88a9a700e9de 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
@@ -6,8 +6,6 @@ graphene-31:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
index b4d4854a363b278b73be16c61b5a0d0c842354c0..0ba74f2c475d1d39d43d32ecef4e25eddb568de5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
@@ -6,8 +6,6 @@ graphene-32:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
index 0c6f8882ac0f3932f63f341dfaca9a0aa9ebe86d..a3dfe8518229415ddbcd2ab7d2b2f16ab116a0e0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
@@ -6,8 +6,6 @@ graphene-33:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
index 4b8df2f7658f9abf55c1e4558b12c5666f56622b..267098e175e77c5c82072aee12e0bbefca1f3b22 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
@@ -6,8 +6,6 @@ graphene-34:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
index ca3712f4baefa7680423a6d299c2673c05253344..9d5e8d6df2fa1dfec2f14f0375c3e2cb867898b7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
@@ -6,8 +6,6 @@ graphene-35:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
index 213c00d54429198ab37f952fd1cb88ebc2d02a9b..c4e22a94fbcb66cf61d343cacc85db188bb92376 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
@@ -6,8 +6,6 @@ graphene-36:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
index cd3d277bcc0626b5b756bdf7be3e1793774a24f3..cba665e790a888bd23ed62437fbbc663fdbde6e0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
@@ -6,8 +6,6 @@ graphene-37:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
index 4e83b35d947c335b758c10e8bc4c240838011f08..7bd1ed791261bbdc09315f63f5ab8d0a254562b6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
@@ -6,8 +6,6 @@ graphene-38:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
index a3c63f5dc3f573274ceecdbf9ea27f1c11a66c7e..68d438468fd60d797a93738a9b0fc44589dd0480 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
@@ -6,8 +6,6 @@ graphene-39:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
index 7bf229d6398098fea6f7389386bceaf26b81bcc1..ba11a35cbb1f83fa60c16366c70e6e71e50f115b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
@@ -6,8 +6,6 @@ graphene-4:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
index fde1714cb0d579c690f65ffd86708e169218a16a..db72a66dd0b00274f61a4050c805e2f494c9f428 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
@@ -6,8 +6,6 @@ graphene-40:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
index 19b3f60cc6c941adfb1074de9e9c9040d0a762bc..ca4854f7307b2272da3c2123b10b6a9d7df78b49 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
@@ -6,8 +6,6 @@ graphene-41:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
index a61c33c77238486f92e85e4fc8b5aae53d268215..6ff6f725d371323cfd533c5796110925aabde739 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
@@ -6,8 +6,6 @@ graphene-42:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
index 9ba612e660a135275118d9e41bcf6c81cafc77c3..21702ed3c61b86c76963b4c4eeb07b7b4bb186a0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
@@ -6,8 +6,6 @@ graphene-43:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
index cde53a1591de7de8acc96bbf7e2f3eec4f2206bf..4852f1ef26ec132af855567780157588f621e216 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
@@ -6,8 +6,6 @@ graphene-44:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
index 0c702689ece7bbdf7b1447da5d82e983f8d21497..c6cd4387bf5b443a29a726a661e20e8aceb58f29 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
@@ -6,8 +6,6 @@ graphene-45:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 01/06/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
index b455687d34a809da34048edbd94623cc3d2f4c10..afb5d24642c04b0d36875d0e8d8ca68305b2e37f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
@@ -6,8 +6,6 @@ graphene-46:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
index 245194ec9dc30e3782c7b4b3599f76cdc41f1356..2bd66205da0521568d7cef8254c929ac6b82d2e8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
@@ -6,8 +6,6 @@ graphene-47:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
index 0d8a7b6e068f3cb5e82e63546293b34f635c341c..e725f7b65d691e3190735602a1f6ca8446e0d8c6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
@@ -6,8 +6,6 @@ graphene-48:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
index 509b61960987b2337154e90b4a915dc0481862e8..35d9cccda8390f21612cc2ed179a4fc546d70e74 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
@@ -6,8 +6,6 @@ graphene-49:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
index f1b250d03412e1718a34f61acc500ca53032ae60..7f55d8c585d9a7ed9e0f24df64b756191a977e8f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
@@ -6,8 +6,6 @@ graphene-5:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
index 5323f08b311d2fa3882dcba92c86ec83edabfb00..50c7156fbdd0024c9065df51571de5825a734ca7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
@@ -6,8 +6,6 @@ graphene-50:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
index e419d53cd55e7c2567eff2ef99f3563e6f289172..e997b1f93fbab65929a2a0cedcbe898513c5cc2b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
@@ -6,8 +6,6 @@ graphene-51:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
index 50913edb8a21091e265267c2990286a8002dcfef..25c9dfaa3ff238c121d02fcdb890b552d42cafd0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
@@ -6,8 +6,6 @@ graphene-52:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
index ec7cc781df53bae7e84ccedf29bb0febcb4b7c3c..9426dfc9bac61889b66a6c04561e3e27b4a0fafc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
@@ -6,8 +6,6 @@ graphene-53:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
index 8e44c0147074a1011f3d0fb1dcadc851d5c50fee..82b2f71391e607e946127d2823f7d1cafde22d51 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
@@ -6,8 +6,6 @@ graphene-54:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
index 085319ca918157080a5c0c0efdc5b31004a16ce4..299ee68ec2429d8e890c7a43e85017c2526770b9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
@@ -6,8 +6,6 @@ graphene-55:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
index e3941d503da3290e01c480e0e49ff564d1e8278f..baf81133c455116cfaa2cbee677a94fa00ec8c77 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
@@ -6,8 +6,6 @@ graphene-56:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
index b81b72adc60ce2a497362ab0ba1c04558bf7bb4b..4285dfb0792bbea66ef8a9ae27159cb9f815916b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
@@ -6,8 +6,6 @@ graphene-57:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
index 0790f5d532554cb6d03d79f1dad0cd2265cf2c57..2962afde48db861c7e5b4c9773887d68524fad47 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
@@ -6,8 +6,6 @@ graphene-58:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
index f78840fa88be08dafffd87e37a40d12367fb9a67..78d160d5a73e94d610267de51ce1cf029ed8b441 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
@@ -6,8 +6,6 @@ graphene-59:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
index 3513f040da28adb0137797a7aa2c40bee5fd20dd..48d219acf96c667f67b58f681597855ebba02bdd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
@@ -6,8 +6,6 @@ graphene-6:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
index be6413f01816514f911511c3e37dd2c27e2d450b..bb86cc7a6aba7e036c6ce3834f548057d289d569 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
@@ -6,8 +6,6 @@ graphene-60:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
index 211b57205b635b51ba62b3563cfc89dbe1b9ff4c..0bca5018dfa4e514a54b3937e61fdfad903f0067 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
@@ -6,8 +6,6 @@ graphene-61:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
index 6dc368dd5b381ceafafb19d1ef3981a0501f6993..129c5a92d6ece352db96f7fa07a92a1e75ae1177 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
@@ -6,8 +6,6 @@ graphene-62:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
index e5dc4ff5e56cd1c8526357f8d99a89566e49d735..16698fa8a20cedc813f7a2ae1e2e622478b06764 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
@@ -6,8 +6,6 @@ graphene-63:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
index 765b04b4b2f75bba355e87e6bb7cab127a76d3df..7dbf798d1249ec8ea1966d78225aae5b1e26dab6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
@@ -6,8 +6,6 @@ graphene-64:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
index e6da37e270940f30e6a139199205a76c6ddb1de3..122514972866715785ed89002637183310e7f13b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
@@ -6,8 +6,6 @@ graphene-65:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
index 4339b4d972caf0e1e3908d3cc49a3f32ef1336da..6c4ab6f5b8a39e2a58dce094d41f6d1be16570d5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
@@ -6,8 +6,6 @@ graphene-66:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
index 7ae9283eaf874932d82bb6eac4a9148e1b702f74..e7684bdfa58deccb755ff995de86f08d4f56522e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
@@ -6,8 +6,6 @@ graphene-67:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
index be5980a92f4cdcb8a44d4990e85add6af3aec082..547495589f6ab2b087457df563729c9f1d168301 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
@@ -6,8 +6,6 @@ graphene-68:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
index 70542e2bd5abf6d9da619a6a78e794a3c0e07b77..55ee473a8297fbbb035356a8ab147d5e21945873 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
@@ -6,8 +6,6 @@ graphene-69:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
index 5353510ef179113f4f283bf261cb5c512bb51d33..d78192b1a6aba50045522541095135be67012aaf 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
@@ -6,8 +6,6 @@ graphene-7:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
index 0807bec51959466096aac65bf68278c5b3539450..db064355fca21184e36df93b8d31e90d5b02eddf 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
@@ -6,8 +6,6 @@ graphene-70:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
index 8040dd5e97c35aa4f70dc11f4969308947f40433..d799320050929cdb655a7ac95f08d18f4e4dfd9c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
@@ -6,8 +6,6 @@ graphene-71:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
index 2257c32d1252c1de9eaabfd05ffc16d746f8f9f4..19adb90213059b7c7eecc37a04b07246eca7863f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
@@ -6,8 +6,6 @@ graphene-72:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
index 3b7d09125622447bda4c42cfd2fec0f96ff7fde2..05a3de15c9e686f1f468ed03df07a3f1b13174f0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
@@ -6,8 +6,6 @@ graphene-73:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
index 91ba6dbf6757140d15a49275cabe400d4d13ce54..d6cdebb43e1417184330961768063ae5ccf4e6ad 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
@@ -6,8 +6,6 @@ graphene-74:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
index c5c014ea741f0c0fe217c6dcabb4d7942f0ca523..479ebd270e9b6b3bfcdb88d491e71dd6c7b75d9e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
@@ -6,8 +6,6 @@ graphene-75:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
index 6b0520287eec0c6a67dff82dc254a2c0ae6c909b..6c6f40241e80788cf417d6c8028f6c3f3d829803 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
@@ -6,8 +6,6 @@ graphene-76:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
index 8e657705310c12099315855e8e6f3b875a543038..e7837639b080b12a3791448f311231fcc66b8f91 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
@@ -6,8 +6,6 @@ graphene-77:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
index 70d12fb9aa72a530749013aa03d0a452cf7beee2..81269907395502c59c7bf0a3678c62ba58763684 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
@@ -6,8 +6,6 @@ graphene-78:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
index b129a6cf448b732d2c31b4887f23c9463032fbf6..fc22d2230e85bc57b16b8c4ab5bf0fc8ae8cef6c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
@@ -6,8 +6,6 @@ graphene-79:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
index 25a0f44af98d0506d464255b9af2dc290ffc81c3..092825c999644dc185af22b192c431b0c1583b96 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
@@ -6,8 +6,6 @@ graphene-8:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
index 79dd44c90329aebf34e1705a0c65cd114e86e5f2..2bbf9a2e7f39ce1beac4ea920807b8902e23e8bc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
@@ -6,8 +6,6 @@ graphene-80:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
index fe42e9764bfb957700b515687cf3ac98a8782f09..1cb17137e0fe69b86c941adbcd8a8fd32b524844 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
@@ -6,8 +6,6 @@ graphene-81:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
index 5110f706236aff3bcca94632d57fe7de8c6e1b4d..f869f0f472dfb543920c0ae03241dc19b50965ac 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
@@ -6,8 +6,6 @@ graphene-82:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
index f202ceba1ae816e54ba8e459ddc9e816e32a6aaf..370e63c85b8b3062cf3c73ee53d8af79e2577978 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
@@ -6,8 +6,6 @@ graphene-83:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
index c92a2d66bd3008811b4a43e882d922f0c43dd805..d6708d9694b52f15bb255d4edf4730ee62543ebb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
@@ -6,8 +6,6 @@ graphene-84:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
index daf8a5d84b516ae4080fbe08a39a832374fbd01c..5c0e98bffd75f1f903266cc2a06324ccdd4c8718 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
@@ -6,8 +6,6 @@ graphene-85:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
index 38e0a9ce2f075cc5d9fa0cbf735d0fc8d86b7af7..7f1118b09c5cdd551ab12d1f990ebfc954177bbc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
@@ -6,8 +6,6 @@ graphene-86:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/10/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
index 77d9e02e6c33961d401e9ced0c22794653580ab8..f09cbd9e0cdb603c7d270dd7986dd57464fa4429 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
@@ -6,8 +6,6 @@ graphene-87:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
index e9a717e043b96bc4b3b23db12287722836518d31..55ebdbd6d9aef0c76729da08734a0742eb4dc36b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
@@ -6,8 +6,6 @@ graphene-88:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
index aa46eb359d5b0f625a94355f40c7d623c83e0318..a3473185551e7bfed0935f37acf30a624089c3fc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
@@ -6,8 +6,6 @@ graphene-89:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
index d1f659a396481e1610a7b82c5c3e6b349e7cc565..46a133db83d24a3ffc6267ae6eebbe9b1472072d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
@@ -6,8 +6,6 @@ graphene-9:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
index bebec615b74c92cac782088e92fe14c8f9b39c4e..f82f1b47e63bbb634772eb463758aacafc1abf6b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
@@ -6,8 +6,6 @@ graphene-90:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
index 6d9671916fb07cd0d2b4bf27135507fd635743ac..5dfb01149dd747e4c84a221b4be10a2259f01f9e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
@@ -6,8 +6,6 @@ graphene-91:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
index eebd680a00de46c352716ba860ba6d4ce07311ba..4c784a18011fa1d67a92a4801e765b2c912799e6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
@@ -6,8 +6,6 @@ graphene-92:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
index 742efc9ff750524709f2a51f46f54551ba812f4e..402089805e6f298f8d1ee01a0df837d0c9b719ad 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
@@ -6,8 +6,6 @@ graphene-93:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
index 83d6d7c62b522d62781d16d3c22042ba5d125435..73337d64273af29636dcfececf00c0caf3cce7bb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
@@ -6,8 +6,6 @@ graphene-94:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
index 4035a257b12fe357ab28b1be05873bed434c5c63..f1e0475f4931e0e86c10d5f7297925d8af9d511b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
@@ -6,8 +6,6 @@ graphene-95:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
index 1e8a37da051c221c49fe92080fb35a684b6146b5..5959c22ec13463e9210586194f612bbdc8e4a9cc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
@@ -6,8 +6,6 @@ graphene-96:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
index 575f109a3470c3ac6632e757e2d4a8a17a83edd6..876522ec8ce7d70e6e3504327f18b61229e1edde 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
@@ -6,8 +6,6 @@ graphene-97:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
index 684b48163ba36414a8fa5d15476cd3a97b0ac6ff..fa12493d1b684f826ac8af538b9b2ffdf1520269 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
@@ -6,8 +6,6 @@ graphene-98:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
index 89d8bf48ecd614d85f3613516b6651f6e2ff27f0..81212ea257bc370a9a3c8bc2ad3d842f2bfcfd43 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
@@ -6,8 +6,6 @@ graphene-99:
     nb_procs: 1
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 1
-    smt_size: 4
   bios:
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 0d795020b74a5d4ca357136258f70f5aa629bf3d..7a3484c141f2ac2069a7edf7fd61da3aead0c487 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -4,15 +4,13 @@ graphique-1:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphique-1:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index ce599d03b17360786181fc2db7a514633a0eb84a..934d2aad2bda81cc5473f4262bc8428f080412d2 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -4,15 +4,13 @@ graphique-2:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphique-2:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
index 384bc3b5d5ebde15daf2609f8c1b5103b6f68bdb..ad07ac162f58e368d7f4f1b12ac51a323b048c9d 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -4,15 +4,13 @@ graphique-3:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphique-3:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
index 2dc475a00af138e89e8b3662ffe153287e0c84b7..8324d4ac1c1396eaa3ed7b8995a8992ae8497f47 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -4,15 +4,13 @@ graphique-4:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphique-4:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index fa57c094c9d2f5851d1372dc32520f9fcf5f3d4b..7818c1a27245f4c0d512074698c047ec8dfa4fad 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -4,15 +4,13 @@ graphique-5:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -77,6 +75,7 @@ graphique-5:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
index 5c6e8c7ed8b6f86fe2fb391a477dd7e3e53f1c01..b16b9265c58d4ed2be082b22424c976866baf627 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -4,15 +4,13 @@ graphique-6:
   architecture:
     nb_cores: 12
     nb_procs: 2
-    nb_threads: 12
+    nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -71,6 +69,7 @@ graphique-6:
     cache_l2: 262144
     cache_l3: 15728640
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 1e7bba6e18421e865c7f6f96ea982df94f939a5d..75a790cfaed031d8a3b9cfe19c64907e6f5853c4 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -4,15 +4,13 @@ graphite-1:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: false
     release_date: 01/28/2015
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphite-1:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index 647c8009faebfcf7cf62fe0d3880a36d88d8e80f..2a15866ac82dc6bb274064bd0d9bc11bb81f11fd 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -4,15 +4,13 @@ graphite-2:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 01/28/2015
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphite-2:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index 3e000d69e1bfcea0b000ed1995610e0e45c61ca0..e953f72e71be63cd0b36379f925cd1a5efa5b376 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -4,15 +4,13 @@ graphite-3:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: false
     release_date: 01/28/2015
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphite-3:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index e7c2dfa353688e0639b563b363824ff56ad4d4b6..ed817085aa411f01f1fc2a6727188cb9db38f69a 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -4,15 +4,13 @@ graphite-4:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: false
     release_date: 01/28/2015
     vendor: Dell Inc.
@@ -81,6 +79,7 @@ graphite-4:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
index 4ddbe02eea32686be55e84931dceef539558ff4b..94ec4677956457320ad914a4e9091cac6b409c78 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
@@ -6,8 +6,6 @@ griffon-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
index 2b5904b486e25c7fb7a337399779a6a7376060cf..04f13cd5cab3ac6fd559ce08bbf778f14cf6c33d 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
@@ -6,8 +6,6 @@ griffon-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
index 34bf8d84944c2b55008fbf6a58ddca3ca1b9c057..16269fa1e4e142de30832778207fd0d108a435e9 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
@@ -6,8 +6,6 @@ griffon-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
index d81f4b4f9c03f9ea3bf1ab179c6515026155358f..8d89510bd65c4e5c44d2c8f41f15a0aeab1d85f1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
@@ -6,8 +6,6 @@ griffon-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
index b2cb2bdda1a5162e56d2c67d2d04c4a02abe06bb..55a00bd2912f3f7e67d36d7ebfdc0be475cb1087 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
@@ -6,8 +6,6 @@ griffon-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
index 580d42491ba1d5eff6cb89f7ba3be62bb994d0b2..851c34b46c7cb67cbe90a3a6e1e82941c2be71a8 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
@@ -6,8 +6,6 @@ griffon-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
index 39146d1289a81724cb8924470141175796759cc7..9540b842b3d6bf12da194d244bc804a7613d127a 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
@@ -6,8 +6,6 @@ griffon-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
index 253e3f167c8163f08e5ae23c750219af8e126877..d1b2ea6cee0ad488a852e57a0db2f02af2b04123 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
@@ -6,8 +6,6 @@ griffon-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
index 3d0020fb5eb1e803595619f7c0df5036d21cae1b..ca6b273e8054d0a6d5804b3bea4c1bc7280cf365 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
@@ -6,8 +6,6 @@ griffon-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
index 544f351f3518d4b0436f6df93c682e928dfc2fc8..0bd64b4e2a9892a7727a208069854d97d2815fd8 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
@@ -6,8 +6,6 @@ griffon-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
index aa302ea082941d3f9006283b01d2cba20f84d61b..86860812164c5534d3512e34cf5fdb16f246c5bc 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
@@ -6,8 +6,6 @@ griffon-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
index 4a0f3ec90f65f7261574e829f8ed4b4f39213e2f..946e05a498aef7f53798e998bd386a7b8c2b2734 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
@@ -6,8 +6,6 @@ griffon-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
index d58354ee68c5ba9e30dc5a8a4b487c0240d735cd..d81335bd830a21d00ff93972af795a3bec965e0b 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
@@ -6,8 +6,6 @@ griffon-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
index 78277014c10a19587c41ab103172632c962ee6de..3fa85dc6fc171841348f65698770aa7b12973c08 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
@@ -6,8 +6,6 @@ griffon-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
index 339aeca5dd9a44898ce122d011930ebb467c17f3..b40d1c8a727d08994fdb4175746754785e8f6646 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
@@ -6,8 +6,6 @@ griffon-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
index 62cff86c4a7bfdeb3b587436512072ef2a67ab75..08fbeeb391cb54e063777caabc9d5a2a863ab913 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
@@ -6,8 +6,6 @@ griffon-23:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
index 55e3531c0d55c7d2498691c029b80a46a8346e05..82302475eb302ead605c41debd2c11ed008530f2 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
@@ -6,8 +6,6 @@ griffon-24:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
index 7e5db4df71c3014375bdc3d811e2008d49df0cf0..c9cce9c60507d487853a36248fbe08219a60143f 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
@@ -6,8 +6,6 @@ griffon-25:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
index 10c33c0577dc08a82bab23fe8fd0b4d992ac12e3..0ae258554597653884a590ce59657d8433615b46 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
@@ -6,8 +6,6 @@ griffon-26:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
index 738d28396ed4955e7d8c329620272b5c01c5170f..242734df9631a83b96dbd9c9810736ee2e45a57b 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
@@ -6,8 +6,6 @@ griffon-27:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
index cd49eb01e3d7f779a4e8e5c35c2c22e1832f3dfe..105e9db6a464c90af20ab872e389e2a4a81e4ce5 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
@@ -6,8 +6,6 @@ griffon-28:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
index e90b60299e785013838280975275850a240fe653..41c32ab05c0802c0f5b990719d0d84f0799af775 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
@@ -6,8 +6,6 @@ griffon-29:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
index c2cc5ddd82fabe6772a5935c47aee804f6518fec..12459f69ed0928c12ac92e8a79ee655eeb326b7d 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
@@ -6,8 +6,6 @@ griffon-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
index 04fb90836a2028addd95c72f71319961ac33599f..513b988affbd9ef85752a53110bead07ab2bcde7 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
@@ -6,8 +6,6 @@ griffon-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
index 7e61c1ebe7c68619bc9122d41d0cdce954690c59..566e199cacf990bfe83468ac332a1fc420282410 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
@@ -6,8 +6,6 @@ griffon-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
index 47487c265411efb46a4f3bb37cb849134438deea..5588cdd9718fa2e4f89539704ac011abae3e5da8 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
@@ -6,8 +6,6 @@ griffon-58:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
index d233c3b043854364fee120d94d13cd5bc4500111..39a3e46081dd10eb78e3e19147b8a74d30b947aa 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
@@ -6,8 +6,6 @@ griffon-59:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
index 9d5cd84d5c2e23d2ae53bc14688f346ee9ff5367..06299c65f96dc5cee61b2ea3c76c33a43ddf5e1e 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
@@ -6,8 +6,6 @@ griffon-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
index 3e0868549db73fb900ead57bcc202b0c9e4d6522..da3db9ea366a1865e73b404b0652cbcb3dabd8da 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
@@ -6,8 +6,6 @@ griffon-60:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
index 6fdf70862bfa5e34444864e603f3fdde56052199..bee11739435aaaa9f28529fa4a7afca5e6150bfa 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
@@ -6,8 +6,6 @@ griffon-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
index cae00e09a27475cc343a3f316c6abaf4810e726c..3f392d071a7348595aac3fd00ffb64da6798b9a8 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
@@ -6,8 +6,6 @@ griffon-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
index 6c6459e0421bde3204fe2d2c9bbd8239394a4153..20adcb1799b9decea2fb3c2c61a8c03044ab093f 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
@@ -6,8 +6,6 @@ griffon-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index b4a26ed21e5eae75716711e306cfa0c7d4f441c8..5a3c60db2f080b3351b7091eb11fedc0cfade95f 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -4,15 +4,13 @@ grimoire-1:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 05/19/2016
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grimoire-1:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index 5e84d62a75edaf739f4beff091a742133ad66edf..78c134c8fa783683598b61e51c5bc6a4a8f782cc 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -4,15 +4,13 @@ grimoire-2:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -89,6 +87,7 @@ grimoire-2:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index 911324b79c84bb09bbf1a58442a71d10bd6a50af..617b0fb0bb489f51e5d898ef95ad36766a68b0a8 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -4,15 +4,13 @@ grimoire-3:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 05/19/2016
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grimoire-3:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index 343ae647bd00b93875f0e211b593496d109afb1e..915c48df45b2e8e7c0faa9b9bc474a1f98c9f4f1 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -4,15 +4,13 @@ grimoire-4:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 03/15/2016
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grimoire-4:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index 5f52a7c278d00de3f44c8ec37113103e78ebc59c..56eedd78ec422ec0a27d853c37fefcf6fa3a8658 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -4,15 +4,13 @@ grimoire-5:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grimoire-5:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index 9f2faf69326616db63d7b0412821ebdd0d706813..4b8f30e695a8084471438b23e60fd85df43a9227 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -4,15 +4,13 @@ grimoire-6:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grimoire-6:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index cf9ef791e90d130eec71f47872d236978f595b7d..c9603cf7e6d474fb9e0c356398ef8d217093d331 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -4,15 +4,13 @@ grimoire-7:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 03/15/2016
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grimoire-7:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index 089f8bb9e4cfe7b9d4e57642daf6b6314452e4d0..228cae643f7f32eb68ea11cc290053c856400089 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -4,15 +4,13 @@ grimoire-8:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grimoire-8:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index b0278078fd0d23cc627fc717bdbcbda910b09898..0e563789a4cff5e002ff0aec3f8d50cb696d8f0a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -4,15 +4,13 @@ grisou-1:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-1:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index 874884eb0300b0594f13373d15223a24f0d0604f..8ca30033aa311c59744527fa39767c9d9468ace3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -4,15 +4,13 @@ grisou-10:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-10:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index 80f23a065913314a1e2ba16f2a21e7c1cb580abb..c454fc47a9bae1a886e00574f45aa407c2831bd7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -4,15 +4,13 @@ grisou-11:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-11:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index b9c9f929f012af9dcc0dfb6ecf8e88da9274bf7b..a866074fb2608ac3b49c7474a8f153c5572051c3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -4,15 +4,13 @@ grisou-12:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -79,6 +77,7 @@ grisou-12:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index a48f40a437dda16b2ed8d808b9a03bf152a3fad7..ece9a62334b41427d72c0cb5aabaf351fa3aef10 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -4,15 +4,13 @@ grisou-13:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-13:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index f1e454562de28dd2c87a482980a5606ef19e2d0d..51bcf889adbd5116c5e7713288d270008a8704b4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -4,15 +4,13 @@ grisou-14:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-14:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index c325af858c0e162cb4e46b1b5ec1292394c0f5bc..e3abd185fa75b5bacfe3d4ac6ab7fc43df84e924 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -4,15 +4,13 @@ grisou-15:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-15:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index de9eff017b4d6323af277aabe5a170c7e7a4753c..b5fb19adc107f4b30be5c2a23054fc5a59f05564 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -4,15 +4,13 @@ grisou-16:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-16:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index 12cf3fd505e6b1e22f37c4c989c702924648423d..12f0a79cdd54ff150b75dbfc3cbeb64ccbbebb5d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -4,15 +4,13 @@ grisou-17:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-17:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index e8107d5dbbf68617436e0479b7f1e340945851e9..f68f4d5c44a1017fbec7257c94e9ee88bb392c05 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -4,15 +4,13 @@ grisou-18:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-18:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index b22ac5548405c1feb4819093cfa139f47eba52d4..09b6a0c8f09d8a070bc5faf81d8d8c04cbfcb93f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -4,15 +4,13 @@ grisou-19:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-19:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index 00ea620553fbfb55271a1acd214e87110cbe1872..4e295244c132f05ab997bb6eef8b3b030d9dc4af 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -4,15 +4,13 @@ grisou-2:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -79,6 +77,7 @@ grisou-2:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index 104866f38c6377c7eaeef6ab87c4e254dd8f34d4..75f507ef3b7f1918323610d83d9138fbd963b665 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -4,15 +4,13 @@ grisou-20:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -79,6 +77,7 @@ grisou-20:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index a308e0506129bac20fc77a1a0ef15e4f4b8a3ae7..aff736281b5eac912fd3a0cddc832a30458aab81 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -4,15 +4,13 @@ grisou-21:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-21:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index 44a6cc247d6db755e8857f772a3d27c82fb9ca1c..432d3e10a9a9084c7c223b27758ab0d3a802ac00 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -4,15 +4,13 @@ grisou-22:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-22:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index 66687b701705791ec58653683ce387ae9c013cd4..ce88a3623f02e7bdf0ece20871e1516d538d71f9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -4,15 +4,13 @@ grisou-23:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-23:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index 10cd9b371f7e42999cadbbc2d2bf0795e928077b..2fbad7ca7eb8a14c8cb42c9da58e143477cabc3c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -4,15 +4,13 @@ grisou-24:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-24:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index e7a6a53dc4b210d7e8dcc506322e36c0accee571..e68dc5001cee8f938245c69cdeeb0e78ce04ec04 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -4,15 +4,13 @@ grisou-25:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-25:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index ffeb263037de5d77c6d6fd51937bd00ca8aaf26f..15ebe53d6328e08b8c537e6f65b0d0c4bfe68fca 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -4,15 +4,13 @@ grisou-26:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -79,6 +77,7 @@ grisou-26:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index 98549a3f73544e22d385031c8fa4094e5fc24db8..c0373a00613e2631314cc9be8a9946532d904553 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -4,15 +4,13 @@ grisou-27:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -79,6 +77,7 @@ grisou-27:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index 09a6ff7749161cd27ceb1816ef82ed1b79e5ba0f..f108d8e5b2ed4ec08ec8ad1ad2083cf92091ff18 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -4,15 +4,13 @@ grisou-28:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-28:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index d43d8ccd2d3e4a9bfde3748579558749fc1f51ed..ce7413a6d55d3a5b18dc1ec59e6b1c555e0153a6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -4,15 +4,13 @@ grisou-29:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-29:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index 6823e3078e38ff53764085d0d3e8ce0952310f18..406da8e638ddde0def47e39d231cc93420ca9326 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -4,15 +4,13 @@ grisou-3:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-3:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index 5024a5b1846225f92b2bc50152bc6e13d43fb68a..675b4f26f00dfc4ceaaa559b006cd8e54ebe2b71 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -4,15 +4,13 @@ grisou-30:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-30:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index 0a55512d733a662cdcc808f3283ff9fca26addb0..773719e7fffe09f609909c04d111efc02fe7ce2b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -4,15 +4,13 @@ grisou-31:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-31:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index cb70051b74ba1c17235d22d4c8adb5c21c7ea5cf..a24587708e489a21dfbe64eed55c4733c8ce838f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -4,15 +4,13 @@ grisou-32:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-32:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index 02606a1d0fe56e7e6e3a5157bf2ff6f321dd861b..8d7fe5b615551069cc24b17ecc94ed76ac251537 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -4,15 +4,13 @@ grisou-33:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-33:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index 6666b4d6275a830e6fafdcf37f4976d692e047e7..9e82d0cb36c3685af09234cf9643630c7de1d2de 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -4,15 +4,13 @@ grisou-34:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-34:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index 3c56995cc481f7e8ab7e93c99dac6423f41820c4..305044ca4df77895a10389b39825ea6a7d41e78b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -4,15 +4,13 @@ grisou-35:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-35:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index a36f816345c70aa4ebf501096e33c742f1d8eaf9..ed631be015f39f24b981ab54b29d8accb37768f8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -4,15 +4,13 @@ grisou-36:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-36:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index 215b438ed3ff01b6ccdc0de26b44ad08fcb6f8f4..86999d5699dd8fdc977200b2f9ae45d8bd0be3da 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -4,15 +4,13 @@ grisou-37:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-37:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index 869fa4a450880092d0091c3bd25d2a8aa9d0d5f0..d6f4b81ea580ec821e85c7fef6987145220b44ed 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -4,15 +4,13 @@ grisou-38:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-38:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 05eb3a391728ff029d98506bc6ca9388cc6072f1..d46182c6272b1deb4203d43f720ac315145b4bbe 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -4,15 +4,13 @@ grisou-39:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-39:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index dfe1c4e3444f90d12b3bfc06a098dd472492e348..11ae367dabb6eed769dd09a6f8de55113289d6fa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -4,15 +4,13 @@ grisou-4:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-4:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index 4a0afd2012dba2db959d66db98dfc7f70de5dae4..4d74bb13e4e5b9afb6c237d054bb2c591807a7ec 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -4,15 +4,13 @@ grisou-40:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-40:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index 49657e22df23d490903e739ce48d937b7e0c0986..90b249238cb84b0c5aba42472bd27672152b4e4c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -4,15 +4,13 @@ grisou-41:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -79,6 +77,7 @@ grisou-41:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index f95bedbf739524baf781a467fcc462bf1f077c85..9b0dfa11b2e76aab16c40ca91c8c38dbc56185ff 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -4,15 +4,13 @@ grisou-42:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-42:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 7372b70048b6662c08d4fb14d537f512ecaa1ad0..be29b95d1c6dbe87563f9cc9505942aaf09544c6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -4,15 +4,13 @@ grisou-43:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-43:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index 9e5fb5e0cdd4ee85db4b4674a1ee2d21c9afd747..38a02a8e2a98adc217a39b3a0e455d0f749cfd59 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -4,15 +4,13 @@ grisou-44:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-44:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index eaf1cac532e431f1fe8acd1b6dee716bdce044e5..c63dc6260044ab73c5201257911d203d952afb00 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -4,15 +4,13 @@ grisou-45:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-45:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index e266c636dcc51a6f1a2e8f1bdd964bb8d1f18188..f2446e7c3bd1f5dc34efacce2a70db077f967f83 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -4,15 +4,13 @@ grisou-46:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-46:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index 2cd55259c49d790bc0283463e1ce260097972773..a5df44a9a4abf3eba1354671aad87392841c1990 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -4,15 +4,13 @@ grisou-47:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-47:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index 938b1c8241b0a0e6274949670c7cb5f9823efc68..28094f7d2537ea2a66aac3c8e748d057d52ee3c6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -4,15 +4,13 @@ grisou-48:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-48:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index 5c08144f543f33ce78b1c00dd5a66c12cdfd9919..b1176bb0159fbebf4f51e3285e25c8a63cbe788c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -4,15 +4,13 @@ grisou-49:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-49:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index 379094f83f68f963aeecada4f9e414b9413a88de..de47d86846bc1462af3729d93c57bdca796347b0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -4,15 +4,13 @@ grisou-5:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-5:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index 64e7e7ee0dff43327f947361f4c90955fee4d3d7..d5e523e960a24290955982fc3cda08f66fd2a874 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -4,15 +4,13 @@ grisou-50:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grisou-50:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index ba65582d0e506af279465df623043595b2544c4b..ff3d2a9ba1e1a66108b694e82ac88dab62001816 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -4,15 +4,13 @@ grisou-51:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -93,6 +91,7 @@ grisou-51:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index dae2d498b4120c830218dec9fb18d4de29265682..e37e0ccad734cde497fb247ab50d0fe7b187f258 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -4,15 +4,13 @@ grisou-6:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -79,6 +77,7 @@ grisou-6:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index f6601b97a8aee82f352ffa1c4ade7618dc00d356..a711b0af04ebf501540f6d73430ef3afd8357ab7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -4,15 +4,13 @@ grisou-7:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-7:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index fc250d82ae2fd2d12a255b06a451bb9cf7b8a666..75ad93c57be072e2c7c0bc2ac6921514e716dc9a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -4,15 +4,13 @@ grisou-8:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 03/15/2016
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-8:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index c2ce44b702d9cf558f0496fc699eca4b5d55031d..b646ca2d7ad9eef751eff92ad3dcabb05ce48060 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -4,15 +4,13 @@ grisou-9:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 06/03/2015
     vendor: Dell Inc.
@@ -83,6 +81,7 @@ grisou-9:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
index e07cebb84944ff488ad2639605c19c4bbd228293..7ed783e8615bbc06c9047b1cb2234e3325d4a734 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
@@ -6,8 +6,6 @@ talc-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
index 0a33c5dec39986018ee97f40ce1680672b72eda0..539ceececb2ec49d46978f8ab8349d0864fce408 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
@@ -6,8 +6,6 @@ talc-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
index 7bad565603c9a0a5a7deeff64fd8f79fce0d6c94..79fa5059e4fd47a79a2461d5550229427afc5ea9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
@@ -6,8 +6,6 @@ talc-100:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
index 6874b41d0dd6e3f12d0aac3602ac8b9257fc0007..9206f8491e73791e1abbbde346d0cb0699ddf8e7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
@@ -6,8 +6,6 @@ talc-101:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
index 24c2f1559ccfe6d3ba0fc6a53c163fcd17b86d31..734f4d51fa0a7cf1e06480e3b9b50cc6535d57ab 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
@@ -6,8 +6,6 @@ talc-102:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
index f1dedfe7eb9f637b98f5718dd63d8ecdb435a047..6e1459aed238ea63a5e9edce4f00715c511cacf4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
@@ -6,8 +6,6 @@ talc-103:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
index 11f721d67157b35461a333fa481f617606a0de9d..5a2641247f9b4a1685cc821607080b44239d1641 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
@@ -6,8 +6,6 @@ talc-104:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
index 8d11583b68c1df916ec2d1b0ac06fcefb7f2ba0d..e42de75f7f4df668e844d3ae22e9cd83d7898f76 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
@@ -6,8 +6,6 @@ talc-105:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
index fc0549d570f50488280bd587910fa17e940bca67..c2a1aa5ed1e67ab277a53dbdf9a26791f75578b4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
@@ -6,8 +6,6 @@ talc-106:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/24/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
index fe2b32958a161a0385a666aa5f3195e366114984..33f1c2febf9d75a63ef3b464767b84f54d99da87 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
@@ -6,8 +6,6 @@ talc-107:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
index 7d817b7a2789b99273250a92735af4973839cba0..237233b35be7973a98e8542afd93438471737faf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
@@ -6,8 +6,6 @@ talc-108:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
index 47223cb23fce89142ad4b51ecc64993b3233b794..0c9877aad551ff125e3070f943e663b30e48d750 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
@@ -6,8 +6,6 @@ talc-109:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
index 265a13414deff618d37a3449911575aeb8c0179f..be0e0d617781b552dcee8feb96f12b8f787632a4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
@@ -6,8 +6,6 @@ talc-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
index 45676aa86d4a574bd1da481542c0063825a29587..4c33d322182c13b8273a953c47c93afb438d0f51 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
@@ -6,8 +6,6 @@ talc-110:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
index b5a78d75ee27634a5264b03b31ff69407f1439b1..c4eceda00fe949c1d36ba7c71c57eaa991d4932f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
@@ -6,8 +6,6 @@ talc-111:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
index c4d87b3e80a49fbd098321b8bec971a5b57ee6c1..e522bc0f56eb4a89a6c6c6cf44691dd3be6aaf25 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
@@ -6,8 +6,6 @@ talc-112:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
index d34b72fbd700fe0605493565105ab067b5353a4f..f330ba33ed037de9fa56175ff51c3b669125d000 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
@@ -6,8 +6,6 @@ talc-113:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
index 330e4bb7a063b26b93c5359228f3c60294f7d310..45bb9555e55aa00354099c9d25cedbe357bf2ef2 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
@@ -6,8 +6,6 @@ talc-114:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
index e5352335a8cf1267d073261bcc746f63b26e4888..d6d118527e1c51df21e31777fca637db4617668a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
@@ -6,8 +6,6 @@ talc-115:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
index b67d79012b720a6164597439990f623f9a9ad893..6996a15fff673c0bbd3318ac25768f25b70071c4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
@@ -6,8 +6,6 @@ talc-116:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
index b401f2c1ac337d7458f2bee578b973a3deb3417c..3a73116b110ac2a39a14a740b607247efde78dd7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
@@ -6,8 +6,6 @@ talc-117:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
index 207b6d29b17c111fdc6e7ff8afb4f020c361fc8f..9e602342b8f36b45b338262d8c06945161dc8b50 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
@@ -6,8 +6,6 @@ talc-118:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
index 6bcaf6b9bea10bd1f3ab893714ba47062caee351..0b6014e97f755313715aa6877d0eda85826709e6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
@@ -6,8 +6,6 @@ talc-119:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
index 85353b76e77ffb13f78229b8be711560ae3b06ff..714fe5a60661745c5ceedecc063103f267bed419 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
@@ -6,8 +6,6 @@ talc-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
index 25872f8bbc95c8c80f682be42343eb1b818af4b7..6d4dd472774903e69571eca353c9d90adf27f4cb 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
@@ -6,8 +6,6 @@ talc-120:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
index 085a07e53b94b6d5a2e7e1a9023bf6f88f3cfc49..7aa7eb5f3cda673e703e8096a7e3250c4b5a5d00 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
@@ -6,8 +6,6 @@ talc-121:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
index b311f104784ffed1e52c87b3cf8da089121827cd..7f93f9c1b56792f8dfee7c281696d2ef1a9417da 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
@@ -6,8 +6,6 @@ talc-122:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
index 10f7ed4382e9b31147245a1739324a185811624f..6426937e2810b2ac279ba950c6cdff49a2188d1b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
@@ -6,8 +6,6 @@ talc-123:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
index e49bb673349936b280c8b2a98d4dd483730c45d8..8118758e80ad229eeb9d484efc4de14d597150d3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
@@ -6,8 +6,6 @@ talc-124:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
index 863d79acc14ab026de4d1c44c02daead862d56d8..621bac6c38f205cc64c6039d4f6262a7226d7f2c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
@@ -6,8 +6,6 @@ talc-125:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
index f884b19413ede01a12e88e6ad2e45987d47a7f71..4b54594d9bda6f1e3a36a7846b7a687f42ee047e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
@@ -6,8 +6,6 @@ talc-126:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
index fee32b26a5a2e1334034e451829519cd20aaaf0f..1ae2673c517c531ca6a1bb043168d22c5a4225c3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
@@ -6,8 +6,6 @@ talc-127:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
index ae1c14f7cbac4ede4a1958165cb5d67d038ffe07..4e8b425887ed2d49f99e5b1b71ddd487c1162732 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
@@ -6,8 +6,6 @@ talc-128:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
index bacb3a1f8d8c3c2f697ae2f04667e652672df2c4..fc9e39324265f2637562cd9803b9fabe5b70466c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
@@ -6,8 +6,6 @@ talc-129:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
index 3cef7d5e9ff4d7d75fba4bbc4938f46cc1d61db2..d2f66113889b19d6360d3420c12d309a9d18418b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
@@ -6,8 +6,6 @@ talc-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
index f79c0d96a738e97856e5c441795907d0258c4ef8..1af17606e04835f416b10b209329188889b0d47d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
@@ -6,8 +6,6 @@ talc-130:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
index 2f760045cfab126d7e5a8c2ca43500b6b8d93cac..0c3f6037fe3eedc6cc22f1d9b5e09986a578b3de 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
@@ -6,8 +6,6 @@ talc-131:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
index 7a33a0616236d4cf9721702acbb10ae6b9b9cbfa..ee08297a7a7c7a543d61cd2920079387a25a0cf0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
@@ -6,8 +6,6 @@ talc-132:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
index 2c90e34abec160a1ee17fdbc3798baeac3f43a11..6b628c37216507d2c652c3d556a71fb985ef383f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
@@ -6,8 +6,6 @@ talc-133:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
index 3ece7ce961782070aee92837eaa1cde6bc30e862..2ed90540e50a347c237fcdb943d9e1a1ce29897d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
@@ -6,8 +6,6 @@ talc-134:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
index 2308b435531aab51b7c68453ee36ce5b7c83e961..6c02eecf37cde71cf5fc2931cf91871fd5a1b611 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
@@ -6,8 +6,6 @@ talc-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
index 484fed5b6dcc2d6822bc9ce865db5d6c4dd79412..462ebf8eb629ecce8e37d35fef1abaa87473ea78 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
@@ -6,8 +6,6 @@ talc-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/24/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
index 9cacadcdd3b003287f2c4a93547aaea194a0c7dd..7f6764d34a92b4bd309812475e2b5d2b94c07822 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
@@ -6,8 +6,6 @@ talc-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
index 367b8a0f7bf9e275d71763b9e5ddee677f1af631..b6744fe3653bb31d93630a01e7dead92c26c1936 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
@@ -6,8 +6,6 @@ talc-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
index 565f4e3feb28edde734c1bdadf8960dd5c75a124..58be0c0e46a0f3f02b84eeedffadfbd97168f5c9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
@@ -6,8 +6,6 @@ talc-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
index b6fa1881ff8478f15eb6af418e8fb50fe6302c73..e1c20a7df280740f5003e415034394905445a7c9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
@@ -6,8 +6,6 @@ talc-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
index 65db6b5b9e5be66a79f53b76108b73d93afb3d5f..7b00baf65737e90bccee287bd1d88f6f7f784f96 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
@@ -6,8 +6,6 @@ talc-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
index aff450f7d7d2a902eb2fd9585b92c00c1fc89e1a..578e449918910211543b5d835c68d4e360b5f5fb 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
@@ -6,8 +6,6 @@ talc-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
index 9e7d3b9817d2e3a79601a21f4f4aa18503b1cd6e..1535d5cbb883d02d110b5388d197a0ab7a071c6e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
@@ -6,8 +6,6 @@ talc-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
index 2f7c73f4586f5c8391b5596f0ef0d2ca5be29c5e..f5c563b858330802360b53d7ec59c62c910ef39e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
@@ -6,8 +6,6 @@ talc-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
index 3dbc8119911131bdb30642f6bf5113b2de0aa6d1..6ef0fa11a22b5b7c9a01798d500d36dd2de608df 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
@@ -6,8 +6,6 @@ talc-23:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
index 2df616582be0424c76dde11c8f51565db4941db9..cf04c843406948a875aec815eec7f5c97659d4d1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
@@ -6,8 +6,6 @@ talc-24:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
index 816c854a3584d3e42293fb026ada9e8cf9a28dbb..fa4d2ad1722f7cd948c6c3b6e5afe22e74691eda 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
@@ -6,8 +6,6 @@ talc-25:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
index 18064e540004c190e4abcbf3598218e988fb94d4..16573c2d54aa45695bf829b948503203b12e87e9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
@@ -6,8 +6,6 @@ talc-26:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
index 4f32a618fef2d68c4b6345819349bd2854a8e5d0..7a05ec1348f1b0b466489d562f3d452e57af2aa4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
@@ -6,8 +6,6 @@ talc-27:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
index 498e6ec4401a26944a021eb99b331105225fbc5f..af3b700aa8aee8f09092cd7b78298d63eb9bf1b6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
@@ -6,8 +6,6 @@ talc-28:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
index 1e14f3a75aa8f1b697474e6146eea4e347ebb789..6dce8538a0d84897d1dad0ff54d7513077da491e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
@@ -6,8 +6,6 @@ talc-29:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
index cfd2fd5c78c77a8b7d9ad0d4a07396e9f0247ec9..37eb196f9e7c9dd585b8ec3f55a5f765a657b9e6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
@@ -6,8 +6,6 @@ talc-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
index 41ab251300cfa1ccf72310c88e43538861b02306..3e2047c3e22ecd8f7e4606f39905086d476f019d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
@@ -6,8 +6,6 @@ talc-30:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
index 27fadedb50e58e29116139045fc13ecdf7dbb6dc..3f37c3bdce97518e6c4de9d5fbabb3ac76ef0682 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
@@ -6,8 +6,6 @@ talc-31:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
index 3adf1abfa497fc11e9443ea278bb21bd7a959016..45278479d0bfb1e4c5a3d1143996c28e54b8c779 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
@@ -6,8 +6,6 @@ talc-32:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
index 4c081048652a9350c473c9572fdee22ef2da03a8..e79feb1fa96af06d163f0d0bd285af856ba3e28b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
@@ -6,8 +6,6 @@ talc-33:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
index c868d7acfe8f059fb495cd7918c21b096849115e..e51577e8ad9b3df33b89f7c252dad8a307e89149 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
@@ -6,8 +6,6 @@ talc-34:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
index a2e47fcd541c505c70b5e724c63bc16a3bd209f1..0342373b41c5141de25b5117b338627a386c1a98 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
@@ -6,8 +6,6 @@ talc-35:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
index 4cce1f4d041212db261c8d2d6448285024d9f65b..9fd1fe765e21633a2c073efb2ecf193ccf269f75 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
@@ -6,8 +6,6 @@ talc-36:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
index f283ba0b1911f1948cde5032c2cac977efd34359..155df713048b590cdbe7d56b1d14dd117a212f31 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
@@ -6,8 +6,6 @@ talc-37:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
index 04a7cd96afe175eed0869c773c1f2083afae2849..049bcfcb22b7714901e77faf93994fdfdf76abfc 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
@@ -6,8 +6,6 @@ talc-38:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
index 3445a9cafd602b7b908970a13ca0440a5a8fdf18..f7736d73de57bf0a1823fdc5d0c6e901e790fe19 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
@@ -6,8 +6,6 @@ talc-39:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
index d5a658a128ecc6f05491cc035415d8f220b74732..10f9691a73984c15e289cb1b198013f030222468 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
@@ -6,8 +6,6 @@ talc-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
index 2513eccc9debddc18864af2f08d803b0b88020de..3a0e32bf3c7da5aefff53454fdfec55d9f11bfaf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
@@ -6,8 +6,6 @@ talc-40:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
index b634df39a35d8c6672aa1ccc586e1781b628edaf..f9ba40379887df1a3dba79d10c1668ad9983a98d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
@@ -6,8 +6,6 @@ talc-41:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
index fa30a81413de67d4bd27a95253ddb888caebc436..e8bc719cfc7806d76a3986dbf5f53e77ea3c20f8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
@@ -6,8 +6,6 @@ talc-42:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
index f5e2dd920d3e1c5c35f9b4cdea4634a01b556af5..5c90de1358945a87b4f887fd76fa377df9f3e56e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
@@ -6,8 +6,6 @@ talc-43:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
index ab8c3e2b91782150cd4802a7ebf5b4f6cbc8fb38..70a3cc4493175ac4229e8b56f30f5dd7bceb6382 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
@@ -6,8 +6,6 @@ talc-44:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
index 8dee997cbf084ab91c363b4f27548e4304f3311b..ce2f3dc2ccca06192c6612e50fc2df7591577d3e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
@@ -6,8 +6,6 @@ talc-45:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
index 3d32bdd9ace72017def89703a846afe59e698a01..2589467675eb167bf2e5e97f12c0cab4a1a81417 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
@@ -6,8 +6,6 @@ talc-46:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
index d17e234887f7e4ecd5fc03ecfede0faea9a40101..e7f0f2afba3c51c7398c30cf1ac4b52730bc686d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
@@ -6,8 +6,6 @@ talc-47:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
index fe89789ea5c0b8f4422937b6e8519fa674a72de7..49ea31a608fb4a34de5e7dcba74bc54c146797f1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
@@ -6,8 +6,6 @@ talc-48:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
index 8b6b2e0649aba50c8010c636488201149f6ac002..705ef3edfe08d4cb7979815d6d34fadd0b7e2fd0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
@@ -6,8 +6,6 @@ talc-49:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
index 5d13e4928cffe7316af2ce351307dec9f71c9b9d..2539db56f73bd4d8159d6cf1204f3eb0bf1f0e8b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
@@ -6,8 +6,6 @@ talc-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
index bfbdc4e711d5d88c522786ce82ea0ea9e1e2b724..c975c96486d89994c51bb104654d08779dd7ee6d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
@@ -6,8 +6,6 @@ talc-50:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
index 51ddb3e6f3a536833aca83465f22eb0e68562260..a2428e89206ee9bfa749d02b3636e7e62a5aeedf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
@@ -6,8 +6,6 @@ talc-51:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
index a9ac099d6f7c39e4b4c270eb6682f305ae4e9428..11d2f0d55c52bbcc8e7e475183234915de13f479 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
@@ -6,8 +6,6 @@ talc-52:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
index 7745017a7d66b6ed6a41be69544caa2b057e830e..7a8a13963fbc0001d23483b0df4c6bc68d095446 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
@@ -6,8 +6,6 @@ talc-53:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
index 69eee0462e14c1047044261b0df4535940be4dd9..17933b238aa5ebb79ad7f3e1275044725f7d9105 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
@@ -6,8 +6,6 @@ talc-54:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
index a693243262898ee160c4701c7901b93ab2129ec8..3983a8a55091602c9e4c534f090eb28193b5f842 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
@@ -6,8 +6,6 @@ talc-55:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
index 106ba921b201ec0a4f89e13dd8f213b4f513f747..7af9f07b677d3471dbdbc532060073aa622a9cb5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
@@ -6,8 +6,6 @@ talc-56:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
index 61c8f20e9d0548e10ea5cfbe8d144139093ca64e..76d54d1091b5d87f6206574c77e6c3f9453dfb51 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
@@ -6,8 +6,6 @@ talc-57:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
index aa48319796e3cea452d5b68becfff646b7829550..14684e776490e28a7d8ff0a112aec792c76034d6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
@@ -6,8 +6,6 @@ talc-58:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
index 75940ec89115f6ae8dadb9f9eede9d17e27c8a55..0a0063de0b3cbee1cf4d3ca2a927130add302065 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
@@ -6,8 +6,6 @@ talc-59:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
index bbc3ebab12556c0edf64e4a677897551bb538f60..45410afaaa094416dd590447528a56a82e6578ff 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
@@ -6,8 +6,6 @@ talc-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
index 10fcabd517eff4417cc51a6f724e8ef01013bd19..79d5486874a7999ded77addfe35a0714de1a5e61 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
@@ -6,8 +6,6 @@ talc-60:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
index 971aed38133799eede1945f73f5b39e6411b1649..cb67f32035601d14a498a9129e80c60dad95e238 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
@@ -6,8 +6,6 @@ talc-61:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
index 370cf1e261e402c633f0aea7a5e8a10abc8a79bc..32b991279aeaeee3ef1b6428583ecea211fc7bf0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
@@ -6,8 +6,6 @@ talc-62:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
index 1081e372ef5bf5cd2cc5c2aae0d88f0ca5edc4df..755a086d53ce31ff1dc396ad078113e7dafada25 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
@@ -6,8 +6,6 @@ talc-63:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
index 52e5d7dd93a9724b010812528b095ad473c032ca..9505a41a6b8447eec551f88d2c8a90ae9895153a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
@@ -6,8 +6,6 @@ talc-64:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
index 74a5e16a77daddba77483a9350e199e7b6cd1fe6..1d3aac6d2ab343ccb276abb0a8920b81564fc025 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
@@ -6,8 +6,6 @@ talc-65:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
index 733af7ce50c30c66cecee2863a4599619aa3a490..b6f9d613a1eafd7466c0c9156303ab4e2e693e48 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
@@ -6,8 +6,6 @@ talc-66:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
index bf251b9f62520498f909cb84468dd8a4cf377884..92b370ebde6259a926d67f0d6fae9cb9adaefd2d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
@@ -6,8 +6,6 @@ talc-67:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
index d4ca99dd7368c0167fdc8a43a74790710dc699d0..6e7a2a74a42d900769a92d4aa12284ae417f8caa 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
@@ -6,8 +6,6 @@ talc-68:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
index 9eed4d853539f47f7a0fd1de01c4d349b00f9b5c..ad422fca5ad212f476651dc051c93d1e1ca3f12d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
@@ -6,8 +6,6 @@ talc-69:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
index deca4ee7f9fdc0c5a2ceca44c60cd402db54dc08..e516716764510286eb9ff9f6366219d65ba11efe 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
@@ -6,8 +6,6 @@ talc-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
index 6d765d3bfbe3dee512cb5773c27cca23b1978355..ffe09e3b0e70abfc2045f0a025fac388c5263efa 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
@@ -6,8 +6,6 @@ talc-70:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
index 0cf989f241b72ea688d869a61b02d1e41dda4a8f..3bd37bc4d20c59f838c4d36cc743b08883a1cd7e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
@@ -6,8 +6,6 @@ talc-71:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
index 08db9d4005aa4e6140a134f87dd5d33aff315b65..27c9cd9b30774b997a055adc40d0446a361ed48b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
@@ -6,8 +6,6 @@ talc-72:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
index 447a48b77f8e77ce662271c25aa7b6b7d4605a70..080c62a91c7c6a84d47a3e32ce8c3ad3022c72cf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
@@ -6,8 +6,6 @@ talc-73:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
index 040315e1f9748058f896e7fd305155192542acce..b2ce84355d7b660a4bd11e68a543477a079edc32 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
@@ -6,8 +6,6 @@ talc-74:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
index 632b59319301b1d38091492432068413519867cf..1101ef39e031a44f90da610dd6ccb39aae828d61 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
@@ -6,8 +6,6 @@ talc-75:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
index be5fba80f1b039ae482e6a6f73eec8ec89783a6c..c34ae05f52173c1498b86c6c4447617fb005e340 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
@@ -6,8 +6,6 @@ talc-76:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
index 25e81aca456b9caa36fd8b327840a0ed73f07abe..60dc89d196d720fc49e70cb7408fd9e205868908 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
@@ -6,8 +6,6 @@ talc-77:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
index 31acf0cf01c9c51162201014f8862d65cdf4857a..b3d885abd5b125c385cb7bd1ba74abc20fd92de4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
@@ -6,8 +6,6 @@ talc-78:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
index 5bdde6e5f8b0a9e274137a5f82a580966962cbe8..042ad3c44c46718160486253276980b6ea1dde4f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
@@ -6,8 +6,6 @@ talc-79:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
index 8320b0f8a964df6254d85cbbdf692b94637f19f6..f787332cdc5b03b8219a7d09e323ddfe41220eb9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
@@ -6,8 +6,6 @@ talc-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
index e95dd1b169a5db88eb94d34445647d414d7cb84f..59d6c982187166a7af1b639f84eb5015ca11c3e4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
@@ -6,8 +6,6 @@ talc-80:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
index 421de1da3fd0df06df63145abcdb88d54348f755..392fbf844ce9774793a9546062ff210fbb3d6f7f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
@@ -6,8 +6,6 @@ talc-81:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
index 144a57e2f505b38442c5c9d54070b7e5b872b0a6..3d8931563e2d71c5d160b12fe757b2c695f4fce0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
@@ -6,8 +6,6 @@ talc-82:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
index 9fc1072f39f176e192daa31cf950667f58f9d62a..d3ac40de834a4a156cbc1b30ccfe654503cb685e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
@@ -6,8 +6,6 @@ talc-83:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
index 12afc7b06343ebae6abcfc0c849eb45f918375c0..63564d7f28fa87b4ee4ed9b4cd6a126c98275a8d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
@@ -6,8 +6,6 @@ talc-84:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
index c076b4d3e2a225da987c09ad2e106f29fe0d11e9..e9d09fadd0446e605354a8305b3e32a36e05c5f1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
@@ -6,8 +6,6 @@ talc-85:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
index 9baa1820dafbf6a5ae8e5ab68b27dc0804db0f12..c80e9fbdc5048bc6b3036212a285ea0f7434455a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
@@ -6,8 +6,6 @@ talc-86:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
index 2e2b9493aac73d723e8e86769d44854ed8642cce..92d258f8a36cdcd810e9bdecf2b824a274a7f781 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
@@ -6,8 +6,6 @@ talc-87:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
index a94ed8aee1fb3ec5034bfd2421ec4ac0efa47cd5..5a9bcbf83752b1721b47cd0d1239a1f2d481ffd6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
@@ -6,8 +6,6 @@ talc-88:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
index 34c17615f44ec6c5e3896a9d701a29c5a8421383..5aeb75036f9eb9c9e7a3effbd143fbf20872c475 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
@@ -6,8 +6,6 @@ talc-89:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
index 1b4ea872f861f329087c49fb0bf2b628266af4e6..c00e72d8aa79f2f58c4e49409e4c28a6dc413d70 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
@@ -6,8 +6,6 @@ talc-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
index 888f847292cd0cc9fd1d04933c39b6758631ff08..afea1db35d87c9229e3ab72f06cb99fae6b75e04 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
@@ -6,8 +6,6 @@ talc-90:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
index 9f35ae0cd7a1d42e5d5a1ee460487b012124ebca..0d481e184f6e81e049bb2d4d5c252db202e25898 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
@@ -6,8 +6,6 @@ talc-91:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
index e3a54e00bbba725f043559e816e68e5920d6c057..63d15d10595d5e3d14a361c6f6ad70ecd6157a4b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
@@ -6,8 +6,6 @@ talc-92:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
index 0600b48657b055cf6f24b163c9e661c7b4e3887e..10f71e763e616832979752e93934d7316a0500d8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
@@ -6,8 +6,6 @@ talc-93:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
index a32a04cc1cc556282da33dbfdc344716dcbdb7ed..b11f6419c18c87008abd0aad9bda8af55b253e31 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
@@ -6,8 +6,6 @@ talc-94:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
index f6773b61cb5f25cfb11eb702aacf71334e37dfa4..6902e602379edf39867567cdd216082638f66b0d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
@@ -6,8 +6,6 @@ talc-95:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 04/24/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
index 9edc443cc3d8d57448e0e6de2cb0055128d4e4f7..94170e1126fa1efa95d0a25338b035837fcce62a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
@@ -6,8 +6,6 @@ talc-96:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
index 331955ecebf39a117b974c3e8b07237c72c8ec3e..9b8899ac828a088a89bc05f84fc74f6e37584aeb 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
@@ -6,8 +6,6 @@ talc-97:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
index 49a557bf09e808779a47ec2749c0001e73c4cf0f..aa95ab6af338b435bef66a444aa35bf5dbc90d50 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
@@ -6,8 +6,6 @@ talc-98:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
index ebbf522233c5b28e2f2d85b1520781af533a0d58..94db5dafcd97a29dd48026107e068f3126480cc0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
@@ -6,8 +6,6 @@ talc-99:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index ba8868646920495bd4de1b62a673bc0263759426..76acabb45307f22dad171d1c6a57dee455027449 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -4,10 +4,8 @@ econome-1:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-1:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index 61470897aae56cbad0606f964c468a6ee44592d1..3359c8a56ae7d9b223c56edca9c0ff1bdc2607d0 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -4,10 +4,8 @@ econome-10:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-10:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index 7a8f78404f7590095ed38c593528e00381ee22bb..54e53c6a98e0647f6672e38ae1de7eeac794ed48 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -4,10 +4,8 @@ econome-11:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-11:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index 55fd46a4983ee4d426474e9a969a36fb1eeb9ba4..5710a606528bca2b7602be4a1159f9a84cac32cc 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -4,10 +4,8 @@ econome-12:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-12:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index 179f6691fe4240e9245d81cfa27072e4de57085a..2a0fee95d1d638eb8ac599ad7327581b9b9bb128 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -4,10 +4,8 @@ econome-13:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-13:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index 7502cecf7e2c614a67ee31d23c1d1dfac77fb9fd..ca15a57d2566e95beb9b797ab52477932b37cdfe 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -4,10 +4,8 @@ econome-14:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-14:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index d014d5c63d6566fe47748a22d72c24201d08fd8d..780729bb4b4959c7d912927b9f0925426efa8b66 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -4,10 +4,8 @@ econome-15:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-15:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 4e472121f3866c3f3d9058aae03dddcfddb00845..b3351900e4361d36c45fa7d102b66f14ff51fc22 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -4,10 +4,8 @@ econome-16:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-16:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index 9951eeb7b353bea05187e8222c4a921a84855596..8f0b22ece5f389ec341e533910b124701108259c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -4,10 +4,8 @@ econome-17:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-17:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index 4181625dd8b4bf8b7a5b5d9b0680a4e09333381a..79f2d792a4960d9d1f6970fe18d08a62cbee8efa 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -4,10 +4,8 @@ econome-18:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-18:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index 2150a1e137e5b0134ba58afc93a52a1d03740457..7c431e1f8bde3b454ad575133c6f9429d7f5d961 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -4,10 +4,8 @@ econome-19:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -62,6 +60,7 @@ econome-19:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index d51eee7c083d96bca26dacb16a99ac3924aa846c..2db700e93329916b0956302ab24d0e6258a24f2d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -4,10 +4,8 @@ econome-2:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-2:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index a58b063c1a2cc369116094faaafddd68d1f51134..5d948c2caed81120b45d01397a65f07b0d9f438f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -4,10 +4,8 @@ econome-20:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-20:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index e71cdaebafd8a72e6f1cd889a77f78e081fccccc..98bceb6dcbd2bb927b3e91d661e6553c602c4626 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -4,10 +4,8 @@ econome-21:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-21:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index 3750b0dadefd99cce7622e70df5eae5adfe0f7e8..f60229ed583c783686fd9ba9022ddf13f6ec9710 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -4,10 +4,8 @@ econome-22:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-22:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index 49be5d7d1463a823bbbc83118b7bf5f730e90b32..ddf2d1ab7362da7100a67dc045217e38ee6dc3fb 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -4,10 +4,8 @@ econome-3:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-3:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 0fe306e12a7af557af2b7f85b0e924519d695f13..da28f6a26d14a2e7ec40c57e78b9baf2714b4f51 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -4,10 +4,8 @@ econome-4:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-4:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 81e47dd4cb57489215749fdbc60adc3acbaef70e..79f3e573cf533741c103647f421499294909d705 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -4,10 +4,8 @@ econome-5:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-5:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index 87b2d58e85ec2da0578b7259042e881d2de59be3..aea2854d34fc16270c257f27e3b754d2bc313acf 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -4,10 +4,8 @@ econome-6:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-6:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index f7a229f64c10666136ae74ae2f42c9432e655bd6..e7b671c37e2b55cd6484a82d9b58b3e6a16327a5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -4,10 +4,8 @@ econome-7:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-7:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index 0fc8e797b9a876178bd5bf0a7dd218fcc859c5fb..92354505611833e073d0c28099ae738f7865af6f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -4,10 +4,8 @@ econome-8:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-8:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index d53825f6b8f8a278ac26f8ef516a7ca4f8d15107..8bc147ef257f4494fd925e99967a4dc7f95623f9 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -4,10 +4,8 @@ econome-9:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ econome-9:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
index 53dca89a3d4da8cd283ea21e39cbea80ec976593..64687d993708c138846eb7ad5092331942102aa1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
@@ -6,8 +6,6 @@ stremi-1:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
index 0dd7496ddb90a5d513cf55e97a6071815e040b8d..c479c2ecd547c3c22f121060c259a732f3dc92c8 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
@@ -6,8 +6,6 @@ stremi-10:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
index f05c852f135c883a986ce5f4d06900eac12c18e5..449a5165a8ea9176eff0284468896b4f87306c23 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
@@ -6,8 +6,6 @@ stremi-11:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 03/01/2012
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
index 53d2bf96d26b2232e450d906a36a9f0a689084da..609899302a5ca06b8d015d099631d599459607be 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
@@ -6,8 +6,6 @@ stremi-12:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
index 3277ddcd4cb4bf7f3daf25e31009a367ddd68170..782b37d1003a6c01fe49700d85936b534457f304 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
@@ -6,8 +6,6 @@ stremi-13:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
index e88d5704b5c5c96bf7b767ee39bab05ed3adfdad..5ab79329c39dbf4e7eadb6dd61d999b18376c630 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
@@ -6,8 +6,6 @@ stremi-14:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 03/01/2012
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
index 95d11d00486e0d058c6a09d5425e9d46792115d6..a97e578dacd378ce4a7addffdb35494e91169f97 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
@@ -6,8 +6,6 @@ stremi-15:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
index 4792bae3ea9979424e69582a353f683c87d68711..7529b30ee10331016e84dc90f02ac3cbef292746 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
@@ -6,8 +6,6 @@ stremi-16:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
index f09d17c260c011e2ce990e2bc11b97c0333423a0..1cd56dbc676f2a7c3be503b7ae51cea62b618ded 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
@@ -6,8 +6,6 @@ stremi-17:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
index e027aecfcaead3229760e25352b609edf6582da7..a20d192737bdef43b018bb36a911a904439797fd 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
@@ -6,8 +6,6 @@ stremi-18:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
index 947081e72251c5d6c76dcc41a80553d7e1a2f009..5f87f907556380a527a2f03dd79b1386e24ebe6b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
@@ -6,8 +6,6 @@ stremi-19:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
index 8650d0342d64e6e7a328f6390e13ddfae6257f46..3c29e2523dbbda4ebf2085b58c30a3e2aa79d486 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
@@ -6,8 +6,6 @@ stremi-2:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
index 3d75a19bba946464ff92bc19e8335207ba050927..c78d66bf53dced8280713a3930c0de0868100773 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
@@ -6,8 +6,6 @@ stremi-20:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
index d5ba2f01da5b5ccfc8391c51bd214843b918fd5a..c67a20aa3c4f4bc52d87818ccd144d3fc40965de 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
@@ -6,8 +6,6 @@ stremi-21:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
index f031abf2b50917e0f0a5482998769bfa962a8336..f170da88f6a0863d0148d278136d69f6c8306629 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
@@ -6,8 +6,6 @@ stremi-22:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
index 1ec0ce068044eb97cf5918878a9cc1a482e7113e..c733eae58fd92c62d4b651b78df0d9bb55ba6d4c 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
@@ -6,8 +6,6 @@ stremi-23:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
index 771115c2221d9b4a6001cf5d71604f8c5ec9cdc6..6b7408120bda0710233aa03afb1f7f3b97c47d66 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
@@ -6,8 +6,6 @@ stremi-24:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
index dbb0762a21c1f3a4d42f351118d4a9906d9f31e2..17141d850e3403e74f420096a6a051a5d97ba5e8 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
@@ -6,8 +6,6 @@ stremi-25:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
index dfef5905adaaddf7b59c844457fd72b8da072d90..b9625e0c4af74be8e997ef51b58431f64f89b679 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
@@ -6,8 +6,6 @@ stremi-26:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
index 0fe84d2a37b32f0167c8953c8492301ca186323d..9dfd9d79be9c03a52e794620a726671f8afa78fd 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
@@ -6,8 +6,6 @@ stremi-27:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
index 07ff373da68b1b80c6ce608d2905292e76919de4..2b650e802b084bef6b4522c38c2955a6c39a9a1a 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
@@ -6,8 +6,6 @@ stremi-28:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
index 1593c8aa1acb8bef0908df3d012a4017b036312a..62ea2b2fc772981743b53d5a8a19b55df2b3b876 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
@@ -6,8 +6,6 @@ stremi-29:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
index 802f2297575960d9dd29b71b583017f51bd84870..446da7d773ee3100cd8e5a4701d41989a342cf6b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
@@ -6,8 +6,6 @@ stremi-3:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
index 74f95633424abfc676696e886b8958f669ee82d4..1760891c92e346c2d39546749e20cae1abbeac6b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
@@ -6,8 +6,6 @@ stremi-30:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
index 0a721abe1c9e1c1664e41004d144e5489556d050..6c65de9c72bced3dd8c35ce00f3f8b96e7102a58 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
@@ -6,8 +6,6 @@ stremi-31:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
index d5a6a2b5603937eb9b29ae54e38bab978b3157af..9cad953c9e6f5db646bd9e335a0ad905b569b6ba 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
@@ -6,8 +6,6 @@ stremi-32:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
index afac4bac892c0dc428a8c7b596c67b65ccee6e69..7cf305c4b414d2110599e961dd14f8dabaa067c2 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
@@ -6,8 +6,6 @@ stremi-33:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
index 179d28450d1dd4a82a0388b8eb183a95c1cc8541..ea650bfb00c541169997fb50eafbb83aa6936222 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
@@ -6,8 +6,6 @@ stremi-34:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
index b4320b474f942449ece175de50ff187fe6c41c7f..e2f3cd3993b1434d4a2799c943e9c460f64391a5 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
@@ -6,8 +6,6 @@ stremi-35:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
index 07741a59bb84f107ac0ac7fb37efd9323a819bc6..3f7582aee59d6f9bfcd45ece20f8c6c06cc2913d 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
@@ -6,8 +6,6 @@ stremi-36:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
index a0fc1677d3fccb7124b86c5b053125e09e24c867..3c2904c1f516db23b25c1c96294a260cc8a0ea98 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
@@ -6,8 +6,6 @@ stremi-37:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
index fb4258ecbfe8a504f8bef49809ef421f20b22183..621cd97abea2c9cbafc4b3cd1bef5fb4ef71a3fb 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
@@ -6,8 +6,6 @@ stremi-38:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
index 8445b1a02e5ed6b2a4975680fe4515628b2be8f6..588e31e2c3d13ed2ddb9e3327fc958c6ed1e8254 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
@@ -6,8 +6,6 @@ stremi-39:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
index 770fb8bf9c7c1e8cc5d5ee010e7e454069281094..03d7636de0f019024706b3c4ba8660de685f2438 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
@@ -6,8 +6,6 @@ stremi-4:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
index bc067e2f0cbeb0a322c2e6bf6b63ddcf409c1664..aa6f1d90f03fba2af01ddc065b0e34eb7db81b38 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
@@ -6,8 +6,6 @@ stremi-40:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
index aa22dc52b49c9d803f07d93ec151f8d8b3bf8f2d..ee484be63d1057774e6acaa424ccf9aa47dd997b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
@@ -6,8 +6,6 @@ stremi-41:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
index dd3f51b57bb68533dabc5dd644ab70b08460fe5c..2a9a2a563c4eba7d8e2cc33c1b5d23301db50895 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
@@ -6,8 +6,6 @@ stremi-42:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
index cf3521cf4d7f90bacffc400e3866af8b26a4dca0..2937665f6539fa7f2d747ec3a949991bc394fd99 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
@@ -6,8 +6,6 @@ stremi-43:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
index 4958fbcbf90e1bd085830552f30c18463ccd2e69..95444934305834adeb631e9f64d7f06f98690335 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
@@ -6,8 +6,6 @@ stremi-44:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
index 19b02148a657df2d557e53c42869e8ea3ba215ca..da5163fcd16ad9f421a7ec7dcfe473d4de073cc4 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
@@ -6,8 +6,6 @@ stremi-5:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
index db40e550da1e7ce23809e7804f16da01f2c96c57..b11f1eee1a67717a9efb5f2eac3cf985ea3801f3 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
@@ -6,8 +6,6 @@ stremi-6:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
index 7295a6ae05c4eb2e8442c868ab66e16659d185ee..0c7da9654c8102f01fb41e10713387d0b64477a7 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
@@ -6,8 +6,6 @@ stremi-7:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
index d3894bb71e2f269c912fbe7c9b85e7cbc078690e..e4e936c224d7e4d98b1ae4823e472f44608daa91 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
@@ -6,8 +6,6 @@ stremi-8:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
index 2f808a539cd61d5e4424d1e4790cd0c245786241..fcf14488097441953260051e36161bb7ce78c503 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
@@ -6,8 +6,6 @@ stremi-9:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 01/26/2011
     vendor: HP
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 0dc284d4cf276d17b3a59934ab1d30675f03d6c2..77e6d720518f46cdeb6b958c57db589223ce576b 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -4,10 +4,8 @@ paranoia-1:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-1:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index 73b4dc2f7df5c411abaa3b19e404a2cc110c5ad7..87bb907aef2e164da9ed539e4cddeadda24ebdb2 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -4,10 +4,8 @@ paranoia-2:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-2:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index 3b73b8d834ef4e7c4fc84fa6afb736d43d28ed4e..98ef0f1a35566578c3d29355cd80a269ffa72342 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -4,10 +4,8 @@ paranoia-3:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-3:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index 8063f4f89b6ff07447b0ff7c197d8dfdb465dc43..7372627ff4d543000112aeb2f6519a676a9cdef1 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -4,10 +4,8 @@ paranoia-4:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-4:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index cfd09c4f5f6c41abd4f0738662d10af90400f528..800c4e553747998cc30604b1d73ffcafba90c0cb 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -4,10 +4,8 @@ paranoia-5:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-5:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index b25c1be37516dd3ecb98a1ad979697b8e072206a..890491468eb88cf93d318f33dd89501f042d4679 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -4,10 +4,8 @@ paranoia-6:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-6:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index e583887c24373dc7a60174ba712c6d478c4a46e2..dbb9dd9f82af0979f5ae251ed42b5471bc53716c 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -4,10 +4,8 @@ paranoia-7:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-7:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index cd772776a8815df70fa22404faeea68bdd575560..f6a9ab44fa4fd9df684d6088e7c0bf29fbabbb09 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -4,10 +4,8 @@ paranoia-8:
   architecture:
     nb_cores: 20
     nb_procs: 2
-    nb_threads: 20
+    nb_threads: 40
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 20
   bios:
     release_date: 09/06/2013
     vendor: Dell Inc.
@@ -66,6 +64,7 @@ paranoia-8:
     cache_l2: 262144
     cache_l3: 26214400
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index 7513692da240b4db0c5fce3ba6b207a0935b1110..2215a1735c23e8013c240d62a8993f2eafc46f52 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -6,8 +6,6 @@ parapide-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index 69881a2177c4b7f3f9be46e9c09375709bcaa2a9..4c0406f3ce0bb847ed526cec8a85fce3e37f0713 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -6,8 +6,6 @@ parapide-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
index d3b930f4291dd2b5a95ba98a942db6c599ad040f..93f53f277bd6d2a1c3a7900db409c1e020648b68 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
@@ -6,8 +6,6 @@ parapide-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index 75e02909b97b58bcf8b9b8705e4dbd43ac03b55a..e63de976eca3875eed264d7a02c5d1fb85e2d762 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -6,8 +6,6 @@ parapide-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index e6a1f2e134b9ffb8817b7b4b35b734f8851e239c..f2090f9c90a25fd42a356e4b6004f8f6d5690d0f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -6,8 +6,6 @@ parapide-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
index e188457a35fb0bc6304df2b27365947c110d6358..689135a478899f19b5deedaad9d9544892c0de09 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
@@ -6,8 +6,6 @@ parapide-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
index 166258a6f31baba29be213f912fcdb483b4d2125..b82de008e0b9d705fef9b59047216574ad09b891 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
@@ -6,8 +6,6 @@ parapide-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index 446f7d5a62d216889b712071ccf4ddefe0f61622..d8d34d99b7bd2e63c7c7d465bb9227ffab6bc33d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -6,8 +6,6 @@ parapide-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
index c3703981a2124e8c47dc8e7031de404c226234ba..8c4029447b812cb83d016fe2370d438270308806 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
@@ -6,8 +6,6 @@ parapide-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index 480babdfc67bfeadd48d41b703faa41b4d4c3fb9..ec1f9b9ce1ab91ba7d6148829ac99097c3d3e9c1 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -6,8 +6,6 @@ parapide-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index c2d7a6f8a6ea70da085248af7c4614dd267073ad..d874bbf15fd368b8f45782cfafe0f6f74f2d5899 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -6,8 +6,6 @@ parapide-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 13caec547246d11026d69da5cf5e2e285adb1faf..a5ae232f32accd53b47b52bd2e5381e4e3fad863 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -6,8 +6,6 @@ parapide-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
index 55ff2039f2b0f36310963b6890b0ae062bedca69..0cec4dce5c5738da98b73f7b56931f6bae960579 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
@@ -6,8 +6,6 @@ parapide-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index 51b10fa4098729f37d74384b870b6d0354acf607..a6c78037e2d4a95b1cdfcf2b5798f1f1a6e02ef7 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -6,8 +6,6 @@ parapide-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
index f28b35cd42e31eda29028e383e47347502d34207..fdd45c0833960b0d07b32ab592c980f4bb1da3d2 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
@@ -6,8 +6,6 @@ parapide-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
index 7ef44fdead9415e86f87e1a68567252dc48fc2ec..237cce6aa9985da3bc9a2d172577d84e1e09861b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
@@ -6,8 +6,6 @@ parapide-23:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index 41bd325b13f547d35d7d3ce01bd241594193dfeb..2bead89017b64912ef295276dd3309f48b083286 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -6,8 +6,6 @@ parapide-24:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index b77c3d7c0ef586f29c59134a912e48563a4c228c..4453e08f67054247a1b93a25531202fd08bf5238 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -6,8 +6,6 @@ parapide-25:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index 9f799de1ce524eaef82135e71447777529bb93bd..44e3a1a98a9a01d24c1a1e929ae6ac7a23d938fb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -6,8 +6,6 @@ parapide-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
index ea5590adb5e35c8c21275913791e02e3df082a4f..b092e53b331fb593961598436af4cc5330906c51 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
@@ -6,8 +6,6 @@ parapide-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index 2579c2503c7d1b2b2f8d8c8759f4afbd82d30596..8bb6322bbd1fd39eefa0bcd4d0ac871214a91ee4 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -6,8 +6,6 @@ parapide-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index beb003e7a36c47be4b85a1ea541110cab94cb4e0..cd59423128d83085c0d86d9ca076d561b3e95673 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -6,8 +6,6 @@ parapide-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index 69049c3f40c645625a34c5a607e8c1c71cf9186d..1371f3f24e62c9190930a41a7f5dd5f109e468fb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -6,8 +6,6 @@ parapide-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index 6f95cc7ef13840489398d761276c553628804bb0..767d66c2e423515ebaa6939c674bb0c679b41e4e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -6,8 +6,6 @@ parapide-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index 40d5add5b7c5c02312f064b55e69093cfedbb36b..18b1ae036cf89266f69f83c4591f12cf1e1e33ac 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -6,8 +6,6 @@ parapide-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
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 1e7b1e867155e1ddf44dbfdffb1ac12ef23b8920..040439be20eab5df1cbb9fcc6438d1f17ce253b2 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -6,8 +6,6 @@ parapluie-1:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 aa5000af2bd4608e30bdfa23581187e016251999..56eff43ca1613860933a54e34052875a186f3c65 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
@@ -6,8 +6,6 @@ parapluie-10:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 345f8ef00715399773b933d67d7acae7e9643a14..a67e6ad08eb4599c80f477e98f39944fb6c60f05 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -6,8 +6,6 @@ parapluie-11:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 428cb904565385efb1ce9ea0013a535899e36a82..709554e4932976ec70e3972a22a599f0628afb6e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -6,8 +6,6 @@ parapluie-12:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 321f8adb8047276ac2ff5e6df2d2e2e136dc1d9a..1672c19c3d284cd0163c852a45dcc2bc2395e945 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
@@ -6,8 +6,6 @@ parapluie-13:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 48b383ce6a07fc2431c6c419d58091372d76a2c4..24265b1ef775da1e0a27c4b6fdb756553ed62b8b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
@@ -6,8 +6,6 @@ parapluie-14:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 1416ee202f8b1d59d0af2ede55871a1b1cbd3f07..d96bc65fd6755e52807bcba60d095a040ddeb47a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -6,8 +6,6 @@ parapluie-15:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 e6b53eb87347b778a5f46be100a5adabb68c861c..38686648b2ffc450e7ac6f1b098eff500f94e4a0 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
@@ -6,8 +6,6 @@ parapluie-16:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 572d57978d96b91aa87a60f7ca339ded0f63d09a..70531c71f7b2a04e53d8ea9242f902355318f241 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
@@ -6,8 +6,6 @@ parapluie-17:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 ccdf61b7f2e6b4690c2cae11f5a0d9d50e65d776..36775c90fde671e69c9892897d8b289d41f0f9b3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
@@ -6,8 +6,6 @@ parapluie-18:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 16e5cc198f5a14e184a04ee2798ac2da6d8e6a25..d5e3e6bff79024c0933dd3b93118088d4423d742 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -6,8 +6,6 @@ parapluie-19:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 94b30897da921bdd95ebfcfa3e78f33a4b6af53f..039467c8fbe4ab19042d90d802c7b1cfafe63d11 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -6,8 +6,6 @@ parapluie-2:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 885c149dc57c9c4ea03feeac8db500e69e0830b8..86813e71701e1db5bb91f7101dd9aaa637d756b4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -6,8 +6,6 @@ parapluie-20:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 14300120f82103f8342ded52f776a6638b60129e..2eb2d5561bf7dbe10f7120e1267a595d14cbc5ee 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -6,8 +6,6 @@ parapluie-21:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 1813476c2c464d08467465650d6effe00346f5c4..934f38adb7b55a3a4dbcd96e1e9a0d746694dba9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -6,8 +6,6 @@ parapluie-22:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 ca2023e6ee1f59eabb9ee3589a4b0433226269e3..0bb4f762556a5483c1e24e540addea2ee25b48b9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
@@ -6,8 +6,6 @@ parapluie-23:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 9f0d8b20a17be0651ce684a7c44a808c040d7342..3a4daf5af9be3836731a93ef1f5b8d44fa87890d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
@@ -6,8 +6,6 @@ parapluie-24:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 7f9689d885e1b4046e5bfdc15dd177fc6d6f81a0..f643732e584bcff466d573f6b55bcebd9d21fb7b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -6,8 +6,6 @@ parapluie-25:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 67ed4c32c9555e64a791fb9d20e4cc8005c119bc..8daf3c42de028683355c8602539bafd5784010ba 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
@@ -6,8 +6,6 @@ parapluie-26:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 cabf954186b98cbbeed914c615f24889a877e6fe..6f865a5bd422b3762b696f538a946c5949a8fe32 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
@@ -6,8 +6,6 @@ parapluie-27:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 78fa7482760dad082b52b9ad70b067168ec25afc..0c4e068d23588158e1deb74794c0bb15a80baba6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -6,8 +6,6 @@ parapluie-28:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 bec8584f8b04870886c1ac337c3c5da3b39d3761..ac9e60561b20b0f3aa51bb4253c3ccb33ce30416 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
@@ -6,8 +6,6 @@ parapluie-29:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 c86142e8cc244f0ddbe1e241f05819aff1968ad2..8571fccb8867268b17231d1f0e57167be51ac10d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
@@ -6,8 +6,6 @@ parapluie-3:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 1df648ff24cab46e73a21b69992bdccd6f4f31a9..1a592893052c3dc68ff7397470cb34ba8dc5be1c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
@@ -6,8 +6,6 @@ parapluie-30:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 2d36f84c7efd795eed3fc8999ef3f7ad8acc4e5f..b943f23fed354a5c8efdd1c831b3c85bbc3e082a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -6,8 +6,6 @@ parapluie-31:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 99af482eb286ced2efc80fd1ca483e59fd9e0f91..6db2c83e6be4693126db6b68d6340f7c92f17b30 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -6,8 +6,6 @@ parapluie-32:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 de13547dac7e89cd89938eadacba85b68c8e5ae7..3f824306fdcb06a794e3a0249ed9fe2b750b19c9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
@@ -6,8 +6,6 @@ parapluie-33:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 9f11ec425d7392883705e51391b94a685e743813..73a6af608d275621997cd45a74e56af9a027e8cd 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
@@ -6,8 +6,6 @@ parapluie-34:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 563ceb536fe6145f935c8f8f8eb7b3134268c91f..641f5386f3c8081bd9436f2c07a71e4a940697b1 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -6,8 +6,6 @@ parapluie-35:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 b16222a9e545c49130d14712ac7b3356e03cb68e..1c570fa9fcacf59e3d906fb4a206e37bbfa84377 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
@@ -6,8 +6,6 @@ parapluie-36:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 01b346cb23075e72ac31806f62255b71fb0bbbcd..556baf9e134f020c1f4cbdac5fd921756b141176 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
@@ -6,8 +6,6 @@ parapluie-37:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 5efc8e41bd717667e1672ec1fc2ce262f61b69cf..d4862c6003eb2553c637349b464446e5e2dc32c5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -6,8 +6,6 @@ parapluie-38:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 d29250548472312ab8d7545de48a7a57d3d7e333..456ac2028f187c76f4f24751b993078a16b08d9c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
@@ -6,8 +6,6 @@ parapluie-39:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 d7926473a5b234129988bb906d7639391a148d0b..6679ece156ffbb343f27e8b91e44102c821b3f72 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
@@ -6,8 +6,6 @@ parapluie-4:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 7951699997a408ce49985792bda392083cd6aa1c..7d9761a733d26871de15107766bc27fea86956f4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
@@ -6,8 +6,6 @@ parapluie-40:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 a9ab99075d684f9dd3d9f2e31baefeb674c7e60b..3c3092fefbcd6fd25dce1ee8e4d1697a65548b74 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
@@ -6,8 +6,6 @@ parapluie-5:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 3f8e4ea5b854924f3eefb7b73c2ee2dae6c8111c..4495cac845da8dde7455883210f53ecdd6fc9c68 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
@@ -6,8 +6,6 @@ parapluie-6:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 9d28fe7bd340c82d11ff416de1ae38bfb4d493ca..a748f6ab33e77d27a4fb7b6f9519d992287782f8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
@@ -6,8 +6,6 @@ parapluie-7:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 0ed418d09ab4f6177c45ca13e7a9e219daf21fd7..2838d3357ea175305a9bd4b8abf557fc83c3d30b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
@@ -6,8 +6,6 @@ parapluie-8:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
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 4b2bd80f20c9c257036f5586bfcacb9788b3341c..bad572a9b9ca24fe68ca40e11f41d9c2761295e4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -6,8 +6,6 @@ parapluie-9:
     nb_procs: 2
     nb_threads: 24
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 24
   bios:
     release_date: 09/06/2010
     vendor: HP
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index c1fcc552f3bee0c5b478fd60578cde49c83bae45..021fec77184e1b99426d3a2a01d0b25f0fd06170 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -4,15 +4,13 @@ parasilo-1:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-1:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index 142a8d30d38d0e9d58f47b91b10978130b4e88c6..4e7e1fce9f9dc24cd0d3a6f0516643c6728307a1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -4,15 +4,13 @@ parasilo-10:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-10:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index 63a6742c95f36e094ee5d41fd744f9ebed703167..e62368d7107d244ccce1ba4ab3e4bb43348d7316 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -4,15 +4,13 @@ parasilo-11:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-11:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index c9e3a1d863c883a72cd0d60ad3e8a8476da6f28a..176586abb43d692cd2df0b2f9ac791e1cde86562 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -4,15 +4,13 @@ parasilo-12:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ parasilo-12:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index 9edd4a91dc1447c6b69afde107d5b342f69ca625..1e5e559f1b305b636b34d533c4a479c79bf1b93b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -4,15 +4,13 @@ parasilo-13:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-13:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index f6745dc9db3ad0f1e6e90d9bf943898efef162d0..d8b510f9015a28e85cdca278075db33c61785e47 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -4,15 +4,13 @@ parasilo-14:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-14:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index b9bfac8a07105dec5ea69d665517ce3746e279de..ea8099b85a409192b44eb19a2577d75e497fffb3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -4,15 +4,13 @@ parasilo-15:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-15:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index 44943ffb738b5e40e55270114b8797f68636a369..13258398906a205eb14127de15f8d6594f5373ae 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -4,15 +4,13 @@ parasilo-16:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-16:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index ac134c956bff75c44bf18820a176dba9e6c3905b..ad45d7be70bc422dc91b43897524f1f566045050 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -4,15 +4,13 @@ parasilo-17:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-17:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index 1abaff6c7399a0d84ee1f47e0ef63cfef430617e..a22c28bf163365e92740a3767d326cc8a82ca50d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -4,15 +4,13 @@ parasilo-18:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-18:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index ef497c8298406232365e3e42947044233ecf7862..44518d886d1e06720ba08026b58a88b6d1359fb3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -4,15 +4,13 @@ parasilo-19:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-19:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index 5e4d2e0848379786ca4815793e1e7460cb8dba02..6caf68dbcbfb952e35b45181b7d75c7d8d35d68e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -4,15 +4,13 @@ parasilo-2:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-2:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index 05885ce1e975c524fa26ef6ac77e25fd17f5c1c0..60d9a4c8a02f707a769d04ebc64903f6693c4504 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -4,15 +4,13 @@ parasilo-20:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-20:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index 8b49733c160a4ed5fc2f3e7666d063bdffe79a58..259ed05d253b33720d97d80fbbbf4e76daf1142d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -4,15 +4,13 @@ parasilo-21:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-21:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index 1f6c5a1def5eb4a001fb208ea3c5c06a6b9f278a..66dc5b9dd527fc0ae7c5bcf6a0af335af8ccdd34 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -4,15 +4,13 @@ parasilo-22:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-22:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index 0de1516147c60491ac5890730a38e1f7e6b95cf1..f3830da428d2cfd09a5dca8959d27ab075f546ac 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -4,15 +4,13 @@ parasilo-23:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-23:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index 232b3a4fae86bb0ff03d23f732875aefdd6edc99..3960270f4e19c587f55ecfac4c865df9ac2bfa13 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -4,15 +4,13 @@ parasilo-24:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ parasilo-24:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index 17578cb169b603a856525e3f188a0ea9b6d9f6de..f6e3aacfad1063ea51a07523c57b68d33e86665d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -4,15 +4,13 @@ parasilo-25:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ parasilo-25:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index 6239fc07a95603682e99dcf1b46ca73868256f22..2ef22b0ea16ccd228f1b25fae5371f7f57a3fc9d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -4,15 +4,13 @@ parasilo-26:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ parasilo-26:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index 6c990d9bbabb09825d8eb3d6581cb9a0c592e9b1..948be23fc19d307a03727b288817f3d877b5653d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -4,15 +4,13 @@ parasilo-27:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-27:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index 7420cb84dd36563a07c44fcbb0bfd6eee8d321d0..57b2647485dffd0725399ee5d59bd574a266a163 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -4,15 +4,13 @@ parasilo-28:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-28:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index 2ce8f4a408e8e504b2c7f70fd3cde91d5ef7f96d..ea558955372e7991e178fc1cda236ac653794e78 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -4,15 +4,13 @@ parasilo-3:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-3:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index eb84117ba6f40f6f7f607fb94e7894a79d3e806c..ec9ba6386763fd0aef1a889f15af878a6e7a9135 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -4,15 +4,13 @@ parasilo-4:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-4:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index ab4d7d76c3520ba6b319bb5e1356cbdd4d37881d..b23be37e457e38d786719b247109d67bcf041007 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -4,15 +4,13 @@ parasilo-5:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-5:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index 0928d794c0962b62bdfb456afa2b35d3087bbaec..da238271636e8dcd94bf4e81ce4b815ef937e1f8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -4,15 +4,13 @@ parasilo-6:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-6:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index c5c875db68aab381b5b7d103bef5b9e46d91cb68..be40cf412427a4c84ab39e331c62938b05e30965 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -4,15 +4,13 @@ parasilo-7:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-7:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index 2cec20c5900571833fb02f27ce2e490809b680b9..04f444d8a3851980fa970c006732111f5a04d57b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -4,15 +4,13 @@ parasilo-8:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-8:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index 024928d9c8f8a876185fcacc7e4c6ffadddd9f88..8cb1d624dcad09033ed59d3d8c1d7a1362fa64e3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -4,15 +4,13 @@ parasilo-9:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ parasilo-9:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index 6500bfcd670d6990a9e5d70e4b53143d0ac7fc9f..21ffdcce544a68e50702770d52729915654e8212 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -4,15 +4,13 @@ paravance-1:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-1:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index 1e61a0cba10aab47d0607058fb6653edb6963384..6a155b713ce8c645bf1b50068bf1e3ebd6a4e268 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -4,15 +4,13 @@ paravance-10:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-10:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index c3db24cc9b5c1c2dc3ae68d2aa8a15f5e4518190..be563caf8581b21f9cf4bdf4b9da8190263e42c0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -4,15 +4,13 @@ paravance-11:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-11:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index 300d04911ae560c4e2c8770f0eb95ff963c83880..0fd0b9730f84171dbf83947f66caac14175d22ca 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -4,15 +4,13 @@ paravance-12:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-12:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index bdbeccf8922f1377af05163503734cf88bc60792..58ed4785bf5f0a877629d4e4d8ccb46aaf0d912c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -4,15 +4,13 @@ paravance-13:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-13:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index 51730c05bca37821c96bb59c96621c1c40e83a2e..34724fe0eef20bbf4d37bd12d0616f85e7846396 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -4,15 +4,13 @@ paravance-14:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-14:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index 83a0bf46c0b7f526a047960bd8c1ac44ff93dc68..05d38d8dcc1bc38eaf400e0ea9c10ebd991a4246 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -4,15 +4,13 @@ paravance-15:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-15:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index a05980f348422dbd58b096369fba9d262fee7be9..2dffe66b859a03c20129e392f45d013f00266805 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -4,15 +4,13 @@ paravance-16:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-16:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index 135e867027b843e6aeb0982331347ae516544669..69bf72c26d623ef0beaa2cbee3b709f9aea2ca95 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -4,15 +4,13 @@ paravance-17:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-17:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index 21cd6fcf7594a8917a705c411f341d7eecb635db..51d75edf74703d270a8b81859a928b725d336dca 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -4,15 +4,13 @@ paravance-18:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-18:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index 46c9144b8d087bd712012bfeb05aca311d473ef1..1f8739081796ba1898b7bd6e1bdf4373768408d7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -4,15 +4,13 @@ paravance-19:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-19:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index 4fd435d4870f158b204def61b1160cb4c8428901..cc8dbc7e42fafc3f0659a6c31949a88397975bea 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -4,15 +4,13 @@ paravance-2:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-2:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index 77df577ce0a05ccc6f82e5cbf5d43e6cc911421d..3745b7f9c0d53c0abead69e8409967a285ace4ad 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -4,15 +4,13 @@ paravance-20:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-20:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index 736100ed955ca039f3842579afdcbe0d8f674619..7216d81fe6d0ad4df385861b4008e01da05dff5b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -4,15 +4,13 @@ paravance-21:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-21:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index 939acf271265f3eb6caf1a5342331980268ae5e0..6168ef95c44ce1c55f2213f9f0a92531d1cd1cce 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -4,15 +4,13 @@ paravance-22:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-22:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index 5827cfc10daca1025a63643656099111df2d2460..6f9273944da3ff86c3b0be27b557ae1aecfacc5c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -4,15 +4,13 @@ paravance-23:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-23:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index ba30ba24312afb6f84fcb6e351e410204ca22091..32ef0ce2d43df4b8fd7482adca2c16afc08e5d83 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -4,15 +4,13 @@ paravance-24:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-24:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index ed60c295310fbbcf39cd22c08ae4ac5e15c3c67c..08a753f4c7ad8d7dcdbf7b3f919eecb767d8b729 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -4,15 +4,13 @@ paravance-25:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-25:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index 0df70c53994e18e1a62a8b8264e52f37c8fff0e2..7ad696ad0b54260b152363c254aeb8ecb105e946 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -4,15 +4,13 @@ paravance-26:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-26:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index 063a50d4b68f26c5cf95c5271cf7b8ac397eca3f..3b71cef6302bf4fb92f4c3b2fdd76c051e640541 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -4,15 +4,13 @@ paravance-27:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-27:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index d4d7f7119dcbfed3d6420134b620d19aa400c8a5..544ed2e27cfe5b850a6d93efc08b12b1f4b1db7c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -4,15 +4,13 @@ paravance-28:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-28:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index b58cb525683ae11db5c0d492271ec291bdb6f73c..62a31bce0324f44372be3d4280c037df0c4d8893 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -4,15 +4,13 @@ paravance-29:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-29:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index 8c481a146df61490049aec6905a7a8929a758ab5..02a86180d37e76ce381b7e3457c1ebf9818aa1dd 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -4,15 +4,13 @@ paravance-3:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-3:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
index 4f40cba773c93f24b7381351749605c16f3b6355..6eb7779b122563e5af3785b6d89353ccb3f37c56 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -4,15 +4,13 @@ paravance-30:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -73,6 +71,7 @@ paravance-30:
     cache_l3: 20971520
     clock_speed: 2400000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index 857e659b1c9912988ffdb08419ff0190fe039a21..fb6bd0d872afe6d587229cca6362ade18bf84df6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -4,15 +4,13 @@ paravance-31:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-31:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index 3f819ab5a113d52058ce8b5657ae6a207a9a922a..b2e4777e829dc588199323d227668c14f9b6e07d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -4,15 +4,13 @@ paravance-32:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-32:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index 80e7f036b805cc7135a8418f06ab0ba688602156..ced62a827668bc2c19f7698b54cc32fd2ac266cb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -4,15 +4,13 @@ paravance-33:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-33:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index 9e5561e73a0d5e2fcab5ce9b2ee0224470dfb08c..a802523732c7518fdfba5c3a4a79804921bde4d4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -4,15 +4,13 @@ paravance-34:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-34:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
index a95aae977207bfe899a59e70f5c879b5d60c745f..9b0b876c6f81ac463e353d08668a49e1438bfc4a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -4,15 +4,13 @@ paravance-35:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -73,6 +71,7 @@ paravance-35:
     cache_l3: 20971520
     clock_speed: 2400000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index 835e5da16d702bfbeddc16964978921e7f644311..21103bb1a6387b782f66198ec24bb3a134bbdd03 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -4,15 +4,13 @@ paravance-36:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-36:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index 6203e18c837862b8013fa58c482b0da7ca2897ca..c0bc0a3546912de9e73482f8733fd3a9076afc2c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -4,15 +4,13 @@ paravance-37:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-37:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index f353b1e26a484cacd168626ad255fbb2924f362f..29b3c18ae8a95d52b885d783abbf4613466b0c6a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -4,15 +4,13 @@ paravance-38:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-38:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index b2a0b0224c4dcf5846b2ca972c5b288d7c34d7ff..551b6cebc58e1f29b9c44d95b3ee5446165b3dc7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -4,15 +4,13 @@ paravance-39:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-39:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index f0afb4873b51964ccea6a2d0d433b66b27af1300..5ebfc61543eb381c28a0b66a036fafc44faca1c6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -4,15 +4,13 @@ paravance-4:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-4:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index e125b3c5e7e90e03264135654e9ff2261a9337ce..75af194c0c0d4af92701cbceb14fdf8e2afac0e6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -4,15 +4,13 @@ paravance-40:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-40:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index 5fd3752a14a52c45feca49f0ecf000f2296dc750..e777e76211d8c7866ec7cc4407c14ade0cc7c215 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -4,15 +4,13 @@ paravance-41:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-41:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index dff56cbf837fde12b6a49efdf4ce316d9c4015ca..7251cb61b4f551f2c633998fdc5e05279f0c9759 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -4,15 +4,13 @@ paravance-42:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-42:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index 228e0abaff80bc4f76b35abc8449bedaa63277f3..2e5dfb8473a5f3afeed7d2c263c2a091aee311ec 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -4,15 +4,13 @@ paravance-43:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-43:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index ba8965435fe21ef31bc36b9e6311b81b3e74d80c..6059e2cb13b7c0a137dcbef13fe03a176c335e59 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -4,15 +4,13 @@ paravance-44:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-44:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 43da916da63db9923cbe79ceb117e1cbb3aa798a..95c50001308e0eae4d45c906eb7d399cb57fa54f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -4,15 +4,13 @@ paravance-45:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-45:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index 2a78ea0b7e9df9af336d66ca10594b201fbcd380..66091de2eb81ce0d19dd4f716897f8c5722215d1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -4,15 +4,13 @@ paravance-46:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-46:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index f27ceeeeb50fcd82e14434758e88958a463b4b5f..75c15f80143670590032e723f0d629ff22901444 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -4,15 +4,13 @@ paravance-47:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-47:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index ac63aee574deab85a27150c7f479285824294d41..b54b46a3bc22720fc19f0ed2f854d8d450a7f117 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -4,15 +4,13 @@ paravance-48:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-48:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index a1e66862b52c5c90b3593947fcdd045f9688424c..4985cb52600f71cea0aaed7b84d88eed63d5e714 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -4,15 +4,13 @@ paravance-49:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-49:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index 9dabe1cb978073f6cb748a7d415aa9d00b6e1b3f..362cc3f7852db70b8ebfa6198751b57833d6fdd7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -4,15 +4,13 @@ paravance-5:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-5:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index f50a2d0603114bf63db049a69ae6a42073a2dd62..62c4b375ad290a696e86151dd32aaf1aff92ab0e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -4,15 +4,13 @@ paravance-50:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-50:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index 89d0b06a2d976f9483e550f785e0cfc763490a21..534ad3c4b8b2cb60eaeee804843b4c212b7635b6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -4,15 +4,13 @@ paravance-51:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -60,6 +58,7 @@ paravance-51:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 8af2abddf9b5bf8e94716455ba26f32c2c5b921c..50c6e64baa33bc3db07825b637a2a254fc6f1716 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -4,15 +4,13 @@ paravance-52:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-52:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index 28d08a89dda649ee3bd270734a30479bbba22a4a..f461ed4eeb20ec8ddff47d586f007086bd1a6e6a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -4,15 +4,13 @@ paravance-53:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-53:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index 50a97bef38b5b9cc08336ab93b7f5b309bd8a1d2..cd4e8260ed621782fb6794a5b9daf7ca2a99d459 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -4,15 +4,13 @@ paravance-54:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-54:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index 2263ebc5fba2b5b82c6d51180dd6b01508ecae07..8154136420a7ec521150d56952f5d7483c0251aa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -4,15 +4,13 @@ paravance-55:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-55:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index 41035aefd5777c1725a8eb2f9bcacf27ec3704e1..caa80c2dda017e9069f83733c85bdee6b5a33ea8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -4,15 +4,13 @@ paravance-56:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-56:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index ec10a6ba6166ddfb20c5648aebeaec40b5c7abed..9e549d2e14a81867b960456f3a6e8064631fac1c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -4,15 +4,13 @@ paravance-57:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-57:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index 88ce8774dfd612ce72962bbe004624ec73eb4011..030ce5765e21621603fa1b8e061fd5144fd2c850 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -4,15 +4,13 @@ paravance-58:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-58:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index 452c86c471a11c6e5daed77611711776b26229da..0824724a697cb7b8008d9a5d42543e2b3bbc42ac 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -4,15 +4,13 @@ paravance-59:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-59:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
index bb3f0e9ca2cf9bc047be58a786a2e906a6a1e48a..02558de4e4b2e8a4aed65b1513433356cd270729 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -4,15 +4,13 @@ paravance-6:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -73,6 +71,7 @@ paravance-6:
     cache_l3: 20971520
     clock_speed: 2400000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index 813925f9ecdb954a43fe8409507937d067cb4edd..63fd0c2c86411a25b449ee690729e8982a61e1b3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -4,15 +4,13 @@ paravance-60:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-60:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index 99d104793e2b1eba7b4d9b3e174754f6f53eef8c..42ac89d46620100f3aea87de833bba22011cd0f7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -4,15 +4,13 @@ paravance-61:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-61:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index 8a4a6cedce63b6a45d5fec50aa8dd048549e6667..3138b728f3d24597572685c284527620e6fab4a3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -4,15 +4,13 @@ paravance-62:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-62:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index f882fd63fec4a4c755cc243c0aac4cddae539b2a..313d9b553e12aed011bbc96d59edd86b49df2372 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -4,15 +4,13 @@ paravance-63:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-63:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index b14b73994571635e6b70d7d5d8efd3f18ba4c33e..36d2553e8c3e05ee037eb3bae95c845442aa3fe6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -4,15 +4,13 @@ paravance-64:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-64:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index 3c0dfabad596697c4123115d7148d5fc80140911..ab0c6589b5d87eb0dc428a1f96f57c35a2eaefce 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -4,15 +4,13 @@ paravance-65:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-65:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index 18f53581bacc6fe1795a3075a56865b642fdcfdc..966b617eb307a94ff14bbf969b7cd9badb65c964 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -4,15 +4,13 @@ paravance-66:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -69,6 +67,7 @@ paravance-66:
     cache_l3: 20971520
     clock_speed: 2400000000
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index 9fca413704bc70f4730cba81c295a0ba70398f90..32c9de552d1070a162342afe41c6bc8fa24d621e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -4,15 +4,13 @@ paravance-67:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-67:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index 6a069129df5f1bfa269ab02b56f68d7e03622a9c..fcd17bf9aea02fced1e41c09774cedda22993a56 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -4,15 +4,13 @@ paravance-68:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-68:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index df4c4be5810b4cdd82e7054aaba3b8fa9b292def..5278fac256eb97d6298749df31dec03ff5daf934 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -4,15 +4,13 @@ paravance-69:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-69:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index fda21b6e81199938ef690f46f5d74675f697d715..014b15e19abc4ab289c3e3d79b297483e47f9c81 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -4,15 +4,13 @@ paravance-7:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: true
       cstate_enabled: true
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -72,6 +70,7 @@ paravance-7:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index 7ddfa3221907f98dbc22f703588abbc8c424b16e..b8d447626d4de4b738743a64675da416aa39e629 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -4,15 +4,13 @@ paravance-70:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-70:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index 92a27cdb39f8a3a8b69ca97105c07bdf2b6bfaf4..cca57507ee5ff4f81a0551f5eb95c7168d6efdfa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -4,15 +4,13 @@ paravance-71:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-71:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index 6e87736fd95534e5ec3bfc9ca60843e64d04d11c..b11ac259facd8df63ca88444eacdf3e40b27bfb5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -4,15 +4,13 @@ paravance-72:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-72:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index a937f84d2e18cbe2622b6cebfac0db47d3f93c66..b0ef8c333654fdb42e670f3db113a4636a095e79 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -4,15 +4,13 @@ paravance-8:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-8:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index 1ff56df87e521271e9c4f797fbf13a0de2d31f5b..7fbe597a4ca44f0f6af38b18b7395953708e07e0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -4,15 +4,13 @@ paravance-9:
   architecture:
     nb_cores: 16
     nb_procs: 2
-    nb_threads: 16
+    nb_threads: 32
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 16
   bios:
     configuration:
       cstate_c1e: false
       cstate_enabled: false
-      ht_enabled: false
+      ht_enabled: true
       turboboost_enabled: true
     release_date: 08/28/2014
     vendor: Dell Inc.
@@ -68,6 +66,7 @@ paravance-9:
     cache_l2: 262144
     cache_l3: 20971520
     ht_capable: true
+    ht_enabled: true
     instruction_set: x86-64
     model: Intel Xeon
     other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
index 63b026e7d19aebf1781d6dfd819d2a7ec23d513f..e38d6749d86fddf94ae9a170375a8150eb19b3b2 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
@@ -6,8 +6,6 @@ sol-1:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
index 6d52554d4975374dcafd5f169edb591bb0293e69..4facc93e4fc2431de2d0116ce0de7945b2a9069e 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
@@ -6,8 +6,6 @@ sol-10:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
index 685c7787db7e997f8b822899748fdb3ae87ce786..e51c79c1a0d309bfe4ff1fb3c71bc10a0abbc5ac 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
@@ -6,8 +6,6 @@ sol-11:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
index 1e83ad1af343da1033ee5b9da7db7e5945412d4d..1b401aaae233711b556483b4b53f10df3be4fdb7 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
@@ -6,8 +6,6 @@ sol-12:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
index cc2d9a41a8cd8a0123eeec97911c4cfb4ca51b16..3d3714069fcb7149492dff9074b779b7f40b04bb 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
@@ -6,8 +6,6 @@ sol-13:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
index 12d77c5fb810a8e062c174f4869a299f4c55b85e..f22eb72d04283c31318871d8f7468f4074976cf9 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
@@ -6,8 +6,6 @@ sol-14:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
index 0365cff6e03afeec0bcd7966897435085cf7185d..e2afd6cd1449d5e9e2e89662ad5f11ce245f22f5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
@@ -6,8 +6,6 @@ sol-15:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
index 95570bb0be287db77d8e8a4c3d9dfdc0b7447adf..c2bd1af403f688d03598888cee6fa502114b4240 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
@@ -6,8 +6,6 @@ sol-16:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
index 284cdc1dfc2c51164f615f440eb085edff40dcb5..0fa4a64a9c59321d4f41922f4587650d921a0b74 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
@@ -6,8 +6,6 @@ sol-17:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
index 775d27f44c5ce86032707a0c439293d5e777f67d..a703efea97b51fed54119a349c2aa92c25c3ed7c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
@@ -6,8 +6,6 @@ sol-18:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
index 51ed4f4e342acbcb830204098b0ae4e5afc77d6e..74041a6521919c02e6f70f22c4c665c5a5b8679a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
@@ -6,8 +6,6 @@ sol-19:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
index c9a7f8f5ec5a1c48220acdc5f8fa8218724f93b4..8dfa1b5d605eebce008e16d09e19c7a6e2939bc3 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
@@ -6,8 +6,6 @@ sol-2:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
index b2427c4e147af27a147c6131ba49b5edb83728b8..551e12d36c0e7f8a14b3bc0496bdb730d38c2ee2 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
@@ -6,8 +6,6 @@ sol-20:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
index 078027ac082cc3e1290c659d161902d7542d1188..828d4a5745611ff9de9cb7a77f3e1e622d01359a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
@@ -6,8 +6,6 @@ sol-21:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
index 9431d38fc40226a83880552ca0e960ecaa9d5cab..11438f7aaefdacb6335b89bdc10a629f973f930b 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
@@ -6,8 +6,6 @@ sol-22:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
index b9302d0be4345e6b0e1e50067c7cf200705e170c..98bfd1849ba5ee10466dd863508b6d17b8af0b6c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
@@ -6,8 +6,6 @@ sol-23:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
index 4b0c8a3bd0cb8c31508c485742beabda5e2a4a71..f9a7a63ac25532232c87cb5fc436f0ff3a7004f8 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
@@ -6,8 +6,6 @@ sol-24:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
index 700516bfa6bb53a3b6fe2645c8b6000b0fc743f6..805519f45c28b960eec9308d521f193c3860051a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
@@ -6,8 +6,6 @@ sol-25:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
index 25d765f304d8b3e5f29e574c429df9004d8dc6e6..0c3060d9c95afdad1cf953a8fbac3b2978613b78 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
@@ -6,8 +6,6 @@ sol-26:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
index 7b6a57b42b1b41b089b876315af62dea1db884e6..d8e6dececb7ceba8011ab1aaff2ff3dc98d400f5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
@@ -6,8 +6,6 @@ sol-27:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
index e0e00756ceb099e75bb654c854e7ac4bc671c41b..e825fab34dc53eee458b730a65aa4ad983340a5f 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
@@ -6,8 +6,6 @@ sol-28:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
index 5beed0d4971a7290138646bed3749999ea0a05e6..812fc69788c55e60752f560bd91e3ad6dc5f8853 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
@@ -6,8 +6,6 @@ sol-29:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
index e1bef360143624f9fa701ac93172faf8ef995f27..4b0e2abc968478eb5c4ca9970b25d118855f72e2 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
@@ -6,8 +6,6 @@ sol-3:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
index d69aed1ca7b6656b0f9c9512b5a36314a225ea09..7f458e81ae507a6011e8379399f01d38d420be04 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
@@ -6,8 +6,6 @@ sol-30:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
index 9e1e7befb7b5659c6d138aee712b950cb4a61882..f8b0bef2c44517976b57eda5749232fa924a765a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
@@ -6,8 +6,6 @@ sol-31:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
index 4884e71a3713b176d264c4c232f2affcd512feb4..9c529472c0b7837bd7458d062d03c7e4a086e84d 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
@@ -6,8 +6,6 @@ sol-32:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
index 57cb0114805de50ea3be46ce5d9ac43032f6b4f6..a405c41eaad0aa29bc37654e1d33e9681e3cbe0e 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
@@ -6,8 +6,6 @@ sol-33:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
index 15b59a562e2615eff7eb72ecc5505a22afb42832..3f7c5a19ac496b8ec7a073f28a0b5a9c908bbb54 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
@@ -6,8 +6,6 @@ sol-34:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
index 52dc0d3621ae2f6057f71f446c6409d4b3108944..e21d9e7a95e5dc27329b2a9830a1d645fc4f153d 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
@@ -6,8 +6,6 @@ sol-35:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
index 7f1454aa729eac2606e8e7f73002e9becc0cb4e6..27042fcffcc6fc5127dac1e3d2427c0da8ceaac2 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
@@ -6,8 +6,6 @@ sol-36:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
index 8cfb25270215f87e35688c84070ec81d1cc138d1..f6380662e0acb35d4b36af9654d7ce5c3d2c15db 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
@@ -6,8 +6,6 @@ sol-37:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
index 2955b26a83d85a3040b9c526d93bf282a50bece8..7996c17540e1946bdc2f1ac3c27a0f112f4b8774 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
@@ -6,8 +6,6 @@ sol-38:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
index a73a4a87caa0d3d558dbf18eceb3847029de9d3f..7ec32c317be71376c8cbf37fd03d2f6b891d43db 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
@@ -6,8 +6,6 @@ sol-39:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
index a1190db32b7cc751722d3c73faca4e2ca8d211cb..5ec91799e17561e242ed199e91eae1fe007d9354 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
@@ -6,8 +6,6 @@ sol-4:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
index 3c3fb40ab2046cd2a01c6f03d5f211f810cbd01c..d919439e6a3ac314e070b8be9baf049ca28d80f7 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
@@ -6,8 +6,6 @@ sol-40:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
index 06b453c9c8750543bf7b9c1cd0d2a5980ebb414d..2791ef91b7d4d282eae47d2d9e8cf0c2eb7c1cfa 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
@@ -6,8 +6,6 @@ sol-41:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
index 4e9bbdc37b273116a625ca7edf1e6190eedb4361..50845c93edfcdfd7d5576390c9920d1b988af617 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
@@ -6,8 +6,6 @@ sol-42:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
index 6b8027a8113e99c4cc64de73b9ed3a8f8c1a0fd9..2c48578813dac883f205c47badff2fed9936aca3 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
@@ -6,8 +6,6 @@ sol-43:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
index 92017f9bba8b1c085537110e67d71900eab5169a..2407e659f9b5c2ca73582697256cec87f62d9610 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
@@ -6,8 +6,6 @@ sol-44:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
index 787d8a2d91fcf5f2b0bcf84fa3be6c487d70abf2..ff2ac23e99250c1a1511616022960175c7a3adc9 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
@@ -6,8 +6,6 @@ sol-45:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
index ff16b1ec5d3fc50b65a930688063cf4a782f668a..bed7f7dd5e8168ba3d9e80deb38554214005b0cd 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
@@ -6,8 +6,6 @@ sol-46:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
index fe6cc9b738f8c56f5da18cd678c842902f10567c..ec37873c4880aaa25d2c8e76acb5ae25e39626d5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
@@ -6,8 +6,6 @@ sol-47:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
index 58dc4ea88d7960074207ad4153dc47c24aa854e7..bee91a04355000379a8cad3b1afd91ebd7effcb0 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
@@ -6,8 +6,6 @@ sol-48:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
index 9db2c30599826d7b1d3349a9bc79583e9f8486d6..7232837725fc1667b87abbc899227c24fafd8ffa 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
@@ -6,8 +6,6 @@ sol-49:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
index 1df9f2490c519daafe4c5b464533c2ed10150792..a3d8f92482001b61068cd02f62e2ee49977ae2dd 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
@@ -6,8 +6,6 @@ sol-5:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
index 74f9be8865f7b112e54093f6e4cab809895fd672..d9438beeed7fb67c9f9303fe13c1b75860dadeb5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
@@ -6,8 +6,6 @@ sol-50:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
index 4d7c0b2d37fa586608878c31a537e3ef160994e8..c9c3d6ea001b1ad2a3d265eeffa5e41278807a00 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
@@ -6,8 +6,6 @@ sol-6:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
index 02aeca86d12971f898e3da23d1b58c5ae3d10834..b568a8cb2e7709b9df3cc0e0c511805640298315 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
@@ -6,8 +6,6 @@ sol-7:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
index 32f2b98ad8d26faf0c1cc0e8fe954449e66ba8fa..52595da167b1ed2feeb5641eac9b4e9bbbcb3975 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
@@ -6,8 +6,6 @@ sol-8:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
index 059eb9825850a79ea90700007fef3efd4d41493c..9d0af5febec71c7fe3188d3571e26b087ed43ac6 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
@@ -6,8 +6,6 @@ sol-9:
     nb_procs: 2
     nb_threads: 4
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 4
   bios:
     release_date: 12/13/2006
     vendor: Sun Microsystems
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
index 6cc1917480b6fa95be07b4534c1a62a25372a66a..48487aa2fa81064b7e557f81ab4e0fe27147a325 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
@@ -6,8 +6,6 @@ suno-1:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
index dc5e958141187d393805bf5413db2ca7fad72597..6fe7abb92059491648e8083ffb2e4b7aed712773 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
@@ -6,8 +6,6 @@ suno-10:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
index cc5a96f97bafc7c1482f0a40ddbcd3307eec9539..4e0f75d62868f4acc1aa9c39c2a96dc4eec516e1 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
@@ -6,8 +6,6 @@ suno-11:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
index 9e23cf7a1774b1582bd48559361408fb82c733a6..f485a235f0fb009db0af4415efad97ac8f18c89a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
@@ -6,8 +6,6 @@ suno-12:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
index 5a352853aedae5c1869473a7f4fe7356100176f4..aec84a2ae5ef117867c6c4b3f8724a01e45aa769 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
@@ -6,8 +6,6 @@ suno-13:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
index 4d77086ac87e88fb038f6d0ea4d19327a448dd63..4385011f4f0d9c73a5bd8a873a9fb91a59b86f1c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
@@ -6,8 +6,6 @@ suno-14:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
index 76acd1a308f1f8c2cef717330b16be4fd2312773..5720949067ef893dd03df05342bdd590949f4e10 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
@@ -6,8 +6,6 @@ suno-15:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
index 100f55463f2525c1dd7e8f669f5c0455a0cc0010..75aa635a46c85806adee4657b10c140d1269a9f1 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
@@ -6,8 +6,6 @@ suno-16:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
index b76b428870e4fb3e28b17de0ec9dea3bb060f573..e3ff55314f8ba928e38a552b9efed28df81921b9 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
@@ -6,8 +6,6 @@ suno-17:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
index 7e68412cdd13c8498fb505f550c02857051852fa..2d10167f6d472e4d0a31d46eb8b63db2911bb835 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
@@ -6,8 +6,6 @@ suno-18:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
index cb76b3aedfe75815d9c23a6bacd26729cf27afc5..c7ca5a0856f50182a79732d7aea50a71a54a9d4e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
@@ -6,8 +6,6 @@ suno-19:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
index 8274fbabedfa44ed77007a5916f56a8e076f9103..800a9084c3213018803bb19383f9ea488436afd4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
@@ -6,8 +6,6 @@ suno-2:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
index d4c0215774befde27b21039504e5484c329e6e01..fbee66660ceea083614e0b12cefa46c05fea1b17 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
@@ -6,8 +6,6 @@ suno-20:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
index 98402afa56291f31feb2212502dbb47282b87404..ea06ecf6b0d105dd9e24d0ea60c72b684bde7529 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
@@ -6,8 +6,6 @@ suno-21:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
index f6976f32fda92c83efc2b7c2e10e0dc290962cb8..806a0aa9323d49cdc1c53e177e1ba552dc89af3c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
@@ -6,8 +6,6 @@ suno-22:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
index 38976b8f38aa9deced2043a972e0c495a3e4b844..b81112f54b9688ba74d5acff78d447cd8afff088 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
@@ -6,8 +6,6 @@ suno-23:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
index 6be9354a3fe99a1a9e4732a2c5210205d01c8362..205b244751b5c7328af62b869d484fe7c19e7aaf 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
@@ -6,8 +6,6 @@ suno-24:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
index 7b243b86471dcddbe22101f255a23efc3740c7fe..4b0078a1e36bd9c4e89877f26fc34f41a1f2e2fe 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
@@ -6,8 +6,6 @@ suno-25:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
index 3d8b90d6ed9ff0b96da919bcb5b11487c44032bd..0a3073ede4bdaa270ee035279c8f8bfb77dd9fe0 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
@@ -6,8 +6,6 @@ suno-26:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
index d34c552350d582ff376385c389c10127dcec6a76..22d72d2c6fa2978d6aa90c7f8fe4e37b024c9cd0 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
@@ -6,8 +6,6 @@ suno-27:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
index 669aaa664d4e80eba8ee436ff467195cdfb4f231..525c1c95f9571377a472d527acfb4a2a194eee0b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
@@ -6,8 +6,6 @@ suno-28:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
index 5a98c02c41785d9f95524e093f3e3d49eb7e3104..02fa13a9fb2a4261a7d586123b227c1248b175e1 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
@@ -6,8 +6,6 @@ suno-29:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
index 8ff47e994f9c9f6b221d62554b2c4e1d13959905..aaa0d70a1ddc67a71e47ac1f337c889b8e0c2143 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
@@ -6,8 +6,6 @@ suno-3:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
index 9eccbaf5efd1f26fe54fe4f6cdd8e056cc6b2f9e..747bf14e30eacfcc15b25e78eb998ee28864391d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
@@ -6,8 +6,6 @@ suno-30:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
index 9f57da9645842a528fa3e978ac310e68adf8dc2e..17d19448051067cd1b89936891494d06d1c633bb 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
@@ -6,8 +6,6 @@ suno-31:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
index 1329e19a835cb8b9ed883a0654ba85f1b2e81b7c..da21325c3855d3a4f94ba099393513493b88d32e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
@@ -6,8 +6,6 @@ suno-32:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
index 9bb5acb4e6b46ddbb6bc297257230ec62acd92ef..b7b3d09a645ccaeee36044f044eb3cafd0ef199c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
@@ -6,8 +6,6 @@ suno-33:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
index 945abb68bd4515391c284a0e94715cb9882e5866..346efb35148e9c4c3e5a93b1d85c7fd29434977a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
@@ -6,8 +6,6 @@ suno-34:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
index 8f5618f1b5f3404bcf7457181f48a943722cd24c..d2a37d86dec1467561d1372351e79f70d6aa320d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
@@ -6,8 +6,6 @@ suno-35:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
index 597cc23c64a9feb48789aae1e2769179de690ee2..0e74264401243ec7665647cc700e3fcd82030f98 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
@@ -6,8 +6,6 @@ suno-36:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
index 957f5b6a83bbb8ab512f653d7531a5520a2b6973..8096a2bcdf881a8a7d5262a5e2366d361a065098 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
@@ -6,8 +6,6 @@ suno-37:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
index 74396e550aaa53c1d9ac126d1676c98aeacce579..7b47b953f00ad85e42844ce886d7e54bc1ca60d3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
@@ -6,8 +6,6 @@ suno-38:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
index a11e0875761049d40be5028489fdf633629c0585..0a533def691f1fb20af7c8544f5f9546fa1c93b4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
@@ -6,8 +6,6 @@ suno-39:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
index 7d8ed8f711c40e043b3eb1e7759660b24283670c..266c6c44c29ed14a6eee899b44892a30a206620e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
@@ -6,8 +6,6 @@ suno-4:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
index f7082f462ffbc70238de69807a45b2e5d66c75e4..514bb6ae31a828e2f4705e377f7f19dbb1e5576d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
@@ -6,8 +6,6 @@ suno-40:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
index 4cc3b4572b26cefbce5bfa51721444887f4d8b8b..dd078402871d5168f08145e2047549a8de714003 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
@@ -6,8 +6,6 @@ suno-41:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
index a069e0eed42546c7ed4425674bf215298373e4a7..bddea4ba3334c6b2102714e2a74b8ec9d4061a0f 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
@@ -6,8 +6,6 @@ suno-42:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
index 8a42e2f9adda9d7c4e40dba42fdec3187e3b8085..254ba054e46c52690eea11aa59c91406ed3ea944 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
@@ -6,8 +6,6 @@ suno-43:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
index 99b50e63faf94e64dce7f002d273a9c91f2d0f63..3cdaf6cd40af2d755a5d612c76ec8a22f2e83eaa 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
@@ -6,8 +6,6 @@ suno-44:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
index 57f213cf136cc47c274b9b16b76c2c4a4e4d4d67..e9aa1d00be07fb2a0be0e55a6774cac3b63efe7e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
@@ -6,8 +6,6 @@ suno-45:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
index 729ce2c7810bead30b6eb01f2248cc55cab8718e..e63dbd3c561eae0bc75b3557a5ef4d36d6fece90 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
@@ -6,8 +6,6 @@ suno-5:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
index 30a1f9508ff4ed79f19f9c11c4af3d2ebfab3a5e..e45b141c2ed25caff6d3b5bfc97447c35fffcbd6 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
@@ -6,8 +6,6 @@ suno-6:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
index e90e48a43975d5b2879899373dfcc369ac3557bc..f67947e6b3c58f1dadcef0e8ba39bf2d50296702 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
@@ -6,8 +6,6 @@ suno-7:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
index 65a32ad54fa7c32129ca18aa0e2199fbada07642..20fa28074968598d70222919fc1f1feaeee170fb 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
@@ -6,8 +6,6 @@ suno-8:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
index 7ecbda463cc594e742e06245578e7a4d23fb68fb..f47756f9acccba8323541920a65ef5c29a98579e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
@@ -6,8 +6,6 @@ suno-9:
     nb_procs: 2
     nb_threads: 8
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 8
   bios:
     release_date: 07/29/2009
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
index 2211315f23c7520f20371d4201c15d1dc8dff0e4..d8c785da8426bace5c3549603abf48ce79de782a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -3,8 +3,6 @@
 uvb-1:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
index 4ab12c407933889289d590343423652770028278..37f1b57ac67ce81c517aa37ae43217e95d5ec680 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -3,8 +3,6 @@
 uvb-10:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
index 61be2bd5d620df7cbeba4589449b0b9c2e1e45b2..c641c790bf2f6dd37e757cca0de0e62584ca0459 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -3,8 +3,6 @@
 uvb-11:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
index 932688c61b6956aeae3c1aa3cc2053205f77dc42..2edbd0ef9218a18ad82e295416660be4c6b7682b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -3,8 +3,6 @@
 uvb-12:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
index b9a07481396b01cd0b95108ec48389533f196dd9..10ce1c59699b37f63909e225777cc8d393ca175b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
@@ -3,8 +3,6 @@
 uvb-13:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
index da1b66747e30e719eb64ac9e4a9d48a9b136e895..2ef44f5fd3fbaa7997f1971afda8e816a10c0cba 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -3,8 +3,6 @@
 uvb-14:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
index d57729115c62d3d949586a6c54b14a8a9d75e50c..95d8923960b2534048082eda093a8dfce061770d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
@@ -3,8 +3,6 @@
 uvb-15:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
index 92d7105f933af99d1e2ef4bce39a826941e4ce8f..1fe8a616edb9724b811f31f4834565014b06e79c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -3,8 +3,6 @@
 uvb-16:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
index ce5617a894ad401519d7f7e0fe81c00c56f8ca3b..aaad6e98e38bb8d2ea3fc6d2ca8df79bb63892f8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -3,8 +3,6 @@
 uvb-17:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
index d388aa7f779d0524ccf147b8ef6a35178d0167fe..d73503c5b86b3482ab4713ba045079f6ef81cdfa 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -3,8 +3,6 @@
 uvb-18:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
index 5ae7ea97bfbb6fea6f898ff398f8bd695410c7cd..a0f550b12e25aee01698e63d6f099d7f7e56d4f1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
@@ -3,8 +3,6 @@
 uvb-19:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
index 38586a7c2558985d4a726ad6b98acc5cc1c0ece9..9e2eb9fed42d3cb0a0f795c64815f8fb433a8602 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -3,8 +3,6 @@
 uvb-2:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
index fa1231c3f4cfbd8f46d18c65d640dbcb56c3edac..a78e958008ba9608537363001cff126d9790758f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
@@ -3,8 +3,6 @@
 uvb-20:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
index 8a55d8a286d2237185647ecbc4cd3980cbff1812..edc2338c168fc0b06954625c441ca8b4ad84d796 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
@@ -3,8 +3,6 @@
 uvb-21:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
index f625ea6d7acadbfff2ac2040332280e0b88dd4e1..6deb27fce005860def6d67cc491354d46c2389f0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
@@ -3,8 +3,6 @@
 uvb-22:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
index dd45fd181d907ce758438ac8c84335f5c20a1136..11cadc24e5a5fa75616c7e3ba58038af45c29c44 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
@@ -3,8 +3,6 @@
 uvb-23:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
index 1a781dec81e79da4d3e874614d9ad3383441c26d..a063f879b3b3472438352952c2163b34d44a658a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
@@ -3,8 +3,6 @@
 uvb-24:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
index 0a4903e0990953450407a0e2c87d9216d922fbdd..20b536e0d3448ab32652f2160281f591dadb2208 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -3,8 +3,6 @@
 uvb-25:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
index 8892df2cc6b7cdc7b1912a81421df7c0885b96f2..5845932edd173d322ebc7df0e912901c3e48945c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -3,8 +3,6 @@
 uvb-26:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
index a23904dbae62d67b55fe8ac46a33b154c1f4ba85..a2ff96836541334409c4147144c9f69867fd329f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -3,8 +3,6 @@
 uvb-27:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
index f4fef13e0004da2742c02f96d804a17eea5b82f3..e3cdce7ba1ea1fe7ff6a7c4ad6759a19b6bc6970 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -3,8 +3,6 @@
 uvb-28:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
index bc3e4abb526991337cc46187eedf00497dead0dc..5f8b4a141a39e0cd52d38f930e969175a49797af 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -3,8 +3,6 @@
 uvb-29:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
index 59bd1679b65ee67c4afdf697affd1a72af9080eb..ac32e0297142be59789b5620bae66f81a1db5827 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
@@ -3,8 +3,6 @@
 uvb-3:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
index 47eed62f24c1f1abc64b8793625b19df3741ea3b..154f551354085357a8f53c9f7c80256eee2bff7a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
@@ -3,8 +3,6 @@
 uvb-30:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
index d911b578cfe840646555f7de4e4a58f16f6864b6..27de3fd7ecb15b87ae69294ec77f4f753d62296d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -3,8 +3,6 @@
 uvb-31:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
index dc563cdcc7499094bcd400c10e1b82ee810f4e5b..6c2ac35ad0aa3c9493b160951078b3760a1c88ee 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
@@ -3,8 +3,6 @@
 uvb-32:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
index a2c51f5eb617b20efdfae9b65d55d75a2facbb68..a2a149d2e3bd57412a8922cce124cf319ac2953f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -3,8 +3,6 @@
 uvb-33:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
index b32f90cfb76ca242f5bd5a15593336f4dccbd348..72cf9759e3ecd289ef27729b32d76a59494ce21b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -3,8 +3,6 @@
 uvb-34:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
index 6bf885d776a9e86dd1657d3fb6be164c6a125d5b..1df364629a560a7a6adf6f213631a87164ededa9 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -3,8 +3,6 @@
 uvb-35:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
index 7bab239bb804807d95874f07f410199081cfd09e..102ef7931c3d7d87eb3bf1953b12b729ee98f9a6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -3,8 +3,6 @@
 uvb-36:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
index 04111ea2a88b6e92df5454e89daa072430ae2af0..457ebb1031698a977119382a191e7385672221a2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -3,8 +3,6 @@
 uvb-37:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
index c5a36354ce7ea91a6693e9b89b332c538961cfba..a87b05bac3e3dd3a687b8f32fc3de9b524e3eaa2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -3,8 +3,6 @@
 uvb-38:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
index 4c32161ffb9388cb3651901f849e32a71554db1c..a50a519e669e208d911884b1cb05e6ba4a45540b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
@@ -3,8 +3,6 @@
 uvb-39:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
index b721db3b786a9235c1b32a68663a8fac2b8b01bc..5486a6c057dbc36cb8182e66e29649eb3512af26 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -3,8 +3,6 @@
 uvb-4:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
index 61c00ddc59651f31656af7b45a2180b05bbec8a1..448973ec24da6d72ab6b7ab43eb81d15d8d48942 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
@@ -3,8 +3,6 @@
 uvb-40:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
index e49fab2a1c399c30bbf3cf85455b5c7530481955..9372ec20509e4a513f60585716aabf7fdd58d73c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -3,8 +3,6 @@
 uvb-41:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
index 06656b7911a8e5495ec1eaa95de385d271576b0e..02ac66fca80e80360c5bf59a54c42b225c566479 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -3,8 +3,6 @@
 uvb-42:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
index c165bfdd4141244733fb5e305567a5c16bc96c12..dbeae55b5159572c61d657513b9eb1af4bb6158c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -3,8 +3,6 @@
 uvb-43:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
index 446b8dcd8d735364a5c072310d59950e5e70ed58..e462a6b255e275374a2cf24ff0effa541abf5bb0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -3,8 +3,6 @@
 uvb-44:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
index 54d31dc8def058cb418ab5dd96e79d50ccdde9d4..75e8647b1cf72f2708971e2b6467e8b6bce32760 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -3,8 +3,6 @@
 uvb-5:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
index 089524022e8409c1abcec23960c35d8d7ea8ad11..fe97cd250cc57ddae3e9f2e27ced1425bc138f53 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -3,8 +3,6 @@
 uvb-6:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
index c52734c11b4c3d5d3308e27ee714aa3d215f5e78..f81b9c24484cc1daa1bef00c8f1d97646e4209d5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -3,8 +3,6 @@
 uvb-7:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
index 66053095c846e92171bd2e638a2beb24dc364b0c..0fddb0b520ff49dcc66e8102d45edede6caf644a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -3,8 +3,6 @@
 uvb-8:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
index 70b848dba3103bcf965686326f78283b536cb19f..3267be750fb4ade9bcd4e56104ba3a1fd5175391 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -3,8 +3,6 @@
 uvb-9:
   architecture:
     platform_type: x86_64
-    smp_size: 2
-    smt_size: 12
   bios:
     release_date: 09/17/2013
     vendor: Dell Inc.