Commit 566a4687 authored by BERARD Benjamin's avatar BERARD Benjamin
Browse files

[fpga/wiki/servan] Add fpga on wiki

parent c3b5729b
Pipeline #514241 passed with stages
in 6 minutes and 11 seconds
......@@ -276,6 +276,7 @@
},
{
"device": "fpga0",
"driver": "xrt",
"enabled": true,
"interface": "Ethernet-fpga",
"ip": "172.16.23.11",
......@@ -283,6 +284,7 @@
"kavlan": true,
"mac": "00:0a:35:06:4a:b8",
"management": false,
"model": "Alveo U200 QSFP28 (100GbE)",
"mountable": true,
"mounted": false,
"network_address": "servan-1-fpga0.grenoble.grid5000.fr",
......@@ -290,10 +292,12 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/97"
"switch_port": "ethernet1/1/97",
"vendor": "Xilinx"
},
{
"device": "fpga1",
"driver": "xrt",
"enabled": true,
"interface": "Ethernet-fpga",
"ip": "172.16.23.21",
......@@ -301,6 +305,7 @@
"kavlan": true,
"mac": "00:0a:35:06:4a:b9",
"management": false,
"model": "Alveo U200 QSFP28 (100GbE)",
"mountable": true,
"mounted": false,
"network_address": "servan-1-fpga1.grenoble.grid5000.fr",
......@@ -308,7 +313,8 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/98"
"switch_port": "ethernet1/1/98",
"vendor": "Xilinx"
}
],
"operating_system": {
......@@ -321,6 +327,8 @@
},
"other_devices": {
"fpga0": {
"core": 0,
"count": 1,
"model": "Alveo U200",
"type": "fpga",
"vendor": "Xilinx"
......
......@@ -276,6 +276,7 @@
},
{
"device": "fpga0",
"driver": "xrt",
"enabled": true,
"interface": "Ethernet-fpga",
"ip": "172.16.23.12",
......@@ -283,6 +284,7 @@
"kavlan": true,
"mac": "00:0a:35:06:4a:dc",
"management": false,
"model": "Alveo U200 QSFP28 (100GbE)",
"mountable": true,
"mounted": false,
"network_address": "servan-2-fpga0.grenoble.grid5000.fr",
......@@ -290,10 +292,12 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/99"
"switch_port": "ethernet1/1/99",
"vendor": "Xilinx"
},
{
"device": "fpga1",
"driver": "xrt",
"enabled": true,
"interface": "Ethernet-fpga",
"ip": "172.16.23.22",
......@@ -301,6 +305,7 @@
"kavlan": true,
"mac": "00:0a:35:06:4a:dd",
"management": false,
"model": "Alveo U200 QSFP28 (100GbE)",
"mountable": true,
"mounted": false,
"network_address": "servan-2-fpga1.grenoble.grid5000.fr",
......@@ -308,7 +313,8 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/100"
"switch_port": "ethernet1/1/100",
"vendor": "Xilinx"
}
],
"operating_system": {
......@@ -321,6 +327,8 @@
},
"other_devices": {
"fpga0": {
"core": 0,
"count": 1,
"model": "Alveo U200",
"type": "fpga",
"vendor": "Xilinx"
......
......@@ -66,16 +66,34 @@ nodes:
pci-0000:c4:00.0-nvme-1:
interface: NVME
id: disk1
other_devices:
fpga0:
count: 1
core: 0
servan-1:
network_adapters:
fpga0:
mac: 00:0A:35:06:4A:B8
driver: xrt
model: Alveo U200 QSFP28 (100GbE)
vendor: Xilinx
fpga1:
mac: 00:0A:35:06:4A:B9
driver: xrt
model: Alveo U200 QSFP28 (100GbE)
vendor: Xilinx
servan-2:
network_adapters:
fpga0:
mac: 00:0A:35:06:4A:DC
driver: xrt
model: Alveo U200 QSFP28 (100GbE)
vendor: Xilinx
fpga1:
mac: 00:0A:35:06:4A:DD
driver: xrt
model: Alveo U200 QSFP28 (100GbE)
vendor: Xilinx
......@@ -154,6 +154,13 @@ class G5KHardwareGenerator < WikiGenerator
}
# Accelerators
f = node_hash['other_devices']
fpga_families = {}
fpga_families[[f['fpga0']['vendor']]] = 1 if f and f['fpga0']
fpga_details = {}
# We don't have information about the number of cores, by default we add it manually to 0
fpga_details[["#{f['fpga0']['vendor']} #{f['fpga0']['model']}"]] = [1,0] if f and f['fpga0']
m = node_hash['mic']
mic_families = {}
......@@ -189,12 +196,12 @@ class G5KHardwareGenerator < WikiGenerator
}
end
gpu_families.merge(mic_families).sort.to_h.each { |k, v|
gpu_families.merge(mic_families).merge(fpga_families).sort.to_h.each { |k, v|
init(data, 'acc_families', k)
data['acc_families'][k][site_uid] += v
}
gpu_details.merge(mic_details).sort.to_h.each { |k, v|
gpu_details.merge(mic_details).merge(fpga_details).sort.to_h.each { |k, v|
init(data, 'acc_models', k)
data['acc_models'][k][site_uid] += v[0]
......@@ -259,7 +266,7 @@ class G5KHardwareGenerator < WikiGenerator
generated_content += generate_storage
generated_content += "\n''*: disk is [[Disk_reservation|reservable]]''"
generated_content += "\n= Accelerators (GPU, Xeon Phi) ="
generated_content += "\n= Accelerators (GPU, Xeon Phi, FPGA) ="
generated_content += "\n== Accelerator families ==\n"
table_columns = ['Accelerator family'] + sites + ['Accelerators total']
generated_content += MW.generate_table(table_options, table_columns, get_table_data(data, 'acc_families'))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment