From bb1615f225b020235d7e9ac4020c22d735455644 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Wed, 16 Apr 2025 09:07:45 +0200
Subject: [PATCH] [Sophia][Esterel31] Add cluster esterel31
---
.../sophia/clusters/esterel31/esterel31.json | 14 ++++++------
.../clusters/esterel31/nodes/esterel31-1.json | 22 +++++++++----------
.../clusters/esterel31/nodes/esterel31-2.json | 22 +++++++++----------
.../clusters/esterel31/nodes/esterel31-3.json | 22 +++++++++----------
.../clusters/esterel31/nodes/esterel31-4.json | 22 +++++++++----------
.../sophia/clusters/esterel31/esterel31.yaml | 20 ++++++++---------
.../sophia/clusters/esterel31/nodes.yaml.erb | 8 +++----
lib/refrepo/input_loader.rb | 2 +-
8 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
index 64396142b8e..9b24415d5e2 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
@@ -1,9 +1,9 @@
{
- "boot_type": "uefi",
- "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+ "boot_type": "bios",
+ "created_at": "Wed, 16 Apr 2025 00:00:00 GMT",
"exotic": false,
"kavlan": false,
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2020-08-10",
"metrics": [
{
"description": "Default subset of metrics from Prometheus Node Exporter",
@@ -51,10 +51,10 @@
}
}
],
- "model": "Cluster Model",
+ "model": "Dell PowerEdge T640",
"nodes_count": 4,
- "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
- "priority": 197001,
+ "nodes_description": "1 CPU Intel Xeon Gold 6230R, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
+ "priority": 202008,
"queues": [
"admin",
"testing"
@@ -62,5 +62,5 @@
"redfish": true,
"type": "cluster",
"uid": "esterel31",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2027-08-10"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
index 8b213499e6d..5db054a9fcf 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2020-08-10",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2027-08-10"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 67200000000,
+ "node_flops": 4838400000000
},
"processor": {
"cache_l1": null,
@@ -86,15 +86,15 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2100000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Cascade Lake-SP",
"microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "model": "Intel Xeon",
+ "other_description": "Intel Xeon Gold 6230R CPU @ 2.10GHz",
+ "vendor": "Intel",
+ "version": "Gold 6230R"
},
"redfish": true,
"software": {
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
index 25ea6495d6d..c0d5044d936 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2020-08-10",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2027-08-10"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 67200000000,
+ "node_flops": 4838400000000
},
"processor": {
"cache_l1": null,
@@ -86,15 +86,15 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2100000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Cascade Lake-SP",
"microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "model": "Intel Xeon",
+ "other_description": "Intel Xeon Gold 6230R CPU @ 2.10GHz",
+ "vendor": "Intel",
+ "version": "Gold 6230R"
},
"redfish": true,
"software": {
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
index 0b2ddafbb3d..1beb8f33e19 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2020-08-10",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2027-08-10"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 67200000000,
+ "node_flops": 4838400000000
},
"processor": {
"cache_l1": null,
@@ -86,15 +86,15 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2100000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Cascade Lake-SP",
"microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "model": "Intel Xeon",
+ "other_description": "Intel Xeon Gold 6230R CPU @ 2.10GHz",
+ "vendor": "Intel",
+ "version": "Gold 6230R"
},
"redfish": true,
"software": {
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
index db7ee149224..9060890578f 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2020-08-10",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2027-08-10"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 67200000000,
+ "node_flops": 4838400000000
},
"processor": {
"cache_l1": null,
@@ -86,15 +86,15 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2100000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Cascade Lake-SP",
"microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "model": "Intel Xeon",
+ "other_description": "Intel Xeon Gold 6230R CPU @ 2.10GHz",
+ "vendor": "Intel",
+ "version": "Gold 6230R"
},
"redfish": true,
"software": {
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
index 56cb2035107..b2de3d82ed5 100644
--- a/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
@@ -1,24 +1,24 @@
---
-model: Cluster Model # TODO: change this value.
-created_at: 1970-01-01 # TODO: change this value
+model: Dell PowerEdge T640
+created_at: 2025-04-16
kavlan: false
-boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice)
-exotic: false # TODO: specify if 'true' or 'false'
+boot_type: bios
+exotic: false
queues:
- admin
- testing
nodes:
esterel31-[1-4]:
chassis:
- manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
- warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
+ manufactured_at: 2020-08-10
+ warranty_end: 2027-08-10
supported_job_types:
deploy: true
besteffort: true
max_walltime: 0
processor:
- microarchitecture: Haswell # TODO: replace with microarch name.
- clock_speed: 8 # TODO: Replace with clock speed.
+ microarchitecture: Cascade Lake-SP
+ clock_speed: 2_100_000_000
network_adapters:
bmc:
interface: Ethernet
@@ -35,7 +35,7 @@ nodes:
interface: SAS
by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
software:
- standard-environment: debian11-x64-std # TODO: check that architecture is OK
+ standard-environment: debian11-x64-std
management_tools:
- bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm)
+ bmc_vendor_tool: racadm
nodeset: esterel31
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel31/nodes.yaml.erb
index eafad48a26a..53f63a8029f 100644
--- a/input/grid5000/sites/sophia/clusters/esterel31/nodes.yaml.erb
+++ b/input/grid5000/sites/sophia/clusters/esterel31/nodes.yaml.erb
@@ -43,10 +43,10 @@ nodes:
size: 8 # Fake size, will be replaced by g5k-checks
technology: dram # Common memory technology, will be replaced by g5k-checks
processor:
- model: Unknown # Fake model name, will be replaced by g5k-checks
- other_description: description # Fake description, will be replaced by g5k-checks
- vendor: vendor # Fake vendor, will be replaced by g5k-checks
- version: vendor # Fake version, will be replaced by g5k-checks
+ model: Intel Xeon # Fake model name, will be replaced by g5k-checks
+ other_description: Intel Xeon Gold 6230R CPU @ 2.10GHz # Fake description, will be replaced by g5k-checks
+ vendor: Intel # Fake vendor, will be replaced by g5k-checks
+ version: Gold 6230R # Fake version, will be replaced by g5k-checks
cache_l1d: 8 # Fake cache, will be replaced by g5k-checks
cache_l1i: 8 # Fake cache, will be replaced by g5k-checks
cache_l2: 8 # Fake cache, will be replaced by g5k-checks
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 00e5e9149a3..cccfb4ef6a1 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -744,7 +744,7 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid)
case cpu_name
when /Silver 4110/, /Silver 4114/, /Silver 4214/, /Silver 4216/, /Gold 5218/, /Gold 5220/, /Gold 5115/, /Gold 5118/, /Gold 5120/, /Gold 5220R/
return 16
- when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/, /Gold 6238R/
+ when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/, /Gold 6230R/, /Gold 6238R/
return 32
end
raise "Error: unknown CPU flop per cycle for #{cpu_name} (cluster #{cluster_uid}), cannot compute flops"
--
GitLab