From 978c5cedafafb17c7a33776ae45a5ccb1b3f1455 Mon Sep 17 00:00:00 2001 From: PARISOT Clement <clement.parisot@inria.fr> Date: Fri, 14 Mar 2025 15:20:44 +0100 Subject: [PATCH 1/9] [grenoble] Add new cluster vercors2 --- .../clusters/vercors2/nodes/vercors2-1.json | 128 ++++++++++++++++++ .../clusters/vercors2/nodes/vercors2-2.json | 128 ++++++++++++++++++ .../grenoble/clusters/vercors2/vercors2.json | 93 +++++++++++++ .../grenoble/clusters/vercors2/nodes.yaml.erb | 82 +++++++++++ .../grenoble/clusters/vercors2/vercors2.yaml | 41 ++++++ .../clusters/vercors2/vercors2_metrics.yaml | 63 +++++++++ 6 files changed, 535 insertions(+) create mode 100644 data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json create mode 100644 data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json create mode 100644 data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json create mode 100644 input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb create mode 100644 input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml create mode 100644 input/grid5000/sites/grenoble/clusters/vercors2/vercors2_metrics.yaml diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json new file mode 100644 index 00000000000..43a2bbee86f --- /dev/null +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -0,0 +1,128 @@ +{ + "architecture": { + "cpu_core_numbering": "contiguous", + "nb_cores": 72, + "nb_procs": 1, + "nb_threads": 72, + "platform_type": "x86_64" + }, + "bios": { + "release_date": "01/01/2000", + "vendor": "Unknown", + "version": 1 + }, + "bmc_version": "v1", + "chassis": { + "manufactured_at": "1970-01-01", + "manufacturer": "Unknown", + "name": "Unknown", + "warranty_end": "1970-01-01" + }, + "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.27.3", + "ip6": "2001:660:4406:100:c::3", + "kavlan": false, + "mac": "24:6e:96:29:5b:90", + "management": false, + "mountable": true, + "mounted": true, + "name": "enp1s0f0np0", + "network_address": "vercors2-1.grenoble.grid5000.fr", + "rate": 10000000000, + "switch": null, + "switch_port": null + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.27.3", + "kavlan": false, + "mac": "00:11:22:33:44:01", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "vercors2-1-bmc.grenoble.grid5000.fr" + } + ], + "nodeset": "vercors2", + "operating_system": { + "cstate_driver": "unknown", + "cstate_governor": "unknown", + "ht_enabled": true, + "pstate_driver": "unknwon", + "pstate_governor": "unknown", + "turboboost_enabled": true + }, + "performance": { + "core_flops": 128, + "node_flops": 9216 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 8, + "cache_l1i": 8, + "cache_l2": 8, + "cache_l3": 8, + "clock_speed": 8, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Haswell", + "microcode": "0xd000001", + "model": "Unknown", + "other_description": "description", + "vendor": "vendor", + "version": "vendor" + }, + "redfish": true, + "software": { + "forced-deployment-timestamp": 202007300948, + "postinstall-version": "1.2025021810", + "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": "vercors2-1" +} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json new file mode 100644 index 00000000000..3589838e073 --- /dev/null +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -0,0 +1,128 @@ +{ + "architecture": { + "cpu_core_numbering": "contiguous", + "nb_cores": 72, + "nb_procs": 1, + "nb_threads": 72, + "platform_type": "x86_64" + }, + "bios": { + "release_date": "01/01/2000", + "vendor": "Unknown", + "version": 1 + }, + "bmc_version": "v1", + "chassis": { + "manufactured_at": "1970-01-01", + "manufacturer": "Unknown", + "name": "Unknown", + "warranty_end": "1970-01-01" + }, + "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.27.4", + "ip6": "2001:660:4406:100:c::4", + "kavlan": false, + "mac": "24:6e:96:29:5b:20", + "management": false, + "mountable": true, + "mounted": true, + "name": "enp1s0f0np0", + "network_address": "vercors2-2.grenoble.grid5000.fr", + "rate": 10000000000, + "switch": null, + "switch_port": null + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.27.4", + "kavlan": false, + "mac": "00:11:22:33:44:02", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "vercors2-2-bmc.grenoble.grid5000.fr" + } + ], + "nodeset": "vercors2", + "operating_system": { + "cstate_driver": "unknown", + "cstate_governor": "unknown", + "ht_enabled": true, + "pstate_driver": "unknwon", + "pstate_governor": "unknown", + "turboboost_enabled": true + }, + "performance": { + "core_flops": 128, + "node_flops": 9216 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 8, + "cache_l1i": 8, + "cache_l2": 8, + "cache_l3": 8, + "clock_speed": 8, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Haswell", + "microcode": "0xd000001", + "model": "Unknown", + "other_description": "description", + "vendor": "vendor", + "version": "vendor" + }, + "redfish": true, + "software": { + "forced-deployment-timestamp": 202007300948, + "postinstall-version": "1.2025021810", + "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": "vercors2-2" +} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json new file mode 100644 index 00000000000..db415c818d3 --- /dev/null +++ b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json @@ -0,0 +1,93 @@ +{ + "boot_type": "uefi", + "created_at": "Thu, 01 Jan 1970 00:00:00 GMT", + "exotic": false, + "kavlan": false, + "manufactured_at": "1970-01-01", + "metrics": [ + { + "description": "Default subset of metrics from Prometheus Node Exporter", + "name": "prom_default_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "id": [ + "node_boot_time_seconds", + "node_cpu_scaling_frequency_hertz", + "node_cpu_seconds_total", + "node_filesystem_free_bytes", + "node_filesystem_size_bytes", + "node_load1", + "node_load15", + "node_load5", + "node_memory_Buffers_bytes", + "node_memory_Cached_bytes", + "node_memory_MemAvailable_bytes", + "node_memory_MemFree_bytes", + "node_memory_MemTotal_bytes", + "node_memory_Shmem_bytes", + "node_memory_SwapFree_bytes", + "node_memory_SwapTotal_bytes", + "node_network_receive_bytes_total", + "node_network_receive_packets_total", + "node_network_transmit_bytes_total", + "node_network_transmit_packets_total", + "node_procs_blocked", + "node_procs_running", + "kwollect_custom" + ], + "port": 9100, + "protocol": "prometheus" + } + }, + { + "description": "All metrics from Prometheus Node Exporter", + "name": "prom_all_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "port": 9100, + "protocol": "prometheus" + } + }, + { + "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter", + "name": "prom_nvgpu_default_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "id": [ + "DCGM_FI_DEV_SM_CLOCK", + "DCGM_FI_DEV_MEM_CLOCK", + "DCGM_FI_DEV_GPU_TEMP", + "DCGM_FI_DEV_POWER_USAGE", + "DCGM_FI_DEV_MEM_COPY_UTIL" + ], + "port": 9400, + "protocol": "prometheus" + } + }, + { + "description": "All metrics from Prometheus Nvidia DCGM Exporter", + "name": "prom_nvgpu_all_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "port": 9400, + "protocol": "prometheus" + } + } + ], + "model": "Cluster Model", + "nodes_count": 2, + "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet", + "priority": 197001, + "queues": [ + "admin", + "testing" + ], + "redfish": true, + "type": "cluster", + "uid": "vercors2", + "warranty_end": "1970-01-01" +} \ No newline at end of file diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb b/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb new file mode 100644 index 00000000000..883da3e18b6 --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb @@ -0,0 +1,82 @@ +<% + # File generated by 'rake mass:create SRC=mass-create-2025-03-14.csv + # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create' + + cluster_name = "vercors2" + nodes_number = 2 # Size of the cluster (number of nodes) + # MAC addresses declaration + mac_eth0_list = %w( +24:6e:96:29:5b:90 +24:6e:96:29:5b:20 + ) + mac_bmc_list = %w( +00:11:22:33:44:01 +00:11:22:33:44:02 + ) +%> +--- +nodes: +<% (1..nodes_number).each { |i| %> + <%= cluster_name %>-<%= i %>: + architecture: + nb_procs: 1 # Fake data, will be replaced by g5k-checks + nb_cores: 72 # Fake data, will be replaced by g5k-checks + nb_threads: 72 # Fake data, will be replaced by g5k-checks + platform_type: x86_64 # Fake data, will be replaced by g5k-checks + cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks + 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: + management: true + mac: <%= mac_bmc_list[i - 1] %> + eth0: + interface: Ethernet + management: false + driver: mlx_core # Fake data, will be replaced by g5k-checks + name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks + rate: 10000000000 # Fake data, will be replaced by g5k-checks + mac: <%= mac_eth0_list[i - 1] %> + storage_devices: + disk0: + storage: SSD # Fake data, will be replaced by g5k-checks + model: unknown # Fake data, will be replaced by g5k-checks + size: 8 # Fake data, will be replaced by g5k-checks +<% } %> diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml new file mode 100644 index 00000000000..0b656958228 --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -0,0 +1,41 @@ +--- +model: Cluster Model # TODO: change this value. +created_at: 1970-01-01 # TODO: change this value +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' +queues: + - admin + - testing +nodes: + vercors2-[1-2]: + 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. + 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. + network_adapters: + bmc: + interface: Ethernet + enabled: true + mountable: false + mounted: false + eth0: + enabled: true + mountable: true + mounted: true + storage_devices: + disk0: # This field will have to be renamed later. + id: disk0 + 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 + management_tools: + bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm) + nodeset: vercors2 diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2_metrics.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2_metrics.yaml new file mode 100644 index 00000000000..03c90530a6f --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2_metrics.yaml @@ -0,0 +1,63 @@ +--- +metrics: + + - name: prom_default_metrics + description: Default subset of metrics from Prometheus Node Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9100 + id: + - node_boot_time_seconds + - node_cpu_scaling_frequency_hertz + - node_cpu_seconds_total + - node_filesystem_free_bytes + - node_filesystem_size_bytes + - node_load1 + - node_load15 + - node_load5 + - node_memory_Buffers_bytes + - node_memory_Cached_bytes + - node_memory_MemAvailable_bytes + - node_memory_MemFree_bytes + - node_memory_MemTotal_bytes + - node_memory_Shmem_bytes + - node_memory_SwapFree_bytes + - node_memory_SwapTotal_bytes + - node_network_receive_bytes_total + - node_network_receive_packets_total + - node_network_transmit_bytes_total + - node_network_transmit_packets_total + - node_procs_blocked + - node_procs_running + - kwollect_custom + + - name: prom_all_metrics + description: All metrics from Prometheus Node Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9100 + - name: prom_nvgpu_default_metrics + description: Default subset of metrics from Prometheus Nvidia DCGM Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9400 + id: + - DCGM_FI_DEV_SM_CLOCK + - DCGM_FI_DEV_MEM_CLOCK + - DCGM_FI_DEV_GPU_TEMP + - DCGM_FI_DEV_POWER_USAGE + - DCGM_FI_DEV_MEM_COPY_UTIL + + - name: prom_nvgpu_all_metrics + description: All metrics from Prometheus Nvidia DCGM Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9400 -- GitLab From e748505beb3abd142ddbf2db5eedc2396f7b5d26 Mon Sep 17 00:00:00 2001 From: PARISOT Clement <clement.parisot@inria.fr> Date: Fri, 14 Mar 2025 16:46:59 +0100 Subject: [PATCH 2/9] [grenoble] vercors2 - Fix MAC address --- .../sites/grenoble/clusters/vercors2/nodes/vercors2-1.json | 2 +- .../sites/grenoble/clusters/vercors2/nodes/vercors2-2.json | 2 +- .../grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index 43a2bbee86f..42f4b51b3d5 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -60,7 +60,7 @@ "interface": "Ethernet", "ip": "172.17.27.3", "kavlan": false, - "mac": "00:11:22:33:44:01", + "mac": "18:66:da:6f:6b:57", "management": true, "mountable": false, "mounted": false, diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index 3589838e073..2320b19031d 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -60,7 +60,7 @@ "interface": "Ethernet", "ip": "172.17.27.4", "kavlan": false, - "mac": "00:11:22:33:44:02", + "mac": "18:66:da:6e:e3:6f", "management": true, "mountable": false, "mounted": false, diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb b/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb index 883da3e18b6..b5a568ecaf4 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb @@ -10,8 +10,8 @@ 24:6e:96:29:5b:20 ) mac_bmc_list = %w( -00:11:22:33:44:01 -00:11:22:33:44:02 +18:66:da:6f:6b:57 +18:66:da:6e:e3:6f ) %> --- -- GitLab From a8bf798d753fa590ff2434112d800d7b252a92f3 Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 15:16:28 +0100 Subject: [PATCH 3/9] [vercors2] set boot_type to bios --- data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json | 2 +- input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json index db415c818d3..e23de26ecac 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json @@ -1,5 +1,5 @@ { - "boot_type": "uefi", + "boot_type": "bios", "created_at": "Thu, 01 Jan 1970 00:00:00 GMT", "exotic": false, "kavlan": false, diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml index 0b656958228..084ae2ab861 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -2,7 +2,7 @@ model: Cluster Model # TODO: change this value. created_at: 1970-01-01 # TODO: change this value kavlan: false -boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice) +boot_type: bios exotic: false # TODO: specify if 'true' or 'false' queues: - admin -- GitLab From 737b07a79430da84c6fbcb4063d62081e6019be8 Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 15:58:44 +0100 Subject: [PATCH 4/9] [vercors2] various values + disk path --- .../grenoble/clusters/vercors2/nodes/vercors2-1.json | 4 ++-- .../grenoble/clusters/vercors2/nodes/vercors2-2.json | 4 ++-- .../sites/grenoble/clusters/vercors2/vercors2.json | 4 ++-- .../sites/grenoble/clusters/vercors2/vercors2.yaml | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index 42f4b51b3d5..86425ebaf59 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -23,7 +23,7 @@ "ram_size": 8 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "racadm", "ipmitool": { "retries": 5 } @@ -105,7 +105,7 @@ "storage_devices": [ { "by_id": "", - "by_path": "/dev/disk/by-path/dummy", + "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", "id": "disk0", "interface": "SAS", "model": "unknown", diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index 2320b19031d..087b2b87679 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -23,7 +23,7 @@ "ram_size": 8 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "racadm", "ipmitool": { "retries": 5 } @@ -105,7 +105,7 @@ "storage_devices": [ { "by_id": "", - "by_path": "/dev/disk/by-path/dummy", + "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", "id": "disk0", "interface": "SAS", "model": "unknown", diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json index e23de26ecac..d7d5398882b 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json @@ -1,6 +1,6 @@ { "boot_type": "bios", - "created_at": "Thu, 01 Jan 1970 00:00:00 GMT", + "created_at": "Tue, 18 Mar 2025 00:00:00 GMT", "exotic": false, "kavlan": false, "manufactured_at": "1970-01-01", @@ -78,7 +78,7 @@ } } ], - "model": "Cluster Model", + "model": "Dell PowerEdge R730", "nodes_count": 2, "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet", "priority": 197001, diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml index 084ae2ab861..985dd879694 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -1,9 +1,9 @@ --- -model: Cluster Model # TODO: change this value. -created_at: 1970-01-01 # TODO: change this value +model: Dell PowerEdge R730 +created_at: 2025-03-18 kavlan: false boot_type: bios -exotic: false # TODO: specify if 'true' or 'false' +exotic: false queues: - admin - testing @@ -33,9 +33,9 @@ nodes: disk0: # This field will have to be renamed later. id: disk0 interface: SAS - by_path: "/dev/disk/by-path/dummy" # this path will have to change later. + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" 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: vercors2 -- GitLab From c5c924371cdc1fac5f3f4ce7763a58f71cc6f6ad Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 16:43:16 +0100 Subject: [PATCH 5/9] [vercors2] g5k-checks import --- .../clusters/vercors2/nodes/vercors2-1.json | 206 ++++++++++++++---- .../clusters/vercors2/nodes/vercors2-2.json | 206 ++++++++++++++---- .../grenoble/clusters/vercors2/vercors2.json | 4 +- input/grid5000/ipv4.yaml | 2 +- .../grenoble/clusters/vercors2/nodes.yaml.erb | 82 ------- .../clusters/vercors2/nodes/vercors2-1.yaml | 137 ++++++++++++ .../clusters/vercors2/nodes/vercors2-2.yaml | 137 ++++++++++++ .../grenoble/clusters/vercors2/vercors2.yaml | 9 +- lib/refrepo/g5kchecks_importer.rb | 2 +- lib/refrepo/gen/reference-api.rb | 2 +- lib/refrepo/gpu_ref.rb | 12 + lib/refrepo/net_names_mapping.yaml | 5 + 12 files changed, 620 insertions(+), 184 deletions(-) delete mode 100644 input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb create mode 100644 input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml create mode 100644 input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index 86425ebaf59..f780473352b 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -1,26 +1,63 @@ { "architecture": { - "cpu_core_numbering": "contiguous", - "nb_cores": 72, - "nb_procs": 1, - "nb_threads": 72, + "cpu_core_numbering": "round-robin", + "nb_cores": 20, + "nb_procs": 2, + "nb_threads": 40, "platform_type": "x86_64" }, "bios": { - "release_date": "01/01/2000", - "vendor": "Unknown", - "version": 1 + "release_date": "09/06/2016", + "vendor": "Dell Inc.", + "version": "2.2.5" }, - "bmc_version": "v1", + "bmc_version": "2.40.40.40", "chassis": { "manufactured_at": "1970-01-01", - "manufacturer": "Unknown", - "name": "Unknown", + "manufacturer": "Dell Inc.", + "name": "PowerEdge R730", + "serial": "J6P7DD2", "warranty_end": "1970-01-01" }, "exotic": false, + "gpu_devices": { + "nvidia0": { + "compute_capability": "6.1", + "cores": 3584, + "cpu_affinity": 0, + "device": "/dev/nvidia0", + "memory": 12884901888, + "microarchitecture": "Pascal", + "model": "TITAN X (Pascal)", + "performance": { + "fp-16": 171400000000, + "fp-32": 10974200000000, + "fp-64": 342900000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "86.02.15.00.01", + "vendor": "Nvidia" + }, + "nvidia1": { + "compute_capability": "6.1", + "cores": 3584, + "cpu_affinity": 1, + "device": "/dev/nvidia1", + "memory": 12884901888, + "microarchitecture": "Pascal", + "model": "TITAN X (Pascal)", + "performance": { + "fp-16": 171400000000, + "fp-32": 10974200000000, + "fp-64": 342900000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "86.02.15.00.01", + "vendor": "Nvidia" + } + }, "main_memory": { - "ram_size": 8 + "ram_size": 68719476736 }, "management_tools": { "bmc_vendor_tool": "racadm", @@ -30,71 +67,133 @@ }, "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", + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.27.3", + "kavlan": false, + "mac": "18:66:da:6f:6b:57", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "vercors2-1-bmc.grenoble.grid5000.fr" + }, + { + "device": "eno1", + "driver": "ixgbe", "enabled": true, + "firmware_version": "0x800005a0, 17.5.10", "interface": "Ethernet", "ip": "172.16.27.3", "ip6": "2001:660:4406:100:c::3", "kavlan": false, "mac": "24:6e:96:29:5b:90", "management": false, + "model": "Ethernet Controller 10-Gigabit X540-AT2", "mountable": true, "mounted": true, - "name": "enp1s0f0np0", - "network_address": "vercors2-1.grenoble.grid5000.fr", - "rate": 10000000000, + "name": "eno1", + "network_address": "vercors2-1-eno1.grenoble.grid5000.fr", + "rate": 1000000000, + "sriov": true, + "sriov_totalvfs": 63, "switch": null, - "switch_port": null + "switch_port": null, + "vendor": "Intel" }, { - "device": "bmc", - "enabled": true, + "device": "eno2", + "driver": "ixgbe", + "firmware_version": "0x800005a0, 17.5.10", "interface": "Ethernet", - "ip": "172.17.27.3", "kavlan": false, - "mac": "18:66:da:6f:6b:57", - "management": true, - "mountable": false, - "mounted": false, - "network_address": "vercors2-1-bmc.grenoble.grid5000.fr" + "mac": "24:6e:96:29:5b:92", + "management": false, + "model": "Ethernet Controller 10-Gigabit X540-AT2", + "name": "eno2", + "sriov": true, + "sriov_totalvfs": 63, + "vendor": "Intel" + }, + { + "device": "eno3", + "driver": "igb", + "firmware_version": "1.67, 0x80000d25, 17.5.10", + "interface": "Ethernet", + "kavlan": false, + "mac": "24:6e:96:29:5b:94", + "management": false, + "model": "I350 Gigabit Network Connection", + "name": "eno3", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Intel" + }, + { + "device": "eno4", + "driver": "igb", + "firmware_version": "1.67, 0x80000d25, 17.5.10", + "interface": "Ethernet", + "kavlan": false, + "mac": "24:6e:96:29:5b:95", + "management": false, + "model": "I350 Gigabit Network Connection", + "name": "eno4", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Intel" } ], "nodeset": "vercors2", "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": 128, - "node_flops": 9216 + "node_flops": 2560 }, "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": 26214400, "clock_speed": 8, "ht_capable": true, "instruction_set": "x86-64", "microarchitecture": "Haswell", - "microcode": "0xd000001", - "model": "Unknown", - "other_description": "description", - "vendor": "vendor", - "version": "vendor" + "microcode": "0xb000040", + "model": "Intel Xeon", + "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz", + "vendor": "Intel", + "version": "E5-2630 v4" }, "redfish": true, "software": { @@ -104,14 +203,26 @@ }, "storage_devices": [ { - "by_id": "", + "by_id": "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaedf038a58f5", "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", + "firmware_version": 4.26, "id": "disk0", "interface": "SAS", - "model": "unknown", - "size": 8, - "storage": "SSD", - "vendor": "Unknown" + "model": "PERC H730 Mini", + "size": 299439751168, + "storage": "HDD", + "vendor": "Dell" + }, + { + "by_id": "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaf02059b3eba", + "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0", + "firmware_version": 4.26, + "id": "disk1", + "interface": "SAS", + "model": "PERC H730 Mini", + "size": 4000225165312, + "storage": "HDD", + "vendor": "Dell" } ], "supported_job_types": { @@ -121,7 +232,8 @@ "queues": [ "admin", "testing" - ] + ], + "virtual": "ivt" }, "type": "node", "uid": "vercors2-1" diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index 087b2b87679..007ee2e0123 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -1,26 +1,63 @@ { "architecture": { - "cpu_core_numbering": "contiguous", - "nb_cores": 72, - "nb_procs": 1, - "nb_threads": 72, + "cpu_core_numbering": "round-robin", + "nb_cores": 20, + "nb_procs": 2, + "nb_threads": 40, "platform_type": "x86_64" }, "bios": { - "release_date": "01/01/2000", - "vendor": "Unknown", - "version": 1 + "release_date": "09/06/2016", + "vendor": "Dell Inc.", + "version": "2.2.5" }, - "bmc_version": "v1", + "bmc_version": "2.40.40.40", "chassis": { "manufactured_at": "1970-01-01", - "manufacturer": "Unknown", - "name": "Unknown", + "manufacturer": "Dell Inc.", + "name": "PowerEdge R730", + "serial": "J6P8LG2", "warranty_end": "1970-01-01" }, "exotic": false, + "gpu_devices": { + "nvidia0": { + "compute_capability": "6.1", + "cores": 3584, + "cpu_affinity": 0, + "device": "/dev/nvidia0", + "memory": 12884901888, + "microarchitecture": "Pascal", + "model": "TITAN X (Pascal)", + "performance": { + "fp-16": 171400000000, + "fp-32": 10974200000000, + "fp-64": 342900000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "86.02.15.00.01", + "vendor": "Nvidia" + }, + "nvidia1": { + "compute_capability": "6.1", + "cores": 3584, + "cpu_affinity": 1, + "device": "/dev/nvidia1", + "memory": 12884901888, + "microarchitecture": "Pascal", + "model": "TITAN X (Pascal)", + "performance": { + "fp-16": 171400000000, + "fp-32": 10974200000000, + "fp-64": 342900000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "86.02.15.00.01", + "vendor": "Nvidia" + } + }, "main_memory": { - "ram_size": 8 + "ram_size": 68719476736 }, "management_tools": { "bmc_vendor_tool": "racadm", @@ -30,71 +67,133 @@ }, "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", + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.27.4", + "kavlan": false, + "mac": "18:66:da:6e:e3:6f", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "vercors2-2-bmc.grenoble.grid5000.fr" + }, + { + "device": "eno1", + "driver": "ixgbe", "enabled": true, + "firmware_version": "0x800005a0, 17.5.10", "interface": "Ethernet", "ip": "172.16.27.4", "ip6": "2001:660:4406:100:c::4", "kavlan": false, "mac": "24:6e:96:29:5b:20", "management": false, + "model": "Ethernet Controller 10-Gigabit X540-AT2", "mountable": true, "mounted": true, - "name": "enp1s0f0np0", - "network_address": "vercors2-2.grenoble.grid5000.fr", - "rate": 10000000000, + "name": "eno1", + "network_address": "vercors2-2-eno1.grenoble.grid5000.fr", + "rate": 1000000000, + "sriov": true, + "sriov_totalvfs": 63, "switch": null, - "switch_port": null + "switch_port": null, + "vendor": "Intel" }, { - "device": "bmc", - "enabled": true, + "device": "eno2", + "driver": "ixgbe", + "firmware_version": "0x800005a0, 17.5.10", "interface": "Ethernet", - "ip": "172.17.27.4", "kavlan": false, - "mac": "18:66:da:6e:e3:6f", - "management": true, - "mountable": false, - "mounted": false, - "network_address": "vercors2-2-bmc.grenoble.grid5000.fr" + "mac": "24:6e:96:29:5b:22", + "management": false, + "model": "Ethernet Controller 10-Gigabit X540-AT2", + "name": "eno2", + "sriov": true, + "sriov_totalvfs": 63, + "vendor": "Intel" + }, + { + "device": "eno3", + "driver": "igb", + "firmware_version": "1.67, 0x80000d25, 17.5.10", + "interface": "Ethernet", + "kavlan": false, + "mac": "24:6e:96:29:5b:24", + "management": false, + "model": "I350 Gigabit Network Connection", + "name": "eno3", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Intel" + }, + { + "device": "eno4", + "driver": "igb", + "firmware_version": "1.67, 0x80000d25, 17.5.10", + "interface": "Ethernet", + "kavlan": false, + "mac": "24:6e:96:29:5b:25", + "management": false, + "model": "I350 Gigabit Network Connection", + "name": "eno4", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Intel" } ], "nodeset": "vercors2", "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": 128, - "node_flops": 9216 + "node_flops": 2560 }, "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": 26214400, "clock_speed": 8, "ht_capable": true, "instruction_set": "x86-64", "microarchitecture": "Haswell", - "microcode": "0xd000001", - "model": "Unknown", - "other_description": "description", - "vendor": "vendor", - "version": "vendor" + "microcode": "0xb000040", + "model": "Intel Xeon", + "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz", + "vendor": "Intel", + "version": "E5-2630 v4" }, "redfish": true, "software": { @@ -104,14 +203,26 @@ }, "storage_devices": [ { - "by_id": "", + "by_id": "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0ab035f46b0", "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", + "firmware_version": 4.26, "id": "disk0", "interface": "SAS", - "model": "unknown", - "size": 8, - "storage": "SSD", - "vendor": "Unknown" + "model": "PERC H730 Mini", + "size": 299439751168, + "storage": "HDD", + "vendor": "Dell" + }, + { + "by_id": "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0c204becd83", + "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0", + "firmware_version": 4.26, + "id": "disk1", + "interface": "SAS", + "model": "PERC H730 Mini", + "size": 4000225165312, + "storage": "HDD", + "vendor": "Dell" } ], "supported_job_types": { @@ -121,7 +232,8 @@ "queues": [ "admin", "testing" - ] + ], + "virtual": "ivt" }, "type": "node", "uid": "vercors2-2" diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json index d7d5398882b..af0a8166265 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json @@ -80,8 +80,8 @@ ], "model": "Dell PowerEdge R730", "nodes_count": 2, - "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet", - "priority": 197001, + "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 2 GPUs TITAN X (Pascal), 64GB RAM, 278GB HDD, 3725GB HDD, 1 x 1Gb Ethernet", + "priority": 197101, "queues": [ "admin", "testing" diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index 24ca38d9199..e146a1c8654 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -37,7 +37,7 @@ ipv4: grenoble chartreuse6 eth0 0 0 10 24 grenoble chartreuse7 eth0 0 0 10 28 grenoble vercors1 eth0 0 0 11 0 - grenoble vercors2 eth0 0 0 11 2 + grenoble vercors2 eno1 0 0 11 2 grenoble vercors3 eth0 0 0 11 4 grenoble vercors4 eth0 0 0 11 6 grenoble vercors5 eth0 0 0 11 9 diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb b/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb deleted file mode 100644 index b5a568ecaf4..00000000000 --- a/input/grid5000/sites/grenoble/clusters/vercors2/nodes.yaml.erb +++ /dev/null @@ -1,82 +0,0 @@ -<% - # File generated by 'rake mass:create SRC=mass-create-2025-03-14.csv - # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create' - - cluster_name = "vercors2" - nodes_number = 2 # Size of the cluster (number of nodes) - # MAC addresses declaration - mac_eth0_list = %w( -24:6e:96:29:5b:90 -24:6e:96:29:5b:20 - ) - mac_bmc_list = %w( -18:66:da:6f:6b:57 -18:66:da:6e:e3:6f - ) -%> ---- -nodes: -<% (1..nodes_number).each { |i| %> - <%= cluster_name %>-<%= i %>: - architecture: - nb_procs: 1 # Fake data, will be replaced by g5k-checks - nb_cores: 72 # Fake data, will be replaced by g5k-checks - nb_threads: 72 # Fake data, will be replaced by g5k-checks - platform_type: x86_64 # Fake data, will be replaced by g5k-checks - cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks - 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: - management: true - mac: <%= mac_bmc_list[i - 1] %> - eth0: - interface: Ethernet - management: false - driver: mlx_core # Fake data, will be replaced by g5k-checks - name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks - rate: 10000000000 # Fake data, will be replaced by g5k-checks - mac: <%= mac_eth0_list[i - 1] %> - storage_devices: - disk0: - storage: SSD # Fake data, will be replaced by g5k-checks - model: unknown # Fake data, will be replaced by g5k-checks - size: 8 # Fake data, will be replaced by g5k-checks -<% } %> diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml new file mode 100644 index 00000000000..59d1e1c90a2 --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml @@ -0,0 +1,137 @@ +# Generated by g5k-checks (g5k-checks -m api) +--- +vercors2-1: + architecture: + cpu_core_numbering: round-robin + nb_cores: 20 + nb_procs: 2 + nb_threads: 40 + platform_type: x86_64 + bios: + release_date: '09/06/2016' + vendor: Dell Inc. + version: 2.2.5 + bmc_version: 2.40.40.40 + chassis: + manufacturer: Dell Inc. + name: PowerEdge R730 + serial: J6P7DD2 + gpu_devices: + nvidia0: + cpu_affinity: 0 + device: "/dev/nvidia0" + memory: 12884901888 + model: TITAN X (Pascal) + power_default_limit: 250.00 W + vbios_version: 86.02.15.00.01 + vendor: Nvidia + nvidia1: + cpu_affinity: 1 + device: "/dev/nvidia1" + memory: 12884901888 + model: TITAN X (Pascal) + power_default_limit: 250.00 W + vbios_version: 86.02.15.00.01 + vendor: Nvidia + main_memory: + ram_size: 68719476736 + memory_devices: + dimm_a1: + size: 17179869184 + technology: dram + dimm_a2: + size: 17179869184 + technology: dram + dimm_b1: + size: 17179869184 + technology: dram + dimm_b2: + size: 17179869184 + technology: dram + network_adapters: + bmc: + ip: 172.17.27.3 + mac: 18:66:da:6f:6b:57 + management: true + eno2: + driver: ixgbe + firmware_version: 0x800005a0, 17.5.10 + interface: Ethernet + mac: 24:6e:96:29:5b:92 + management: false + model: Ethernet Controller 10-Gigabit X540-AT2 + name: eno2 + sriov: true + sriov_totalvfs: 63 + vendor: Intel + eno3: + driver: igb + firmware_version: 1.67, 0x80000d25, 17.5.10 + interface: Ethernet + mac: 24:6e:96:29:5b:94 + management: false + model: I350 Gigabit Network Connection + name: eno3 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + eno4: + driver: igb + firmware_version: 1.67, 0x80000d25, 17.5.10 + interface: Ethernet + mac: 24:6e:96:29:5b:95 + management: false + model: I350 Gigabit Network Connection + name: eno4 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + eno1: + driver: ixgbe + firmware_version: 0x800005a0, 17.5.10 + interface: Ethernet + ip: 172.16.27.3 + mac: 24:6e:96:29:5b:90 + management: false + model: Ethernet Controller 10-Gigabit X540-AT2 + name: eno1 + rate: 1000000000 + sriov: true + sriov_totalvfs: 63 + vendor: Intel + operating_system: + cstate_driver: intel_idle + cstate_governor: menu + ht_enabled: true + pstate_driver: intel_cpufreq + pstate_governor: performance + turboboost_enabled: true + processor: + cache_l1d: 32768 + cache_l1i: 32768 + cache_l2: 262144 + cache_l3: 26214400 + ht_capable: true + instruction_set: x86-64 + microcode: '0xb000040' + model: Intel Xeon + other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz + vendor: Intel + version: E5-2630 v4 + storage_devices: + pci-0000:03:00.0-scsi-0:2:0:0: + by_id: "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaedf038a58f5" + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" + firmware_version: 4.26 + model: PERC H730 Mini + size: 299439751168 + storage: HDD + pci-0000:03:00.0-scsi-0:2:1:0: + by_id: "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaf02059b3eba" + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0" + firmware_version: 4.26 + model: PERC H730 Mini + size: 4000225165312 + storage: HDD + supported_job_types: + virtual: ivt diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml new file mode 100644 index 00000000000..ed7ef7b2e7a --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml @@ -0,0 +1,137 @@ +# Generated by g5k-checks (g5k-checks -m api) +--- +vercors2-2: + architecture: + cpu_core_numbering: round-robin + nb_cores: 20 + nb_procs: 2 + nb_threads: 40 + platform_type: x86_64 + bios: + release_date: '09/06/2016' + vendor: Dell Inc. + version: 2.2.5 + bmc_version: 2.40.40.40 + chassis: + manufacturer: Dell Inc. + name: PowerEdge R730 + serial: J6P8LG2 + gpu_devices: + nvidia0: + cpu_affinity: 0 + device: "/dev/nvidia0" + memory: 12884901888 + model: TITAN X (Pascal) + power_default_limit: 250.00 W + vbios_version: 86.02.15.00.01 + vendor: Nvidia + nvidia1: + cpu_affinity: 1 + device: "/dev/nvidia1" + memory: 12884901888 + model: TITAN X (Pascal) + power_default_limit: 250.00 W + vbios_version: 86.02.15.00.01 + vendor: Nvidia + main_memory: + ram_size: 68719476736 + memory_devices: + dimm_a1: + size: 17179869184 + technology: dram + dimm_a2: + size: 17179869184 + technology: dram + dimm_b1: + size: 17179869184 + technology: dram + dimm_b2: + size: 17179869184 + technology: dram + network_adapters: + bmc: + ip: 172.17.27.4 + mac: 18:66:da:6e:e3:6f + management: true + eno2: + driver: ixgbe + firmware_version: 0x800005a0, 17.5.10 + interface: Ethernet + mac: 24:6e:96:29:5b:22 + management: false + model: Ethernet Controller 10-Gigabit X540-AT2 + name: eno2 + sriov: true + sriov_totalvfs: 63 + vendor: Intel + eno3: + driver: igb + firmware_version: 1.67, 0x80000d25, 17.5.10 + interface: Ethernet + mac: 24:6e:96:29:5b:24 + management: false + model: I350 Gigabit Network Connection + name: eno3 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + eno4: + driver: igb + firmware_version: 1.67, 0x80000d25, 17.5.10 + interface: Ethernet + mac: 24:6e:96:29:5b:25 + management: false + model: I350 Gigabit Network Connection + name: eno4 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + eno1: + driver: ixgbe + firmware_version: 0x800005a0, 17.5.10 + interface: Ethernet + ip: 172.16.27.4 + mac: 24:6e:96:29:5b:20 + management: false + model: Ethernet Controller 10-Gigabit X540-AT2 + name: eno1 + rate: 1000000000 + sriov: true + sriov_totalvfs: 63 + vendor: Intel + operating_system: + cstate_driver: intel_idle + cstate_governor: menu + ht_enabled: true + pstate_driver: intel_cpufreq + pstate_governor: performance + turboboost_enabled: true + processor: + cache_l1d: 32768 + cache_l1i: 32768 + cache_l2: 262144 + cache_l3: 26214400 + ht_capable: true + instruction_set: x86-64 + microcode: '0xb000040' + model: Intel Xeon + other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz + vendor: Intel + version: E5-2630 v4 + storage_devices: + pci-0000:03:00.0-scsi-0:2:0:0: + by_id: "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0ab035f46b0" + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" + firmware_version: 4.26 + model: PERC H730 Mini + size: 299439751168 + storage: HDD + pci-0000:03:00.0-scsi-0:2:1:0: + by_id: "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0c204becd83" + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0" + firmware_version: 4.26 + model: PERC H730 Mini + size: 4000225165312 + storage: HDD + supported_job_types: + virtual: ivt diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml index 985dd879694..2504cfa8e8d 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -25,15 +25,18 @@ nodes: enabled: true mountable: false mounted: false - eth0: + eno1: + interface: Ethernet enabled: true mountable: true mounted: true storage_devices: - disk0: # This field will have to be renamed later. + pci-0000:03:00.0-scsi-0:2:0:0: id: disk0 interface: SAS - by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" + pci-0000:03:00.0-scsi-0:2:1:0: + id: disk1 + interface: SAS software: standard-environment: debian11-x64-std management_tools: diff --git a/lib/refrepo/g5kchecks_importer.rb b/lib/refrepo/g5kchecks_importer.rb index 5e5bb94c57f..f5638f9f9b4 100644 --- a/lib/refrepo/g5kchecks_importer.rb +++ b/lib/refrepo/g5kchecks_importer.rb @@ -1,6 +1,6 @@ require 'refrepo/hash/hash' -INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 ibs4 ibp130s0 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100) +INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 ibs4 ibp130s0 bmc eno1 eno2 eno3 eno4 eno1np0 eno2np1 enp1s0f0np0 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100) def g5kchecks_importer(sourcedir) puts "Importing source files from #{sourcedir} into input directory..." diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb index 70cbc542478..0117cd8c2d4 100644 --- a/lib/refrepo/gen/reference-api.rb +++ b/lib/refrepo/gen/reference-api.rb @@ -196,7 +196,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","eth7", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1", "ibs3", "ibs4", "ibp130s0", "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","eth7", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1", "ibs3", "ibs4", "ibp130s0", "bmc", "eno1", "eno2", "eno3", "eno4", "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 a1ca093e139..ea667843943 100644 --- a/lib/refrepo/gpu_ref.rb +++ b/lib/refrepo/gpu_ref.rb @@ -128,6 +128,18 @@ class GPURef 'fp-64' => 156000000000, }, }, + 'TITAN X (Pascal)' => { + 'cores' => 3584, + 'compute_capability' => '6.1', + 'short_name' => 'TITAN X Pascal', + 'alias' => 'titanxpascal', + 'microarchitecture' => 'Pascal', + 'performance' => { + 'fp-16' => 171400000000, + 'fp-32' => 10974200000000, + 'fp-64' => 342900000000, + }, + }, 'Tesla K40m' => { 'cores' => 2880, 'compute_capability' => '3.5', diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml index 4cddd7a4850..5b815d846da 100644 --- a/lib/refrepo/net_names_mapping.yaml +++ b/lib/refrepo/net_names_mapping.yaml @@ -370,6 +370,11 @@ troll: uvb: eno1: eth0 eno2: eth1 +vercors2: + eno1: eth0 + eno2: eth1 + eno3: eth2 + eno4: eth3 vianden: enp1s0f0np0: eth0 eno12409np1: eth1 -- GitLab From 5032111f10d67595d7156a33b664a8e6fd5c7c42 Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 16:44:28 +0100 Subject: [PATCH 6/9] [vercors2] add dell product data --- .../grenoble/clusters/vercors2/nodes/vercors2-1.json | 4 ++-- .../grenoble/clusters/vercors2/nodes/vercors2-2.json | 4 ++-- .../sites/grenoble/clusters/vercors2/vercors2.json | 6 +++--- input/grid5000/dell-product-data.yaml | 10 ++++++++++ .../sites/grenoble/clusters/vercors2/vercors2.yaml | 3 --- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index f780473352b..955d20335e4 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -13,11 +13,11 @@ }, "bmc_version": "2.40.40.40", "chassis": { - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-10-24", "manufacturer": "Dell Inc.", "name": "PowerEdge R730", "serial": "J6P7DD2", - "warranty_end": "1970-01-01" + "warranty_end": "2021-10-23" }, "exotic": false, "gpu_devices": { diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index 007ee2e0123..8c45e696808 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -13,11 +13,11 @@ }, "bmc_version": "2.40.40.40", "chassis": { - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-10-24", "manufacturer": "Dell Inc.", "name": "PowerEdge R730", "serial": "J6P8LG2", - "warranty_end": "1970-01-01" + "warranty_end": "2021-10-23" }, "exotic": false, "gpu_devices": { diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json index af0a8166265..44029454921 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json @@ -3,7 +3,7 @@ "created_at": "Tue, 18 Mar 2025 00:00:00 GMT", "exotic": false, "kavlan": false, - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-10-24", "metrics": [ { "description": "Default subset of metrics from Prometheus Node Exporter", @@ -81,7 +81,7 @@ "model": "Dell PowerEdge R730", "nodes_count": 2, "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 2 GPUs TITAN X (Pascal), 64GB RAM, 278GB HDD, 3725GB HDD, 1 x 1Gb Ethernet", - "priority": 197101, + "priority": 201710, "queues": [ "admin", "testing" @@ -89,5 +89,5 @@ "redfish": true, "type": "cluster", "uid": "vercors2", - "warranty_end": "1970-01-01" + "warranty_end": "2021-10-23" } \ No newline at end of file diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml index 1e50fc6af36..32bd922f5c7 100644 --- a/input/grid5000/dell-product-data.yaml +++ b/input/grid5000/dell-product-data.yaml @@ -178,6 +178,16 @@ sites: chassis: manufactured_at: 2019-11-21 warranty_end: 2024-11-21 + vercors2: + nodes: + vercors2-1: + chassis: + manufactured_at: 2016-10-24 + warranty_end: 2021-10-23 + vercors2-2: + chassis: + manufactured_at: 2016-10-24 + warranty_end: 2021-10-23 yeti: nodes: yeti-1: diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml index 2504cfa8e8d..6b17e5bdcbd 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -9,9 +9,6 @@ queues: - testing nodes: vercors2-[1-2]: - 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. supported_job_types: deploy: true besteffort: true -- GitLab From 26de69a63bba851583b0e7190b9989621af163ad Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 17:41:39 +0100 Subject: [PATCH 7/9] [vercors2] g5k-checks import again --- .../clusters/vercors2/nodes/vercors2-1.json | 43 +++++++++++-------- .../clusters/vercors2/nodes/vercors2-2.json | 43 +++++++++++-------- input/grid5000/ipv4.yaml | 2 +- .../clusters/vercors2/nodes/vercors2-1.yaml | 32 +++++++------- .../clusters/vercors2/nodes/vercors2-2.yaml | 32 +++++++------- .../grenoble/clusters/vercors2/vercors2.yaml | 15 ++++++- 6 files changed, 98 insertions(+), 69 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index 955d20335e4..4e598393256 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -89,19 +89,7 @@ ], "network_adapters": [ { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.27.3", - "kavlan": false, - "mac": "18:66:da:6f:6b:57", - "management": true, - "mountable": false, - "mounted": false, - "network_address": "vercors2-1-bmc.grenoble.grid5000.fr" - }, - { - "device": "eno1", + "device": "eth0", "driver": "ixgbe", "enabled": true, "firmware_version": "0x800005a0, 17.5.10", @@ -115,7 +103,7 @@ "mountable": true, "mounted": true, "name": "eno1", - "network_address": "vercors2-1-eno1.grenoble.grid5000.fr", + "network_address": "vercors2-1.grenoble.grid5000.fr", "rate": 1000000000, "sriov": true, "sriov_totalvfs": 63, @@ -124,46 +112,67 @@ "vendor": "Intel" }, { - "device": "eno2", + "device": "eth1", "driver": "ixgbe", + "enabled": false, "firmware_version": "0x800005a0, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:92", "management": false, "model": "Ethernet Controller 10-Gigabit X540-AT2", + "mountable": false, + "mounted": false, "name": "eno2", "sriov": true, "sriov_totalvfs": 63, "vendor": "Intel" }, { - "device": "eno3", + "device": "eth2", "driver": "igb", + "enabled": false, "firmware_version": "1.67, 0x80000d25, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:94", "management": false, "model": "I350 Gigabit Network Connection", + "mountable": false, + "mounted": false, "name": "eno3", "sriov": false, "sriov_totalvfs": 0, "vendor": "Intel" }, { - "device": "eno4", + "device": "eth3", "driver": "igb", + "enabled": false, "firmware_version": "1.67, 0x80000d25, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:95", "management": false, "model": "I350 Gigabit Network Connection", + "mountable": false, + "mounted": false, "name": "eno4", "sriov": false, "sriov_totalvfs": 0, "vendor": "Intel" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.27.3", + "kavlan": false, + "mac": "18:66:da:6f:6b:57", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "vercors2-1-bmc.grenoble.grid5000.fr" } ], "nodeset": "vercors2", diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index 8c45e696808..b4ac171a022 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -89,19 +89,7 @@ ], "network_adapters": [ { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.27.4", - "kavlan": false, - "mac": "18:66:da:6e:e3:6f", - "management": true, - "mountable": false, - "mounted": false, - "network_address": "vercors2-2-bmc.grenoble.grid5000.fr" - }, - { - "device": "eno1", + "device": "eth0", "driver": "ixgbe", "enabled": true, "firmware_version": "0x800005a0, 17.5.10", @@ -115,7 +103,7 @@ "mountable": true, "mounted": true, "name": "eno1", - "network_address": "vercors2-2-eno1.grenoble.grid5000.fr", + "network_address": "vercors2-2.grenoble.grid5000.fr", "rate": 1000000000, "sriov": true, "sriov_totalvfs": 63, @@ -124,46 +112,67 @@ "vendor": "Intel" }, { - "device": "eno2", + "device": "eth1", "driver": "ixgbe", + "enabled": false, "firmware_version": "0x800005a0, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:22", "management": false, "model": "Ethernet Controller 10-Gigabit X540-AT2", + "mountable": false, + "mounted": false, "name": "eno2", "sriov": true, "sriov_totalvfs": 63, "vendor": "Intel" }, { - "device": "eno3", + "device": "eth2", "driver": "igb", + "enabled": false, "firmware_version": "1.67, 0x80000d25, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:24", "management": false, "model": "I350 Gigabit Network Connection", + "mountable": false, + "mounted": false, "name": "eno3", "sriov": false, "sriov_totalvfs": 0, "vendor": "Intel" }, { - "device": "eno4", + "device": "eth3", "driver": "igb", + "enabled": false, "firmware_version": "1.67, 0x80000d25, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:25", "management": false, "model": "I350 Gigabit Network Connection", + "mountable": false, + "mounted": false, "name": "eno4", "sriov": false, "sriov_totalvfs": 0, "vendor": "Intel" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.27.4", + "kavlan": false, + "mac": "18:66:da:6e:e3:6f", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "vercors2-2-bmc.grenoble.grid5000.fr" } ], "nodeset": "vercors2", diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index e146a1c8654..24ca38d9199 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -37,7 +37,7 @@ ipv4: grenoble chartreuse6 eth0 0 0 10 24 grenoble chartreuse7 eth0 0 0 10 28 grenoble vercors1 eth0 0 0 11 0 - grenoble vercors2 eno1 0 0 11 2 + grenoble vercors2 eth0 0 0 11 2 grenoble vercors3 eth0 0 0 11 4 grenoble vercors4 eth0 0 0 11 6 grenoble vercors5 eth0 0 0 11 9 diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml index 59d1e1c90a2..7898833eba0 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml @@ -53,7 +53,20 @@ vercors2-1: ip: 172.17.27.3 mac: 18:66:da:6f:6b:57 management: true - eno2: + eth0: + driver: ixgbe + firmware_version: 0x800005a0, 17.5.10 + interface: Ethernet + ip: 172.16.27.3 + mac: 24:6e:96:29:5b:90 + management: false + model: Ethernet Controller 10-Gigabit X540-AT2 + name: eno1 + rate: 1000000000 + sriov: true + sriov_totalvfs: 63 + vendor: Intel + eth1: driver: ixgbe firmware_version: 0x800005a0, 17.5.10 interface: Ethernet @@ -64,7 +77,7 @@ vercors2-1: sriov: true sriov_totalvfs: 63 vendor: Intel - eno3: + eth2: driver: igb firmware_version: 1.67, 0x80000d25, 17.5.10 interface: Ethernet @@ -75,7 +88,7 @@ vercors2-1: sriov: false sriov_totalvfs: 0 vendor: Intel - eno4: + eth3: driver: igb firmware_version: 1.67, 0x80000d25, 17.5.10 interface: Ethernet @@ -86,19 +99,6 @@ vercors2-1: sriov: false sriov_totalvfs: 0 vendor: Intel - eno1: - driver: ixgbe - firmware_version: 0x800005a0, 17.5.10 - interface: Ethernet - ip: 172.16.27.3 - mac: 24:6e:96:29:5b:90 - management: false - model: Ethernet Controller 10-Gigabit X540-AT2 - name: eno1 - rate: 1000000000 - sriov: true - sriov_totalvfs: 63 - vendor: Intel operating_system: cstate_driver: intel_idle cstate_governor: menu diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml index ed7ef7b2e7a..0ef07304654 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml @@ -53,7 +53,20 @@ vercors2-2: ip: 172.17.27.4 mac: 18:66:da:6e:e3:6f management: true - eno2: + eth0: + driver: ixgbe + firmware_version: 0x800005a0, 17.5.10 + interface: Ethernet + ip: 172.16.27.4 + mac: 24:6e:96:29:5b:20 + management: false + model: Ethernet Controller 10-Gigabit X540-AT2 + name: eno1 + rate: 1000000000 + sriov: true + sriov_totalvfs: 63 + vendor: Intel + eth1: driver: ixgbe firmware_version: 0x800005a0, 17.5.10 interface: Ethernet @@ -64,7 +77,7 @@ vercors2-2: sriov: true sriov_totalvfs: 63 vendor: Intel - eno3: + eth2: driver: igb firmware_version: 1.67, 0x80000d25, 17.5.10 interface: Ethernet @@ -75,7 +88,7 @@ vercors2-2: sriov: false sriov_totalvfs: 0 vendor: Intel - eno4: + eth3: driver: igb firmware_version: 1.67, 0x80000d25, 17.5.10 interface: Ethernet @@ -86,19 +99,6 @@ vercors2-2: sriov: false sriov_totalvfs: 0 vendor: Intel - eno1: - driver: ixgbe - firmware_version: 0x800005a0, 17.5.10 - interface: Ethernet - ip: 172.16.27.4 - mac: 24:6e:96:29:5b:20 - management: false - model: Ethernet Controller 10-Gigabit X540-AT2 - name: eno1 - rate: 1000000000 - sriov: true - sriov_totalvfs: 63 - vendor: Intel operating_system: cstate_driver: intel_idle cstate_governor: menu diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml index 6b17e5bdcbd..5b0c8c4b63a 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -22,11 +22,22 @@ nodes: enabled: true mountable: false mounted: false - eno1: - interface: Ethernet + eth0: 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: pci-0000:03:00.0-scsi-0:2:0:0: id: disk0 -- GitLab From 9cb8fd182d3a2d807d7a4e00cda41b89d5b06b6b Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 20:00:50 +0100 Subject: [PATCH 8/9] [vercors2] bios/firmware updates --- .../clusters/vercors2/nodes/vercors2-1.json | 18 +++++++++--------- .../clusters/vercors2/nodes/vercors2-2.json | 18 +++++++++--------- .../clusters/vercors2/nodes/vercors2-1.yaml | 18 +++++++++--------- .../clusters/vercors2/nodes/vercors2-2.yaml | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index 4e598393256..3e8d389adfa 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -7,11 +7,11 @@ "platform_type": "x86_64" }, "bios": { - "release_date": "09/06/2016", + "release_date": "12/12/2023", "vendor": "Dell Inc.", - "version": "2.2.5" + "version": "2.19.0" }, - "bmc_version": "2.40.40.40", + "bmc_version": "2.86.86.86", "chassis": { "manufactured_at": "2016-10-24", "manufacturer": "Dell Inc.", @@ -92,7 +92,7 @@ "device": "eth0", "driver": "ixgbe", "enabled": true, - "firmware_version": "0x800005a0, 17.5.10", + "firmware_version": "0x8000063b, 19.5.12", "interface": "Ethernet", "ip": "172.16.27.3", "ip6": "2001:660:4406:100:c::3", @@ -115,7 +115,7 @@ "device": "eth1", "driver": "ixgbe", "enabled": false, - "firmware_version": "0x800005a0, 17.5.10", + "firmware_version": "0x8000063b, 19.5.12", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:92", @@ -132,7 +132,7 @@ "device": "eth2", "driver": "igb", "enabled": false, - "firmware_version": "1.67, 0x80000d25, 17.5.10", + "firmware_version": "1.67, 0x80000fc9, 19.5.12", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:94", @@ -149,7 +149,7 @@ "device": "eth3", "driver": "igb", "enabled": false, - "firmware_version": "1.67, 0x80000d25, 17.5.10", + "firmware_version": "1.67, 0x80000fc9, 19.5.12", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:95", @@ -214,7 +214,7 @@ { "by_id": "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaedf038a58f5", "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", - "firmware_version": 4.26, + "firmware_version": 4.3, "id": "disk0", "interface": "SAS", "model": "PERC H730 Mini", @@ -225,7 +225,7 @@ { "by_id": "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaf02059b3eba", "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0", - "firmware_version": 4.26, + "firmware_version": 4.3, "id": "disk1", "interface": "SAS", "model": "PERC H730 Mini", diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index b4ac171a022..38495fbed39 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -7,11 +7,11 @@ "platform_type": "x86_64" }, "bios": { - "release_date": "09/06/2016", + "release_date": "12/12/2023", "vendor": "Dell Inc.", - "version": "2.2.5" + "version": "2.19.0" }, - "bmc_version": "2.40.40.40", + "bmc_version": "2.86.86.86", "chassis": { "manufactured_at": "2016-10-24", "manufacturer": "Dell Inc.", @@ -92,7 +92,7 @@ "device": "eth0", "driver": "ixgbe", "enabled": true, - "firmware_version": "0x800005a0, 17.5.10", + "firmware_version": "0x8000063b, 19.5.12", "interface": "Ethernet", "ip": "172.16.27.4", "ip6": "2001:660:4406:100:c::4", @@ -115,7 +115,7 @@ "device": "eth1", "driver": "ixgbe", "enabled": false, - "firmware_version": "0x800005a0, 17.5.10", + "firmware_version": "0x8000063b, 19.5.12", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:22", @@ -132,7 +132,7 @@ "device": "eth2", "driver": "igb", "enabled": false, - "firmware_version": "1.67, 0x80000d25, 17.5.10", + "firmware_version": "1.67, 0x80000fc9, 19.5.12", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:24", @@ -149,7 +149,7 @@ "device": "eth3", "driver": "igb", "enabled": false, - "firmware_version": "1.67, 0x80000d25, 17.5.10", + "firmware_version": "1.67, 0x80000fc9, 19.5.12", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:29:5b:25", @@ -214,7 +214,7 @@ { "by_id": "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0ab035f46b0", "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", - "firmware_version": 4.26, + "firmware_version": 4.3, "id": "disk0", "interface": "SAS", "model": "PERC H730 Mini", @@ -225,7 +225,7 @@ { "by_id": "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0c204becd83", "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0", - "firmware_version": 4.26, + "firmware_version": 4.3, "id": "disk1", "interface": "SAS", "model": "PERC H730 Mini", diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml index 7898833eba0..7d8e4886c5b 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.yaml @@ -8,10 +8,10 @@ vercors2-1: nb_threads: 40 platform_type: x86_64 bios: - release_date: '09/06/2016' + release_date: 12/12/2023 vendor: Dell Inc. - version: 2.2.5 - bmc_version: 2.40.40.40 + version: 2.19.0 + bmc_version: 2.86.86.86 chassis: manufacturer: Dell Inc. name: PowerEdge R730 @@ -55,7 +55,7 @@ vercors2-1: management: true eth0: driver: ixgbe - firmware_version: 0x800005a0, 17.5.10 + firmware_version: 0x8000063b, 19.5.12 interface: Ethernet ip: 172.16.27.3 mac: 24:6e:96:29:5b:90 @@ -68,7 +68,7 @@ vercors2-1: vendor: Intel eth1: driver: ixgbe - firmware_version: 0x800005a0, 17.5.10 + firmware_version: 0x8000063b, 19.5.12 interface: Ethernet mac: 24:6e:96:29:5b:92 management: false @@ -79,7 +79,7 @@ vercors2-1: vendor: Intel eth2: driver: igb - firmware_version: 1.67, 0x80000d25, 17.5.10 + firmware_version: 1.67, 0x80000fc9, 19.5.12 interface: Ethernet mac: 24:6e:96:29:5b:94 management: false @@ -90,7 +90,7 @@ vercors2-1: vendor: Intel eth3: driver: igb - firmware_version: 1.67, 0x80000d25, 17.5.10 + firmware_version: 1.67, 0x80000fc9, 19.5.12 interface: Ethernet mac: 24:6e:96:29:5b:95 management: false @@ -122,14 +122,14 @@ vercors2-1: pci-0000:03:00.0-scsi-0:2:0:0: by_id: "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaedf038a58f5" by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" - firmware_version: 4.26 + firmware_version: 4.3 model: PERC H730 Mini size: 299439751168 storage: HDD pci-0000:03:00.0-scsi-0:2:1:0: by_id: "/dev/disk/by-id/wwn-0x61866da07ac712001fbcaf02059b3eba" by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0" - firmware_version: 4.26 + firmware_version: 4.3 model: PERC H730 Mini size: 4000225165312 storage: HDD diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml index 0ef07304654..473103312b6 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.yaml @@ -8,10 +8,10 @@ vercors2-2: nb_threads: 40 platform_type: x86_64 bios: - release_date: '09/06/2016' + release_date: 12/12/2023 vendor: Dell Inc. - version: 2.2.5 - bmc_version: 2.40.40.40 + version: 2.19.0 + bmc_version: 2.86.86.86 chassis: manufacturer: Dell Inc. name: PowerEdge R730 @@ -55,7 +55,7 @@ vercors2-2: management: true eth0: driver: ixgbe - firmware_version: 0x800005a0, 17.5.10 + firmware_version: 0x8000063b, 19.5.12 interface: Ethernet ip: 172.16.27.4 mac: 24:6e:96:29:5b:20 @@ -68,7 +68,7 @@ vercors2-2: vendor: Intel eth1: driver: ixgbe - firmware_version: 0x800005a0, 17.5.10 + firmware_version: 0x8000063b, 19.5.12 interface: Ethernet mac: 24:6e:96:29:5b:22 management: false @@ -79,7 +79,7 @@ vercors2-2: vendor: Intel eth2: driver: igb - firmware_version: 1.67, 0x80000d25, 17.5.10 + firmware_version: 1.67, 0x80000fc9, 19.5.12 interface: Ethernet mac: 24:6e:96:29:5b:24 management: false @@ -90,7 +90,7 @@ vercors2-2: vendor: Intel eth3: driver: igb - firmware_version: 1.67, 0x80000d25, 17.5.10 + firmware_version: 1.67, 0x80000fc9, 19.5.12 interface: Ethernet mac: 24:6e:96:29:5b:25 management: false @@ -122,14 +122,14 @@ vercors2-2: pci-0000:03:00.0-scsi-0:2:0:0: by_id: "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0ab035f46b0" by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" - firmware_version: 4.26 + firmware_version: 4.3 model: PERC H730 Mini size: 299439751168 storage: HDD pci-0000:03:00.0-scsi-0:2:1:0: by_id: "/dev/disk/by-id/wwn-0x61866da07ac57b001fbcb0c204becd83" by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0" - firmware_version: 4.26 + firmware_version: 4.3 model: PERC H730 Mini size: 4000225165312 storage: HDD -- GitLab From 5cceca24627ad722bbe2018f7190807285c4da7d Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 20:03:38 +0100 Subject: [PATCH 9/9] [vercors2] final FIXMEs --- .../grenoble/clusters/vercors2/nodes/vercors2-1.json | 8 ++++---- .../grenoble/clusters/vercors2/nodes/vercors2-2.json | 8 ++++---- .../sites/grenoble/clusters/vercors2/vercors2.yaml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index 3e8d389adfa..2a2de4c0cbb 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -185,8 +185,8 @@ "turboboost_enabled": true }, "performance": { - "core_flops": 128, - "node_flops": 2560 + "core_flops": 35200000000, + "node_flops": 704000000000 }, "processor": { "cache_l1": null, @@ -194,10 +194,10 @@ "cache_l1i": 32768, "cache_l2": 262144, "cache_l3": 26214400, - "clock_speed": 8, + "clock_speed": 2200000000, "ht_capable": true, "instruction_set": "x86-64", - "microarchitecture": "Haswell", + "microarchitecture": "Broadwell", "microcode": "0xb000040", "model": "Intel Xeon", "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz", diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index 38495fbed39..d01d552f25f 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -185,8 +185,8 @@ "turboboost_enabled": true }, "performance": { - "core_flops": 128, - "node_flops": 2560 + "core_flops": 35200000000, + "node_flops": 704000000000 }, "processor": { "cache_l1": null, @@ -194,10 +194,10 @@ "cache_l1i": 32768, "cache_l2": 262144, "cache_l3": 26214400, - "clock_speed": 8, + "clock_speed": 2200000000, "ht_capable": true, "instruction_set": "x86-64", - "microarchitecture": "Haswell", + "microarchitecture": "Broadwell", "microcode": "0xb000040", "model": "Intel Xeon", "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz", diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml index 5b0c8c4b63a..93c4606cad3 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -14,8 +14,8 @@ nodes: besteffort: true max_walltime: 0 processor: - microarchitecture: Haswell # TODO: replace with microarch name. - clock_speed: 8 # TODO: Replace with clock speed. + microarchitecture: Broadwell + clock_speed: 2200000000 network_adapters: bmc: interface: Ethernet -- GitLab