From b544e5fb858196e842dca7a7d162a1fa0d8119f8 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Thu, 12 Oct 2023 13:37:28 +0200
Subject: [PATCH] [rennes][abacus18] import using g5k-checks
---
.../clusters/abacus18/nodes/abacus18-1.json | 150 ++++++++++++++++--
input/grid5000/disks.yaml | 2 +
.../rennes/clusters/abacus18/abacus18.yaml | 10 +-
3 files changed, 140 insertions(+), 22 deletions(-)
diff --git a/data/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.json b/data/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.json
index a2c8691efc8..fd26e9195d4 100644
--- a/data/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.json
@@ -1,15 +1,78 @@
{
"architecture": {
+ "cpu_core_numbering": "contiguous",
"nb_cores": 32,
"nb_procs": 2,
"nb_threads": 64,
"platform_type": "x86_64"
},
"bios": {
- "vendor": "Dell Inc."
+ "release_date": "07/27/2020",
+ "vendor": "Dell Inc.",
+ "version": "1.5.5"
+ },
+ "bmc_version": "4.30.30.30",
+ "chassis": {
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge R7525",
+ "serial": "4RK8T73"
},
"exotic": false,
+ "gpu_devices": {
+ "nvidia0": {
+ "compute_capability": "7.5",
+ "cores": 4608,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia0",
+ "memory": 23800578048,
+ "microarchitecture": "Turing",
+ "model": "Quadro RTX 6000",
+ "performance": {
+ "fp-16": 32620000000000,
+ "fp-32": 16310000000000,
+ "fp-64": 510000000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "90.02.4E.00.04",
+ "vendor": "Nvidia"
+ },
+ "nvidia1": {
+ "compute_capability": "7.5",
+ "cores": 4608,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia1",
+ "memory": 23800578048,
+ "microarchitecture": "Turing",
+ "model": "Quadro RTX 6000",
+ "performance": {
+ "fp-16": 32620000000000,
+ "fp-32": 16310000000000,
+ "fp-64": 510000000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "90.02.4E.00.04",
+ "vendor": "Nvidia"
+ },
+ "nvidia2": {
+ "compute_capability": "7.5",
+ "cores": 4608,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia2",
+ "memory": 23800578048,
+ "microarchitecture": "Turing",
+ "model": "Quadro RTX 6000",
+ "performance": {
+ "fp-16": 32620000000000,
+ "fp-32": 16310000000000,
+ "fp-64": 510000000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "90.02.4E.00.04",
+ "vendor": "Nvidia"
+ }
+ },
"main_memory": {
+ "ram_size": 274877906944
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -23,41 +86,77 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "tg3",
"enabled": true,
+ "firmware_version": "FFV21.60.16 bc 5720-v1.39",
"interface": "Ethernet",
"ip": "172.16.109.18",
"ip6": "2001:660:4406:700:e::12",
"kavlan": false,
"mac": "f4:02:70:b9:60:4e",
+ "management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
"mountable": true,
"mounted": true,
+ "name": "enp225s0f0",
"network_address": "abacus18-1.rennes.grid5000.fr",
+ "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": "FFV21.60.16 bc 5720-v1.39",
"interface": "Ethernet",
"kavlan": false,
+ "mac": "f4:02:70:b9:60:4f",
+ "management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
"mountable": false,
- "mounted": false
+ "mounted": false,
+ "name": "enp225s0f1",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "eth2",
+ "driver": "i40e",
"enabled": false,
+ "firmware_version": "7.10 0x800075e2 19.5.12",
"interface": "Ethernet",
"kavlan": false,
+ "mac": "68:05:ca:ce:a4:b0",
+ "management": false,
+ "model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
- "mounted": false
+ "mounted": false,
+ "name": "enp99s0f0",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Intel"
},
{
"device": "eth3",
+ "driver": "i40e",
"enabled": false,
+ "firmware_version": "7.10 0x800075e2 19.5.12",
"interface": "Ethernet",
"kavlan": false,
+ "mac": "68:05:ca:ce:a4:b1",
+ "management": false,
+ "model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
- "mounted": false
+ "mounted": false,
+ "name": "enp99s0f1",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -72,15 +171,33 @@
"network_address": "abacus18-1-bmc.rennes.grid5000.fr"
}
],
+ "operating_system": {
+ "cstate_driver": "acpi_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": true,
+ "pstate_driver": "acpi-cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": true
+ },
"performance": {
"core_flops": 36800000000,
"node_flops": 1177600000000
},
"processor": {
"cache_l1": null,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 524288,
+ "cache_l3": 16777216,
"clock_speed": 2300000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
"microarchitecture": "Zen 2",
- "other_description": "AMD EPYC 7352 24-Core Processor"
+ "microcode": "0x830107a",
+ "model": "AMD EPYC",
+ "other_description": "AMD EPYC 7352 24-Core Processor",
+ "vendor": "AMD",
+ "version": 7352
},
"software": {
"forced-deployment-timestamp": 202007300948,
@@ -89,22 +206,26 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x55cd2e4152708b36",
"by_path": "/dev/disk/by-path/pci-0000:41:00.0-ata-1",
+ "firmware_version": "XC31DL6R",
"id": "disk0",
"interface": "SATA",
- "model": "unknown",
+ "model": "SSDSCKKB240G8R",
+ "size": 240057409536,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Intel"
},
{
- "by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_id": "/dev/disk/by-id/wwn-0x500a0751297f285c",
+ "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
+ "firmware_version": "D1DF004",
"id": "disk1",
"interface": "SATA",
- "model": "unknown",
+ "model": "MTFDDAK960TDD",
+ "size": 960197124096,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Micron"
}
],
"supported_job_types": {
@@ -114,7 +235,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "amd-v"
},
"type": "node",
"uid": "abacus18-1"
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 70989086923..3af5b0fd34c 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -60,6 +60,7 @@ disk_vendor_model_mapping:
- MO000960RXRQK
SATA:
Intel:
+ - SSDSCKKB240G8R
- SSDSC2KG480G7R
- SSDSC2KG480G8R
- SSDSC2KG960G8R
@@ -73,6 +74,7 @@ disk_vendor_model_mapping:
- VK000960GXNZB
Micron:
- MTFDDAK480TDN
+ - MTFDDAK960TDD
- MTFDDAK960TDN
- MTFDDAK960TDT
Samsung:
diff --git a/input/grid5000/sites/rennes/clusters/abacus18/abacus18.yaml b/input/grid5000/sites/rennes/clusters/abacus18/abacus18.yaml
index fd9a5fc11fd..23be2fcc314 100644
--- a/input/grid5000/sites/rennes/clusters/abacus18/abacus18.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus18/abacus18.yaml
@@ -60,15 +60,9 @@ nodes:
mountable: false
mounted: false
storage_devices:
- disk0:
+ pci-0000:41:00.0-ata-1:
id: disk0
interface: SATA
- storage: SSD
- model: unknown
- by_path: "/dev/disk/by-path/pci-0000:41:00.0-ata-1"
- disk1:
+ pci-0000:01:00.0-scsi-0:0:0:0:
id: disk1
interface: SATA
- storage: SSD
- model: unknown
- by_path: "/dev/disk/by-path/dummy"
--
GitLab