diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb index f166b1fc4c42e437e4b41cddbd1f4c9c2ac6780a..0d12547a16c2641f5b005918af7a428a001ff39c 100644 --- a/lib/refrepo/gen/wiki/generators/hardware.rb +++ b/lib/refrepo/gen/wiki/generators/hardware.rb @@ -192,19 +192,21 @@ class G5KHardwareGenerator < WikiGenerator vendor = acc['mic_vendor'] model = acc['mic_model'] compute_capability = { text: "N/A", sort: 0 } + microarchitecture = 'N/A' mem = RefRepo::Utils.get_as_gb(acc['mic_memory']) when :FPGA vendor = acc['vendor'] model = acc['model'] compute_capability = { text: "N/A", sort: 0 } + microarchitecture = 'N/A' mem = RefRepo::Utils.get_as_gb(acc['memory']) end key = [vendor, { text: acc_type.to_s, sort: acc_type.to_s } ] init(data, 'acc_families', key) data['acc_families'][key][site_uid] += 1 - - key = [vendor, { text: acc_type.to_s, sort: acc_type.to_s }, model, { text: "#{mem}GB", sort: mem }] + + key = [vendor, { text: acc_type.to_s, sort: acc_type.to_s }, model, {text: microarchitecture, sort: get_date(microarchitecture) + ', ' + microarchitecture}, { text: "#{mem}GB", sort: mem }] init(data, 'acc_models', key) data['acc_models'][key][site_uid] += 1 @@ -262,7 +264,7 @@ class G5KHardwareGenerator < WikiGenerator generated_content += "\n== Accelerator counts per type ==\n" table_columns = ['Vendor', 'Type'] + sites + ['Accelerators total'] generated_content += MW.generate_table(table_options, table_columns, get_table_data(data, 'acc_families')) - table_columns = ['Vendor', 'Type', 'Model', 'Memory'] + sites + ['Accelerators total'] + table_columns = ['Vendor', 'Type', 'Model', 'Microarch', 'Memory'] + sites + ['Accelerators total'] generated_content += "\n== Accelerator counts per model ==\n" generated_content += MW.generate_table(table_options, table_columns, get_table_data(data, 'acc_models')) generated_content += "\n== GPU core counts per GPU model ==\n" @@ -364,7 +366,8 @@ class G5KHardwareGenerator < WikiGenerator 'Kepler' => '2012', 'Pascal' => '2016', 'Volta' => '2017', - 'Fermi' => '2010' + 'Fermi' => '2010', + 'N/A' => ' ', } date = release_dates[microarchitecture] raise "ERROR: microarchitecture not found: '#{microarchitecture}'. Add in hardware.rb" if date.nil?