From 871964bf3ec2ee2dac4e155ef5bdd5c5407c00bf Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Wed, 19 Mar 2025 15:07:56 +0100
Subject: [PATCH] [sophia][esterel6] fix merge error in json
---
.../sophia/clusters/esterel6/esterel6.json | 15 +-
.../clusters/esterel6/nodes/esterel6-1.json | 208 ++++++++++++++----
input/grid5000/dell-product-data.yaml | 6 +
3 files changed, 181 insertions(+), 48 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/esterel6.json b/data/grid5000/sites/sophia/clusters/esterel6/esterel6.json
index 3afafd78916..a41b7b21cf7 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/esterel6.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/esterel6.json
@@ -3,7 +3,7 @@
"created_at": "Wed, 26 Feb 2025 00:00:00 GMT",
"exotic": false,
"kavlan": false,
- "manufactured_at": "2025-02-26",
+ "manufactured_at": "2017-04-18",
"metrics": [
{
"description": "Default subset of metrics from Prometheus Node Exporter",
@@ -78,15 +78,10 @@
}
}
],
-<<<<<<< HEAD
- "model": "Cluster Model",
- "nodes_count": 1,
- "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
- "priority": 197001,
-=======
"model": "Dell PowerEdge T630",
- "priority": 202502,
->>>>>>> 718025b788 ([sophia][esterel6] Add new cluster esterel6)
+ "nodes_count": 1,
+ "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 4 GPUs GeForce GTX 1080 Ti, 64GB RAM, 1862GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+ "priority": 201804,
"queues": [
"admin",
"testing"
@@ -94,5 +89,5 @@
"redfish": true,
"type": "cluster",
"uid": "esterel6",
- "warranty_end": "2022-04-17"
+ "warranty_end": "2022-04-18"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index 642a39792ad..3b6b3e8295c 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -1,26 +1,97 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
- "nb_threads": 72,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 24,
+ "nb_procs": 2,
+ "nb_threads": 48,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "10/18/2023",
+ "vendor": "Dell Inc.",
+ "version": "2.18.2"
},
- "bmc_version": "v1",
+ "bmc_version": "2.85.85.85",
"chassis": {
- "manufactured_at": "2025-02-26",
- "manufacturer": "Unknown",
- "name": "Unknown",
- "warranty_end": "2022-04-17"
+ "manufactured_at": "2017-04-18",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge T630",
+ "serial": "9M2TYJ2",
+ "warranty_end": "2022-04-18"
},
"exotic": false,
+ "gpu_devices": {
+ "nvidia0": {
+ "compute_capability": "6.1",
+ "cores": 3584,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia0",
+ "memory": 11811160064,
+ "microarchitecture": "Pascal",
+ "model": "GeForce GTX 1080 Ti",
+ "performance": {
+ "fp-16": 177200000000,
+ "fp-32": 11340000000000,
+ "fp-64": 354400000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "86.02.39.00.01",
+ "vendor": "Nvidia"
+ },
+ "nvidia1": {
+ "compute_capability": "6.1",
+ "cores": 3584,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia1",
+ "memory": 11811160064,
+ "microarchitecture": "Pascal",
+ "model": "GeForce GTX 1080 Ti",
+ "performance": {
+ "fp-16": 177200000000,
+ "fp-32": 11340000000000,
+ "fp-64": 354400000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "86.02.39.00.01",
+ "vendor": "Nvidia"
+ },
+ "nvidia2": {
+ "compute_capability": "6.1",
+ "cores": 3584,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia2",
+ "memory": 11811160064,
+ "microarchitecture": "Pascal",
+ "model": "GeForce GTX 1080 Ti",
+ "performance": {
+ "fp-16": 177200000000,
+ "fp-32": 11340000000000,
+ "fp-64": 354400000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "86.02.39.40.6B",
+ "vendor": "Nvidia"
+ },
+ "nvidia3": {
+ "compute_capability": "6.1",
+ "cores": 3584,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia3",
+ "memory": 11811160064,
+ "microarchitecture": "Pascal",
+ "model": "GeForce GTX 1080 Ti",
+ "performance": {
+ "fp-16": 177200000000,
+ "fp-32": 11340000000000,
+ "fp-64": 354400000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "86.02.39.40.6B",
+ "vendor": "Nvidia"
+ }
+ },
"main_memory": {
- "ram_size": 8
+ "ram_size": 68719476736
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +101,88 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 17179869184,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "1.67, 0x80000fae, 19.5.12",
"interface": "Ethernet",
"ip": "172.16.131.7",
"ip6": "2001:660:4406:800:4::7",
"kavlan": false,
"mac": "18:66:da:a6:f0:f1",
"management": false,
+ "model": "I350 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "esterel6-1.sophia.grid5000.fr",
- "rate": 10000000000,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-6",
- "switch_port": "1/1/16"
+ "switch_port": "1/1/16",
+ "vendor": "Intel"
+ },
+ {
+ "device": "eth1",
+ "driver": "igb",
+ "enabled": false,
+ "firmware_version": "1.67, 0x80000fae, 19.5.12",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "18:66:da:a6:f0:f2",
+ "management": false,
+ "model": "I350 Gigabit Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Intel"
+ },
+ {
+ "device": "ib0",
+ "driver": "ib_ipoib",
+ "enabled": true,
+ "firmware_version": "2.40.5000",
+ "guid": "0x248a070300ffd1c1",
+ "interface": "InfiniBand",
+ "ip": "172.18.131.7",
+ "kavlan": false,
+ "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:24:8a:07:03:00:ff:d1:c1",
+ "management": false,
+ "model": "MT27500 Family [ConnectX-3]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ibp130s0",
+ "netmask": "255.255.240.0",
+ "network_address": "esterel6-1-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,32 +199,32 @@
],
"nodeset": "esterel6",
"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_cpufreq",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 35200000,
- "node_flops": 2534400000
+ "node_flops": 844800000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 31457280,
"clock_speed": 2200000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0xb000040",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2650 v4 @ 2.20GHz",
+ "vendor": "Intel",
+ "version": "E5-2650 v4"
},
"redfish": true,
"software": {
@@ -104,14 +234,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x61866da0a594e5002f66bf5e14ffcf3a",
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+ "firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H730 Adp",
+ "size": 1999307276288,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
@@ -121,7 +252,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "esterel6-1"
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index b4ee2765688..083f352d123 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2272,6 +2272,12 @@ sites:
chassis:
manufactured_at: 2017-03-30
warranty_end: 2022-03-30
+ esterel6:
+ nodes:
+ esterel6-1:
+ chassis:
+ manufactured_at: 2017-04-18
+ warranty_end: 2022-04-18
esterel7:
nodes:
esterel7-1:
--
GitLab