From f84aee8866fb3c440e1d1e0d38633b94de23d7b8 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Tue, 7 Jan 2025 11:47:29 +0100
Subject: [PATCH 1/6] [sophia][esterel41] Minimal configuration
---
.../sophia/clusters/esterel41/esterel41.json | 19 +++
.../clusters/esterel41/nodes/esterel41-1.json | 128 ++++++++++++++++++
.../sophia/clusters/esterel41/esterel41.yaml | 40 ++++++
.../sophia/clusters/esterel41/nodes.yaml.erb | 85 ++++++++++++
4 files changed, 272 insertions(+)
create mode 100644 data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
create mode 100644 data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
create mode 100644 input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
create mode 100644 input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
new file mode 100644
index 00000000000..3a6eeb0ad2c
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
@@ -0,0 +1,19 @@
+{
+ "boot_type": "uefi",
+ "created_at": "Sat, 25 Jan 2025 00:00:00 GMT",
+ "exotic": false,
+ "kavlan": false,
+ "manufactured_at": "2024-03-01",
+ "metrics": [
+
+ ],
+ "model": "DL380 Gen11",
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "redfish": true,
+ "type": "cluster",
+ "uid": "esterel41",
+ "warranty_end": "2031-07-20"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
new file mode 100644
index 00000000000..db6200957f9
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 16,
+ "nb_procs": 2,
+ "nb_threads": 32,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "2024-03-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "2031-07-20"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.131.56",
+ "ip6": "2001:660:4406:800:4::38",
+ "kavlan": false,
+ "mac": "6c:92:cf:05:28:24",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "esterel41-1.sophia.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.131.56",
+ "kavlan": false,
+ "mac": "5c:ed:8c:f4:43:88",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "esterel41-1-bmc.sophia.grid5000.fr"
+ }
+ ],
+ "nodeset": "esterel41",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 80000000000,
+ "node_flops": 1280000000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 2500000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Sapphire Rapids",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2024112508",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "esterel41-1"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
new file mode 100644
index 00000000000..2f8f4e7103e
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
@@ -0,0 +1,40 @@
+---
+model: DL380 Gen11
+created_at: 2025-01-25
+kavlan: false
+boot_type: uefi
+exotic: false
+queues:
+ - admin
+ - testing
+nodes:
+ esterel41-1:
+ chassis:
+ manufactured_at: 2024-03-01
+ warranty_end: 2031-07-20
+ supported_job_types:
+ deploy: true
+ besteffort: true
+ max_walltime: 0
+ processor:
+ microarchitecture: Sapphire Rapids
+ clock_speed: 2500000000
+ network_adapters:
+ bmc:
+ enabled: true
+ mountable: false
+ mounted: false
+ eth0:
+ enabled: true
+ mountable: true
+ mounted: true
+ storage_devices:
+ disk0:
+ id: disk0
+ interface: SAS
+ by_path: "/dev/disk/by-path/dummy"
+ software:
+ standard-environment: debian11-x64-std
+ management_tools:
+ bmc_vendor_tool: ipmitool
+ nodeset: esterel41
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
new file mode 100644
index 00000000000..fec5f4cce37
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
@@ -0,0 +1,85 @@
+<%
+ cluster_name = "esterel41" # Replace with cluster name
+ nodes_number = 1 # Size of the cluster (number of nodes)
+ site_ipv4_index = 131 # Cluster index in the IPv4 address
+ nodes_index = 55 # Shift the last IP digit, by default 0
+ # MAC addresses declaration
+ # TODO: Change MAC addresses.
+ mac_eth0_list = %w(
+ 6c:92:cf:05:28:24
+ )
+
+ # TODO: Change MAC addresses.
+ mac_bmc_list = %w(
+ 5c:ed:8c:f4:43:88
+ )
+%>
+---
+nodes:
+<% (1..nodes_number).each { |i| %>
+ <%= cluster_name %>-<%= i %>:
+ architecture:
+ nb_procs: 2
+ nb_cores: 16
+ nb_threads: 32
+ platform_type: x86_64
+ cpu_core_numbering: contiguous
+ bios:
+ release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
+ vendor: Unknown # Fake vendor, will be replaced by g5k-checks
+ version: 1 # Fake version, will be replaced by g5k-checks
+ bmc_version: v1 # Fake version, will be replaced by g5k-checks
+ chassis:
+ manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
+ name: Unknown # Fake name, will be replaced by g5k-checks
+ main_memory:
+ ram_size: 8 # Fake size, will be replaced by g5k-checks
+ memory_devices:
+ dimm:
+ 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
+ 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
+ cache_l3: 8 # Fake cache, will be replaced by g5k-checks
+ instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
+ microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
+ ht_capable: true # Default ht capable value, will be replaced by g5k-checks
+ main_memory:
+ ram_size: 8 # Fake ram size, will be replaced by g5k-checks
+ memory_devices:
+ dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
+ size: 8 # Fake dimm size, will be replaced by g5k-checks
+ technology: dram # Default dimm technology, will be replaced by g5k-checks
+ operating_system:
+ cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
+ cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
+ ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
+ pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
+ pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
+ turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks
+ network_adapters:
+ bmc:
+ interface: Ethernet
+ management: true
+ mac: <%= mac_bmc_list[i - 1] %>
+ ip: 172.17.<%= site_ipv4_index %>.<%= i + nodes_index %>
+ eth0:
+ interface: Ethernet
+ management: false
+ driver: mlx_core
+ name: enp1s0f0np0
+ rate: 10000000000
+ mac: <%= mac_eth0_list[i - 1] %>
+ ip: 172.16.<%= site_ipv4_index %>.<%= i + nodes_index %>
+ storage_devices:
+ disk0:
+ storage: SSD # Common value, will be replaced by g5k-checks
+ model: unknown # fake value,
+ size: 8 # Fake value, will be replaced by g5k-checks
+<% } %>
--
GitLab
From 373f94865df344c013e155ae71326e5053157b28 Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 16 Jan 2025 17:36:51 +0100
Subject: [PATCH 2/6] [sophia][esterel41] regenerate JSON after PI upgrade and
priority calculation
---
data/grid5000/sites/sophia/clusters/esterel41/esterel41.json | 1 +
.../sites/sophia/clusters/esterel41/nodes/esterel41-1.json | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
index 3a6eeb0ad2c..ffaa1dc2342 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
@@ -8,6 +8,7 @@
],
"model": "DL380 Gen11",
+ "priority": 202403,
"queues": [
"admin",
"testing"
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
index db6200957f9..3c279111a29 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2024112508",
+ "postinstall-version": "1.2025011610",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
--
GitLab
From 94a79f94c6c42ab6acb0e7ad191046b4bbc3fb11 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Tue, 21 Jan 2025 10:14:49 +0100
Subject: [PATCH 3/6] [sophia][esterel41] Add disk by-path
---
.../sophia/clusters/esterel41/nodes/esterel41-1.json | 12 +++++++++++-
.../sites/sophia/clusters/esterel41/esterel41.yaml | 6 +++++-
.../sites/sophia/clusters/esterel41/nodes.yaml.erb | 4 ++++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
index 3c279111a29..4ef2b682dd1 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -105,13 +105,23 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
"size": 8,
"storage": "SSD",
"vendor": "Unknown"
+ },
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0",
+ "id": "disk1",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
}
],
"supported_job_types": {
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
index 2f8f4e7103e..0b92ea6a8ca 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
@@ -32,7 +32,11 @@ nodes:
disk0:
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/dummy"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
+ disk1:
+ id: disk1
+ interface: SAS
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
index fec5f4cce37..ebdb16bdc4e 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
+++ b/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
@@ -82,4 +82,8 @@ nodes:
storage: SSD # Common value, will be replaced by g5k-checks
model: unknown # fake value,
size: 8 # Fake value, will be replaced by g5k-checks
+ disk1:
+ storage: SSD
+ model: unknown
+ size: 8
<% } %>
--
GitLab
From 38dc7b54f6eb391db2df7e8dc4a58decc73b5272 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Wed, 22 Jan 2025 08:42:17 +0100
Subject: [PATCH 4/6] [sophia][esterel41] Add ib interface, predictable network
interfaces, disk models and GPU models
---
.../sophia/clusters/esterel41/esterel41.json | 2 +-
.../clusters/esterel41/nodes/esterel41-1.json | 267 +++++++++++++++---
input/grid5000/disks.yaml | 1 +
.../sophia/clusters/esterel41/esterel41.yaml | 25 +-
.../clusters/esterel41/esterel41_ib.yaml | 9 +
.../sophia/clusters/esterel41/nodes.yaml.erb | 89 ------
.../clusters/esterel41/nodes/esterel41-1.yaml | 189 +++++++++++++
lib/refrepo/gen/reference-api.rb | 2 +-
lib/refrepo/gpu_ref.rb | 12 +
lib/refrepo/net_names_mapping.yaml | 5 +
10 files changed, 467 insertions(+), 134 deletions(-)
create mode 100644 input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
delete mode 100644 input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
create mode 100644 input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
index ffaa1dc2342..29964654f64 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
@@ -8,7 +8,7 @@
],
"model": "DL380 Gen11",
- "priority": 202403,
+ "priority": 202503,
"queues": [
"admin",
"testing"
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
index 4ef2b682dd1..0cd93dcaf95 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -1,26 +1,63 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 16,
+ "nb_cores": 32,
"nb_procs": 2,
- "nb_threads": 32,
+ "nb_threads": 64,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "10/04/2024",
+ "vendor": "HPE",
+ "version": 2.34
},
- "bmc_version": "v1",
+ "bmc_version": "1.65",
"chassis": {
"manufactured_at": "2024-03-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "HPE",
+ "name": "ProLiant DL380 Gen11",
+ "serial": "CZ242408XH",
"warranty_end": "2031-07-20"
},
"exotic": false,
+ "gpu_devices": {
+ "nvidia0": {
+ "compute_capability": "8.9",
+ "cores": 18176,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia0",
+ "memory": 48305799168,
+ "microarchitecture": "Ada Lovelace ",
+ "model": "L40",
+ "performance": {
+ "fp-16": 18105000000000,
+ "fp-32": 9050000000000,
+ "fp-64": 0
+ },
+ "power_default_limit": "300.00 W",
+ "vbios_version": "95.02.5D.00.01",
+ "vendor": "Nvidia"
+ },
+ "nvidia1": {
+ "compute_capability": "8.9",
+ "cores": 18176,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia1",
+ "memory": 48305799168,
+ "microarchitecture": "Ada Lovelace ",
+ "model": "L40",
+ "performance": {
+ "fp-16": 18105000000000,
+ "fp-32": 9050000000000,
+ "fp-64": 0
+ },
+ "power_default_limit": "300.00 W",
+ "vbios_version": "95.02.5D.00.01",
+ "vendor": "Nvidia"
+ }
+ },
"main_memory": {
- "ram_size": 8
+ "ram_size": 549755813888
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -31,28 +68,179 @@
"memory_devices": [
{
"device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 10",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 12",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 14",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 16",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 7",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 10",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 12",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 14",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 16",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 7",
+ "size": 34359738368,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "tg3",
"enabled": true,
+ "firmware_version": "5719-v1.55 NCSI v1.5.55.0",
"interface": "Ethernet",
"ip": "172.16.131.56",
"ip6": "2001:660:4406:800:4::38",
"kavlan": false,
"mac": "6c:92:cf:05:28:24",
"management": false,
+ "model": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "esterel41-1.sophia.grid5000.fr",
- "rate": 10000000000,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": null,
- "switch_port": null
+ "switch_port": null,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth1",
+ "driver": "tg3",
+ "enabled": false,
+ "firmware_version": "5719-v1.55 NCSI v1.5.55.0",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "6c:92:cf:05:28:25",
+ "management": false,
+ "model": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+ "mountable": false,
+ "mounted": false,
+ "name": "ens15f1",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth2",
+ "driver": "tg3",
+ "enabled": false,
+ "firmware_version": "5719-v1.55 NCSI v1.5.55.0",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "6c:92:cf:05:28:26",
+ "management": false,
+ "model": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+ "mountable": false,
+ "mounted": false,
+ "name": "ens15f2",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth3",
+ "driver": "tg3",
+ "enabled": false,
+ "firmware_version": "5719-v1.55 NCSI v1.5.55.0",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "6c:92:cf:05:28:27",
+ "management": false,
+ "model": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+ "mountable": false,
+ "mounted": false,
+ "name": "ens15f3",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "ibs3",
+ "driver": "mlx5_core",
+ "enabled": "enabled",
+ "firmware_version": "20.42.1000",
+ "guid": "0x88e9a4ffffb8e5c4",
+ "interface": "InfiniBand",
+ "ip": "172.18.131.56",
+ "kavlan": false,
+ "mac": "88:e9:a4:ff:ff:b8:e5:c4",
+ "management": false,
+ "model": "MT28908 Family [ConnectX-6]",
+ "mountable": "enabled",
+ "mounted": "enabled",
+ "name": "ibs3",
+ "netmask": "255.255.240.0",
+ "network_address": "esterel41-1-ibs3.sophia.grid5000.fr",
+ "rate": 10000000000,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,32 +257,32 @@
],
"nodeset": "esterel41",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_pstate",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 80000000000,
- "node_flops": 1280000000000
+ "node_flops": 2560000000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 49152,
+ "cache_l1i": 32768,
+ "cache_l2": 2097152,
+ "cache_l3": 39321600,
"clock_speed": 2500000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Sapphire Rapids",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x2b000603",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) Gold 6426Y",
+ "vendor": "Intel",
+ "version": "Gold 6426Y"
},
"redfish": true,
"software": {
@@ -104,24 +292,26 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bb919402f17a4754a47ba20",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
+ "firmware_version": 5.28,
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "VK000960GXNZB",
+ "size": 479559942144,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "HP"
},
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bb919402f221b494aa41676",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0",
+ "firmware_version": 5.28,
"id": "disk1",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "VK000480GXNZA",
+ "size": 2878970265600,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "HP"
}
],
"supported_job_types": {
@@ -131,7 +321,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": false
},
"type": "node",
"uid": "esterel41-1"
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 98053427e22..5712d24b2a8 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -95,6 +95,7 @@ disk_vendor_model_mapping:
- VK000960GXNZB
- VK003840GWSRV
- VK000480GZCNE
+ - VK000480GXNZA
Micron:
- MTFDDAK480TDN
- MTFDDAK960TDD
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
index 0b92ea6a8ca..875223ccb2c 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
@@ -21,6 +21,7 @@ nodes:
clock_speed: 2500000000
network_adapters:
bmc:
+ interface: Ethernet
enabled: true
mountable: false
mounted: false
@@ -28,15 +29,29 @@ nodes:
enabled: true
mountable: true
mounted: true
+ eth1:
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ enabled: false
+ mountable: false
+ mounted: false
storage_devices:
- disk0:
+ pci-0000:3b:00.0-scsi-0:3:111:0:
id: disk0
- interface: SAS
+ interface: SATA
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
- disk1:
+ model: VK000960GXNZB
+ pci-0000:3b:00.0-scsi-0:3:110:0:
id: disk1
- interface: SAS
- by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
+ interface: SATA
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
+ model: VK000480GXNZA
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
new file mode 100644
index 00000000000..c5f800f066c
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
@@ -0,0 +1,9 @@
+---
+nodes:
+ esterel41-1:
+ network_adapters:
+ ibs3:
+ enabled: enabled
+ mountable: enabled
+ mounted: enabled
+ netmask: 255.255.240.0
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
deleted file mode 100644
index ebdb16bdc4e..00000000000
--- a/input/grid5000/sites/sophia/clusters/esterel41/nodes.yaml.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-<%
- cluster_name = "esterel41" # Replace with cluster name
- nodes_number = 1 # Size of the cluster (number of nodes)
- site_ipv4_index = 131 # Cluster index in the IPv4 address
- nodes_index = 55 # Shift the last IP digit, by default 0
- # MAC addresses declaration
- # TODO: Change MAC addresses.
- mac_eth0_list = %w(
- 6c:92:cf:05:28:24
- )
-
- # TODO: Change MAC addresses.
- mac_bmc_list = %w(
- 5c:ed:8c:f4:43:88
- )
-%>
----
-nodes:
-<% (1..nodes_number).each { |i| %>
- <%= cluster_name %>-<%= i %>:
- architecture:
- nb_procs: 2
- nb_cores: 16
- nb_threads: 32
- platform_type: x86_64
- cpu_core_numbering: contiguous
- bios:
- release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
- vendor: Unknown # Fake vendor, will be replaced by g5k-checks
- version: 1 # Fake version, will be replaced by g5k-checks
- bmc_version: v1 # Fake version, will be replaced by g5k-checks
- chassis:
- manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
- name: Unknown # Fake name, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake size, will be replaced by g5k-checks
- memory_devices:
- dimm:
- 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
- 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
- cache_l3: 8 # Fake cache, will be replaced by g5k-checks
- instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
- microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
- ht_capable: true # Default ht capable value, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake ram size, will be replaced by g5k-checks
- memory_devices:
- dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
- size: 8 # Fake dimm size, will be replaced by g5k-checks
- technology: dram # Default dimm technology, will be replaced by g5k-checks
- operating_system:
- cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
- cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
- ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
- pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
- pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
- turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks
- network_adapters:
- bmc:
- interface: Ethernet
- management: true
- mac: <%= mac_bmc_list[i - 1] %>
- ip: 172.17.<%= site_ipv4_index %>.<%= i + nodes_index %>
- eth0:
- interface: Ethernet
- management: false
- driver: mlx_core
- name: enp1s0f0np0
- rate: 10000000000
- mac: <%= mac_eth0_list[i - 1] %>
- ip: 172.16.<%= site_ipv4_index %>.<%= i + nodes_index %>
- storage_devices:
- disk0:
- storage: SSD # Common value, will be replaced by g5k-checks
- model: unknown # fake value,
- size: 8 # Fake value, will be replaced by g5k-checks
- disk1:
- storage: SSD
- model: unknown
- size: 8
-<% } %>
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
new file mode 100644
index 00000000000..d118d0d13d9
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
@@ -0,0 +1,189 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel41-1:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 32
+ nb_procs: 2
+ nb_threads: 64
+ platform_type: x86_64
+ bios:
+ release_date: 10/04/2024
+ vendor: HPE
+ version: 2.34
+ bmc_version: '1.65'
+ chassis:
+ manufacturer: HPE
+ name: ProLiant DL380 Gen11
+ serial: CZ242408XH
+ gpu_devices:
+ nvidia0:
+ cpu_affinity: 0
+ device: "/dev/nvidia0"
+ memory: 48305799168
+ model: L40
+ power_default_limit: 300.00 W
+ vbios_version: 95.02.5D.00.01
+ vendor: Nvidia
+ nvidia1:
+ cpu_affinity: 1
+ device: "/dev/nvidia1"
+ memory: 48305799168
+ model: L40
+ power_default_limit: 300.00 W
+ vbios_version: 95.02.5D.00.01
+ vendor: Nvidia
+ main_memory:
+ ram_size: 549755813888
+ memory_devices:
+ dimm_proc 1 dimm 1:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 10:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 12:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 14:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 16:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 3:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 5:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 7:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 1:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 10:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 12:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 14:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 16:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 3:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 5:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 7:
+ size: 34359738368
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.131.56
+ mac: 5c:ed:8c:f4:43:88
+ management: true
+ eth0:
+ driver: tg3
+ firmware_version: 5719-v1.55 NCSI v1.5.55.0
+ interface: Ethernet
+ ip: 172.16.131.56
+ mac: 6c:92:cf:05:28:24
+ management: false
+ model: NetXtreme BCM5719 Gigabit Ethernet PCIe
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth1:
+ driver: tg3
+ firmware_version: 5719-v1.55 NCSI v1.5.55.0
+ interface: Ethernet
+ mac: 6c:92:cf:05:28:25
+ management: false
+ model: NetXtreme BCM5719 Gigabit Ethernet PCIe
+ name: ens15f1
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth2:
+ driver: tg3
+ firmware_version: 5719-v1.55 NCSI v1.5.55.0
+ interface: Ethernet
+ mac: 6c:92:cf:05:28:26
+ management: false
+ model: NetXtreme BCM5719 Gigabit Ethernet PCIe
+ name: ens15f2
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth3:
+ driver: tg3
+ firmware_version: 5719-v1.55 NCSI v1.5.55.0
+ interface: Ethernet
+ mac: 6c:92:cf:05:28:27
+ management: false
+ model: NetXtreme BCM5719 Gigabit Ethernet PCIe
+ name: ens15f3
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ ibs3:
+ driver: mlx5_core
+ firmware_version: 20.42.1000
+ guid: '0x88e9a4ffffb8e5c4'
+ interface: InfiniBand
+ mac: 88:e9:a4:ff:ff:b8:e5:c4
+ ip: "172.18.131.56"
+ management: false
+ model: MT28908 Family [ConnectX-6]
+ name: ibs3
+ rate: 10000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_pstate
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 49152
+ cache_l1i: 32768
+ cache_l2: 2097152
+ cache_l3: 39321600
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x2b000603'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) Gold 6426Y
+ vendor: Intel
+ version: Gold 6426Y
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:3:110:0:
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bb919402f221b494aa41676"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
+ firmware_version: 5.28
+ model: VK000960GXNZB
+ size: 2878970265600
+ storage: SSD
+ id: disk1
+ interface: SATA
+ pci-0000:3b:00.0-scsi-0:3:111:0:
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bb919402f17a4754a47ba20"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
+ firmware_version: 5.28
+ model: VK000480GXNZA
+ size: 479559942144
+ storage: SSD
+ id: disk0
+ interface: SATA
+ supported_job_types:
+ virtual: false
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index 3852d0879f2..92b87014505 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -154,7 +154,7 @@ def generate_reference_api
node["storage_devices"] = node["storage_devices"].sort_by{ |_sd, v| v['id'] }.map { |a| a[1] }
node["network_adapters"].each { |key, _hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash
- node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1","bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values
+ node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1","ibs3","bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values
node["memory_devices"].each { |key, _hash| node["memory_devices"][key]["device"] = key; } # Add "device: dimm_a1" within the hash
node["memory_devices"] = node["memory_devices"].sort_by { |d, _|
[d.gsub(/dimm_(\d+)/, '\1').to_i,
diff --git a/lib/refrepo/gpu_ref.rb b/lib/refrepo/gpu_ref.rb
index cf29dc6122a..035444e44ae 100644
--- a/lib/refrepo/gpu_ref.rb
+++ b/lib/refrepo/gpu_ref.rb
@@ -295,6 +295,18 @@ class GPURef
'fp-64' => 705000000000,
},
},
+ 'L40' => {
+ 'cores' => 18176,
+ 'compute_capability' => '8.9',
+ 'short_name' => 'L40',
+ 'alias' => 'l40',
+ 'microarchitecture' => 'Ada Lovelace',
+ 'performance' => {
+ 'fp-16' => 9050000000000,
+ 'fp-32' => 9050000000000,
+ 'fp-64' => 141400000000,
+ },
+ },
}
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index caa763f999e..c002b3f7c0a 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -348,6 +348,11 @@ troll:
uvb:
eno1: eth0
eno2: eth1
+esterel41:
+ enp1s0f0np0: eth0
+ ens15f1: eth1
+ ens15f2: eth2
+ ens15f3: eth3
yeti:
eno1: eth0
eno2: eth1
--
GitLab
From 4c8d00fae40b7a3ebe75029e487ba8b3c20495b2 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Thu, 23 Jan 2025 08:45:52 +0100
Subject: [PATCH 5/6] [sophia][esterel41] remove duplicates informations and
fix IB configuration
---
.../sophia/clusters/esterel41/nodes/esterel41-1.json | 10 +++++-----
.../sites/sophia/clusters/esterel41/esterel41.yaml | 6 +-----
.../sites/sophia/clusters/esterel41/esterel41_ib.yaml | 6 +++---
.../sophia/clusters/esterel41/nodes/esterel41-1.yaml | 6 +-----
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
index 0cd93dcaf95..550891defa7 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -225,7 +225,7 @@
{
"device": "ibs3",
"driver": "mlx5_core",
- "enabled": "enabled",
+ "enabled": true,
"firmware_version": "20.42.1000",
"guid": "0x88e9a4ffffb8e5c4",
"interface": "InfiniBand",
@@ -234,8 +234,8 @@
"mac": "88:e9:a4:ff:ff:b8:e5:c4",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": "enabled",
- "mounted": "enabled",
+ "mountable": true,
+ "mounted": true,
"name": "ibs3",
"netmask": "255.255.240.0",
"network_address": "esterel41-1-ibs3.sophia.grid5000.fr",
@@ -297,7 +297,7 @@
"firmware_version": 5.28,
"id": "disk0",
"interface": "SATA",
- "model": "VK000960GXNZB",
+ "model": "VK000480GXNZA",
"size": 479559942144,
"storage": "SSD",
"vendor": "HP"
@@ -308,7 +308,7 @@
"firmware_version": 5.28,
"id": "disk1",
"interface": "SATA",
- "model": "VK000480GXNZA",
+ "model": "VK000960GXNZB",
"size": 2878970265600,
"storage": "SSD",
"vendor": "HP"
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
index 875223ccb2c..ba8debe993b 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
@@ -42,16 +42,12 @@ nodes:
mountable: false
mounted: false
storage_devices:
- pci-0000:3b:00.0-scsi-0:3:111:0:
+ pci-0000:3b:00.0-scsi-0:3:111:0:
id: disk0
interface: SATA
- by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
- model: VK000960GXNZB
pci-0000:3b:00.0-scsi-0:3:110:0:
id: disk1
interface: SATA
- by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
- model: VK000480GXNZA
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
index c5f800f066c..62bfd70e4f3 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
@@ -3,7 +3,7 @@ nodes:
esterel41-1:
network_adapters:
ibs3:
- enabled: enabled
- mountable: enabled
- mounted: enabled
+ enabled: true
+ mountable: true
+ mounted: true
netmask: 255.255.240.0
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
index d118d0d13d9..5184012ca96 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
@@ -140,8 +140,8 @@ esterel41-1:
firmware_version: 20.42.1000
guid: '0x88e9a4ffffb8e5c4'
interface: InfiniBand
+ ip: '172.18.131.56'
mac: 88:e9:a4:ff:ff:b8:e5:c4
- ip: "172.18.131.56"
management: false
model: MT28908 Family [ConnectX-6]
name: ibs3
@@ -174,8 +174,6 @@ esterel41-1:
model: VK000960GXNZB
size: 2878970265600
storage: SSD
- id: disk1
- interface: SATA
pci-0000:3b:00.0-scsi-0:3:111:0:
by_id: "/dev/disk/by-id/wwn-0x600062b21bb919402f17a4754a47ba20"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
@@ -183,7 +181,5 @@ esterel41-1:
model: VK000480GXNZA
size: 479559942144
storage: SSD
- id: disk0
- interface: SATA
supported_job_types:
virtual: false
--
GitLab
From a7e413862b84c7c6f1833f985b5b568f339f70b7 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Thu, 23 Jan 2025 14:16:58 +0100
Subject: [PATCH 6/6] [sophia][esterel41] Change disk model to the RAID
controller and generate reference api
[sophia][esterel41] generate refence api for gpu models
---
.../clusters/esterel41/nodes/esterel41-1.json | 20 +++++++++----------
input/grid5000/disks.yaml | 2 ++
.../clusters/esterel41/nodes/esterel41-1.yaml | 4 ++--
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
index 550891defa7..a2a12ace0c6 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -27,12 +27,12 @@
"cpu_affinity": 0,
"device": "/dev/nvidia0",
"memory": 48305799168,
- "microarchitecture": "Ada Lovelace ",
+ "microarchitecture": "Ada Lovelace",
"model": "L40",
"performance": {
- "fp-16": 18105000000000,
+ "fp-16": 9050000000000,
"fp-32": 9050000000000,
- "fp-64": 0
+ "fp-64": 141400000000
},
"power_default_limit": "300.00 W",
"vbios_version": "95.02.5D.00.01",
@@ -44,12 +44,12 @@
"cpu_affinity": 1,
"device": "/dev/nvidia1",
"memory": 48305799168,
- "microarchitecture": "Ada Lovelace ",
+ "microarchitecture": "Ada Lovelace",
"model": "L40",
"performance": {
- "fp-16": 18105000000000,
+ "fp-16": 9050000000000,
"fp-32": 9050000000000,
- "fp-64": 0
+ "fp-64": 141400000000
},
"power_default_limit": "300.00 W",
"vbios_version": "95.02.5D.00.01",
@@ -297,10 +297,10 @@
"firmware_version": 5.28,
"id": "disk0",
"interface": "SATA",
- "model": "VK000480GXNZA",
+ "model": "MR416i-o Gen11",
"size": 479559942144,
"storage": "SSD",
- "vendor": "HP"
+ "vendor": "HPE"
},
{
"by_id": "/dev/disk/by-id/wwn-0x600062b21bb919402f221b494aa41676",
@@ -308,10 +308,10 @@
"firmware_version": 5.28,
"id": "disk1",
"interface": "SATA",
- "model": "VK000960GXNZB",
+ "model": "MR416i-o Gen11",
"size": 2878970265600,
"storage": "SSD",
- "vendor": "HP"
+ "vendor": "HPE"
}
],
"supported_job_types": {
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 5712d24b2a8..a50cb617098 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -16,6 +16,8 @@ disk_vendor_model_mapping:
- PERC H745P MX
- PERC H740P Mini
- DELLBOSS VD
+ HPE:
+ - MR416i-o Gen11
Unknown:
- Logical Volume
- LOGICAL VOLUME
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
index 5184012ca96..40201f24a28 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
@@ -171,14 +171,14 @@ esterel41-1:
by_id: "/dev/disk/by-id/wwn-0x600062b21bb919402f221b494aa41676"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
firmware_version: 5.28
- model: VK000960GXNZB
+ model: MR416i-o Gen11
size: 2878970265600
storage: SSD
pci-0000:3b:00.0-scsi-0:3:111:0:
by_id: "/dev/disk/by-id/wwn-0x600062b21bb919402f17a4754a47ba20"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
firmware_version: 5.28
- model: VK000480GXNZA
+ model: MR416i-o Gen11
size: 479559942144
storage: SSD
supported_job_types:
--
GitLab