Mentions légales du service

Skip to content
Snippets Groups Projects
Commit d7c0c9e9 authored by Cyril Rohr's avatar Cyril Rohr
Browse files

Must now distinctively use GiB and GB. See... 

Must now distinctively use GiB and GB. See http://en.wikipedia.org/wiki/Binary_prefix Introduced K,M,G,T instead of kilo,mega,giga,tera.
parent c3b37e1d
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 194 additions and 196 deletions
generators/input/bordeaux.rb
+ 38
− 38
View file @ d7c0c9e9
...@@ -3,8 +3,8 @@ site :bordeaux do |site_uid| ...@@ -3,8 +3,8 @@ site :bordeaux do |site_uid|
location "Bordeaux, France" location "Bordeaux, France"
web "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home" web "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
description "Grid5000 Bordeaux site" description "Grid5000 Bordeaux site"
latitude "44° 50’ 18’’ Nord" latitude 44.833333
longitude "Nord 0° 34’ 41’’ Ouest" longitude -0.566667
email_contact "bordeaux-staff@lists.grid5000.fr" email_contact "bordeaux-staff@lists.grid5000.fr"
sys_admin_contact "bordeaux-staff@lists.grid5000.fr" sys_admin_contact "bordeaux-staff@lists.grid5000.fr"
security_contact "bordeaux-staff@lists.grid5000.fr" security_contact "bordeaux-staff@lists.grid5000.fr"
...@@ -30,16 +30,16 @@ version 1.48" ...@@ -30,16 +30,16 @@ version 1.48"
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "248", :version => "248",
:clock_speed => 2.2.giga, :clock_speed => 2.2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => "64K", :cache_l1i => 64.KiB,
:cache_l1d => "64K", :cache_l1d => 64.KiB,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -48,14 +48,14 @@ version 1.48" ...@@ -48,14 +48,14 @@ version 1.48"
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'IDE', :size => 80.GB(false), :driver => "amd74xx"} {:interface => 'IDE', :size => 80.GB, :driver => "amd74xx"}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-2000', :rate => 2.giga, {:interface => 'Myri-2000', :rate => 2.G,
:switch => "sbdm", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "sbdm", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "M3F-PCIXD-2", :enabled => true}, :vendor => 'Myrinet', :version => "M3F-PCIXD-2", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "tg3"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "tg3"}
] ]
end end
end end
...@@ -77,16 +77,16 @@ version 1.48" ...@@ -77,16 +77,16 @@ version 1.48"
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "EM64T", :version => "EM64T",
:clock_speed => 3.giga, :clock_speed => 3.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => "16K", :cache_l1d => 16.KiB,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -95,14 +95,14 @@ version 1.48" ...@@ -95,14 +95,14 @@ version 1.48"
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SCSI', :size => 70.GB(false), :driver => "mptspi"} {:interface => 'SCSI', :size => 70.GB, :driver => "mptspi"}
] ]
network_adapters [ network_adapters [
{:interface => 'InfiniBand', :rate => 10.giga, {:interface => 'InfiniBand', :rate => 10.G,
:switch => "sbdp", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "sbdp", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'InfiniHost', :version => "MT25208", :enabled => true}, :vendor => 'InfiniHost', :version => "MT25208", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "e1000"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
] ]
end end
end end
...@@ -124,16 +124,16 @@ version 1.48" ...@@ -124,16 +124,16 @@ version 1.48"
:vendor => "AMD", :vendor => "AMD",
:model => "Dual-Core AMD Opteron Processor", :model => "Dual-Core AMD Opteron Processor",
:version => "2218", :version => "2218",
:clock_speed => 2.6.giga, :clock_speed => 2.6.G,
:instruction_set => "x86-64", :instruction_set => "x86-64",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => "64K", :cache_l1i => 64.KiB,
:cache_l1d => "64K", :cache_l1d => 64.KiB,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # bytes :ram_size => 4.GiB,
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -142,13 +142,13 @@ version 1.48" ...@@ -142,13 +142,13 @@ version 1.48"
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_svw", :vendor => "Hitachi", :version => "HDS72168"} {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw", :vendor => "Hitachi", :version => "HDS72168"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"}, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"} {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"}
] ]
end end
end end
...@@ -170,16 +170,16 @@ version 1.48" ...@@ -170,16 +170,16 @@ version 1.48"
:vendor => "AMD", :vendor => "AMD",
:model => "Dual-Core AMD Opteron Processor 8218", :model => "Dual-Core AMD Opteron Processor 8218",
:version => "2218", :version => "2218",
:clock_speed => 2.6.giga, :clock_speed => 2.6.G,
:instruction_set => "x86-64", :instruction_set => "x86-64",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => "64K", :cache_l1i => 64.KiB,
:cache_l1d => "64K", :cache_l1d => 64.KiB,
:cache_l2 => 2.MB :cache_l2 => 2.MiB
}) })
main_memory({ main_memory({
:ram_size => 32.GB(true), # bytes :ram_size => 32.GiB,
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -188,17 +188,17 @@ version 1.48" ...@@ -188,17 +188,17 @@ version 1.48"
:version => "5.0" :version => "5.0"
}) })
storage_devices [ storage_devices [
{:interface => 'SAS', :size => 600.GB(false), :driver => nil} {:interface => 'SAS', :size => 600.GB, :driver => nil}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-10G', :rate => 10.giga, {:interface => 'Myri-10G', :rate => 10.G,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}, :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'InfiniBand', :rate => 10.giga, :vendor => 'InfiniHost', :version => "MT25408", :enabled => true}, {:interface => 'InfiniBand', :rate => 10.G, :vendor => 'InfiniHost', :version => "MT25408", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "e1000"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
] ]
end end
end end
end # cluster borderline end # cluster borderline
end end
\ No newline at end of file
generators/input/environments.rb
+ 16
− 16
View file @ d7c0c9e9
...@@ -10,7 +10,7 @@ environment 'sid-x64-base-1.0' do ...@@ -10,7 +10,7 @@ environment 'sid-x64-base-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'sid-x64-base-1.1' do environment 'sid-x64-base-1.1' do
...@@ -25,7 +25,7 @@ environment 'sid-x64-base-1.1' do ...@@ -25,7 +25,7 @@ environment 'sid-x64-base-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'sid-x64-nfs-1.0' do environment 'sid-x64-nfs-1.0' do
...@@ -40,7 +40,7 @@ environment 'sid-x64-nfs-1.0' do ...@@ -40,7 +40,7 @@ environment 'sid-x64-nfs-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'sid-x64-nfs-1.1' do environment 'sid-x64-nfs-1.1' do
...@@ -55,7 +55,7 @@ environment 'sid-x64-nfs-1.1' do ...@@ -55,7 +55,7 @@ environment 'sid-x64-nfs-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'sid-x64-big-1.1' do environment 'sid-x64-big-1.1' do
...@@ -70,7 +70,7 @@ environment 'sid-x64-big-1.1' do ...@@ -70,7 +70,7 @@ environment 'sid-x64-big-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'etch-x64-base-1.0' do environment 'etch-x64-base-1.0' do
...@@ -85,7 +85,7 @@ environment 'etch-x64-base-1.0' do ...@@ -85,7 +85,7 @@ environment 'etch-x64-base-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'etch-x64-base-1.1' do environment 'etch-x64-base-1.1' do
...@@ -100,7 +100,7 @@ environment 'etch-x64-base-1.1' do ...@@ -100,7 +100,7 @@ environment 'etch-x64-base-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'etch-x64-nfs-1.0' do environment 'etch-x64-nfs-1.0' do
...@@ -115,7 +115,7 @@ environment 'etch-x64-nfs-1.0' do ...@@ -115,7 +115,7 @@ environment 'etch-x64-nfs-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'etch-x64-nfs-1.1' do environment 'etch-x64-nfs-1.1' do
...@@ -130,7 +130,7 @@ environment 'etch-x64-nfs-1.1' do ...@@ -130,7 +130,7 @@ environment 'etch-x64-nfs-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'etch-x64-big-1.0' do environment 'etch-x64-big-1.0' do
...@@ -145,7 +145,7 @@ environment 'etch-x64-big-1.0' do ...@@ -145,7 +145,7 @@ environment 'etch-x64-big-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'etch-x64-big-1.1' do environment 'etch-x64-big-1.1' do
...@@ -160,7 +160,7 @@ environment 'etch-x64-big-1.1' do ...@@ -160,7 +160,7 @@ environment 'etch-x64-big-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'etch-x64-xen-1.0' do environment 'etch-x64-xen-1.0' do
...@@ -175,7 +175,7 @@ environment 'etch-x64-xen-1.0' do ...@@ -175,7 +175,7 @@ environment 'etch-x64-xen-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'lenny-x64-base-0.9' do environment 'lenny-x64-base-0.9' do
...@@ -190,7 +190,7 @@ environment 'lenny-x64-base-0.9' do ...@@ -190,7 +190,7 @@ environment 'lenny-x64-base-0.9' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'lenny-x64-base-1.0' do environment 'lenny-x64-base-1.0' do
...@@ -205,7 +205,7 @@ environment 'lenny-x64-base-1.0' do ...@@ -205,7 +205,7 @@ environment 'lenny-x64-base-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'lenny-x64-nfs-0.9' do environment 'lenny-x64-nfs-0.9' do
...@@ -220,7 +220,7 @@ environment 'lenny-x64-nfs-0.9' do ...@@ -220,7 +220,7 @@ environment 'lenny-x64-nfs-0.9' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
environment 'lenny-x64-big-0.9' do environment 'lenny-x64-big-0.9' do
...@@ -235,5 +235,5 @@ environment 'lenny-x64-big-0.9' do ...@@ -235,5 +235,5 @@ environment 'lenny-x64-big-0.9' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ") applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true x11_forwarding true
max_open_files 8192 max_open_files 8192
tcp_bandwidth 1.giga tcp_bandwidth 1.G
end end
\ No newline at end of file
generators/input/grenoble.rb
+ 5
− 5
View file @ d7c0c9e9
...@@ -29,7 +29,7 @@ site :grenoble do |site_uid| ...@@ -29,7 +29,7 @@ site :grenoble do |site_uid|
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "E5420 QC", :version => "E5420 QC",
:clock_speed => 2.5.giga, :clock_speed => 2.5.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
...@@ -38,7 +38,7 @@ site :grenoble do |site_uid| ...@@ -38,7 +38,7 @@ site :grenoble do |site_uid|
:cache_l2 => nil :cache_l2 => nil
}) })
main_memory({ main_memory({
:ram_size => 8.GB(true), # bytes :ram_size => 8.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -47,12 +47,12 @@ site :grenoble do |site_uid| ...@@ -47,12 +47,12 @@ site :grenoble do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 160.GB(false), :driver => nil} {:interface => 'SATA', :size => 160.GB, :driver => nil}
] ]
network_adapters [ network_adapters [
{:interface => 'InfiniBand 10G', :rate => 10.giga, :enabled => true, {:interface => 'InfiniBand 10G', :rate => 10.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")}, :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false} {:interface => 'Ethernet', :rate => 1.G, :enabled => false}
] ]
end end
end end
......
generators/input/input.description.ignore
+ 8
− 7
View file @ d7c0c9e9
...@@ -29,7 +29,7 @@ site :rennes do |site_uid| # General description of the site. ...@@ -29,7 +29,7 @@ site :rennes do |site_uid| # General description of the site.
# describes the architecture of the node # describes the architecture of the node
architecture({ architecture({
:smp_size => 2, # number of physical CPUs :smp_size => 2, # number of physical CPUs
:smt_size => 4, # number of logical CPUs (cores) :smt_size => 4, # total number of logical CPUs (cores)
:platform_type => "x86_64" :platform_type => "x86_64"
}) })
# describes the processors # describes the processors
...@@ -37,7 +37,7 @@ site :rennes do |site_uid| # General description of the site. ...@@ -37,7 +37,7 @@ site :rennes do |site_uid| # General description of the site.
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "5148 LV", :version => "5148 LV",
:clock_speed => 2.33.giga, # giga = 10^9 :clock_speed => 2.33.G, # G = 10^9, M = 10^6, etc.
:instruction_set => "", # x86-64, IA-64, ... :instruction_set => "", # x86-64, IA-64, ...
:other_description => "", :other_description => "",
:cache_l1 => nil, # first-level unified cache size of the processor :cache_l1 => nil, # first-level unified cache size of the processor
...@@ -46,7 +46,7 @@ site :rennes do |site_uid| # General description of the site. ...@@ -46,7 +46,7 @@ site :rennes do |site_uid| # General description of the site.
:cache_l2 => nil # second-level unified cache size of the processor :cache_l2 => nil # second-level unified cache size of the processor
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # the amount of RAM (indicating true means "true bytes" (multiple of 2^10)) :ram_size => 4.GiB, # the amount of RAM. MAKE SURE YOU USE GiB or MiB or KiB, and not GB, MB, KB...
:virtual_size => nil # the amount of virtual memory (RAM+Swap) :virtual_size => nil # the amount of virtual memory (RAM+Swap)
}) })
# Information about the default operating system of the node # Information about the default operating system of the node
...@@ -62,21 +62,22 @@ site :rennes do |site_uid| # General description of the site. ...@@ -62,21 +62,22 @@ site :rennes do |site_uid| # General description of the site.
:version => nil # version of the operating system :version => nil # version of the operating system
}) })
# Describes the list of storage devices available on the node # Describes the list of storage devices available on the node
# Notice the use of ***GB*** (and not GiB)
# Required properties include: :interface, :size # Required properties include: :interface, :size
# You may add the :driver property, or a :raid property (e.g. :raid => "0") if needed. # You may add the :driver property, or a :raid property (e.g. :raid => "0") if needed.
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 160.GB(false), :driver => "mptsas"} {:interface => 'SATA', :size => 160.GB, :driver => "mptsas"}
] ]
# Describes the list of network adapters available on the node # Describes the list of network adapters available on the node
# Required properties include: :interface, :rate, :switch, :network_address, :ip, :enabled # Required properties include: :interface, :rate, :switch, :network_address, :ip, :enabled
# You may add properties such as: :driver, :vendor, :version # You may add properties such as: :driver, :vendor, :version
# You may include adapters reserved for management (in this case, set enabled to false) # You may include adapters reserved for management (in this case, set enabled to false)
network_adapters [ network_adapters [
{:interface => 'Myri-10G', :rate => 10.giga, {:interface => 'Myri-10G', :rate => 10.G,
:switch => "c6509-grid", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "c6509-grid", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}, :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false} {:interface => 'Ethernet', :rate => 1.G, :enabled => false}
] ]
end end
end end
......
generators/input/lille.rb
+ 20
− 20
View file @ d7c0c9e9
...@@ -29,16 +29,16 @@ site :lille do |site_uid| ...@@ -29,16 +29,16 @@ site :lille do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "248", :version => "248",
:clock_speed => 2.2.giga, :clock_speed => 2.2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # bytes :ram_size => 4.GiB,
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -47,10 +47,10 @@ site :lille do |site_uid| ...@@ -47,10 +47,10 @@ site :lille do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_sil"} {:interface => 'SATA', :size => 80.GB, :driver => "sata_sil"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"} :driver => "tg3"}
] ]
...@@ -74,16 +74,16 @@ site :lille do |site_uid| ...@@ -74,16 +74,16 @@ site :lille do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "252", :version => "252",
:clock_speed => 2.6.giga, :clock_speed => 2.6.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # bytes :ram_size => 4.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -92,10 +92,10 @@ site :lille do |site_uid| ...@@ -92,10 +92,10 @@ site :lille do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_svw"} {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"} :driver => "tg3"}
] ]
...@@ -118,16 +118,16 @@ site :lille do |site_uid| ...@@ -118,16 +118,16 @@ site :lille do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "285", :version => "285",
:clock_speed => 2.6.giga, :clock_speed => 2.6.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # bytes :ram_size => 4.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -136,10 +136,10 @@ site :lille do |site_uid| ...@@ -136,10 +136,10 @@ site :lille do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_svw"} {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"} :driver => "tg3"}
] ]
...@@ -162,16 +162,16 @@ site :lille do |site_uid| ...@@ -162,16 +162,16 @@ site :lille do |site_uid|
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "E5440 QC", :version => "E5440 QC",
:clock_speed => 2.83.giga, :clock_speed => 2.83.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 4.MB :cache_l2 => 4.MiB
}) })
main_memory({ main_memory({
:ram_size => 8.GB(true), # bytes :ram_size => 8.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -180,10 +180,10 @@ site :lille do |site_uid| ...@@ -180,10 +180,10 @@ site :lille do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA II', :size => 250.GB(false), :driver => "ahci"} {:interface => 'SATA II', :size => 250.GB, :driver => "ahci"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "e1000"} :driver => "e1000"}
] ]
......
generators/input/lyon.rb
+ 11
− 11
View file @ d7c0c9e9
...@@ -29,16 +29,16 @@ site :lyon do |site_uid| ...@@ -29,16 +29,16 @@ site :lyon do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "246", :version => "246",
:clock_speed => 2.giga, :clock_speed => 2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -47,13 +47,13 @@ site :lyon do |site_uid| ...@@ -47,13 +47,13 @@ site :lyon do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'IDE', :size => 80.GB(false), :driver => "amd74xx"} {:interface => 'IDE', :size => 80.GB, :driver => "amd74xx"}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-2000', :rate => 2.giga, {:interface => 'Myri-2000', :rate => 2.G,
:switch => "little-ego", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "little-ego", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "M3F-PCIXF-2", :enabled => true}, :vendor => 'Myrinet', :version => "M3F-PCIXF-2", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3"} {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3"}
] ]
end end
end end
...@@ -74,16 +74,16 @@ site :lyon do |site_uid| ...@@ -74,16 +74,16 @@ site :lyon do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "250", :version => "250",
:clock_speed => 2.4.giga, :clock_speed => 2.4.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -92,10 +92,10 @@ site :lyon do |site_uid| ...@@ -92,10 +92,10 @@ site :lyon do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SCSI', :size => 73.GB(false), :driver => "mptspi"} {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "little-ego", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "little-ego", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"} :driver => "tg3"}
] ]
......
generators/input/nancy.rb
+ 13
− 13
View file @ d7c0c9e9
...@@ -28,16 +28,16 @@ site :nancy do |site_uid| ...@@ -28,16 +28,16 @@ site :nancy do |site_uid|
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "5110", :version => "5110",
:clock_speed => 1.6.giga, :clock_speed => 1.6.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 4.MB :cache_l2 => 4.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -46,13 +46,13 @@ site :nancy do |site_uid| ...@@ -46,13 +46,13 @@ site :nancy do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "ata_piix"} {:interface => 'SATA', :size => 80.GB, :driver => "ata_piix"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "sgrelon1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "sgrelon1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3", :vendor => "Broadcom", :version => "BCM5721"}, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5721"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5721"} {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5721"}
] ]
end end
end end
...@@ -73,16 +73,16 @@ site :nancy do |site_uid| ...@@ -73,16 +73,16 @@ site :nancy do |site_uid|
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "L5420", :version => "L5420",
:clock_speed => 2.5.giga, :clock_speed => 2.5.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 12.MB :cache_l2 => 12.MiB
}) })
main_memory({ main_memory({
:ram_size => 16.GB(true), # bytes :ram_size => 16.GiB,
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -91,14 +91,14 @@ site :nancy do |site_uid| ...@@ -91,14 +91,14 @@ site :nancy do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA II', :size => 320.GB(false), :driver => "ata_piix"} {:interface => 'SATA II', :size => 320.GB, :driver => "ata_piix"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "sgriffon1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "sgriffon1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "e1000e", :vendor => "intel", :version => "80003ES2LAN"}, :driver => "e1000e", :vendor => "intel", :version => "80003ES2LAN"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000e", :vendor => "intel", :version => "BCM5721"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000e", :vendor => "intel", :version => "BCM5721"},
{:interface => 'Infiniband 20G', :rate => 20.giga, :enabled => true, {:interface => 'Infiniband 20G', :rate => 20.G, :enabled => true,
:switch => "ib_switch", :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418" } :switch => "ib_switch", :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418" }
] ]
end end
......
generators/input/orsay.rb
+ 15
− 15
View file @ d7c0c9e9
...@@ -29,16 +29,16 @@ site :orsay do |site_uid| ...@@ -29,16 +29,16 @@ site :orsay do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "246", :version => "246",
:clock_speed => 2.giga, :clock_speed => 2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -47,16 +47,16 @@ site :orsay do |site_uid| ...@@ -47,16 +47,16 @@ site :orsay do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => nil} {:interface => 'SATA', :size => 80.GB, :driver => nil}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => nil}, :driver => nil},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"), :switch => nil, :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
:driver => nil}, :driver => nil},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}-eth2.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth2.#{site_uid}.grid5000.fr"), :switch => nil, :network_address => "#{node_uid}-eth2.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth2.#{site_uid}.grid5000.fr"),
:driver => nil} :driver => nil}
] ]
...@@ -82,16 +82,16 @@ site :orsay do |site_uid| ...@@ -82,16 +82,16 @@ site :orsay do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "246", :version => "246",
:clock_speed => 2.giga, :clock_speed => 2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -100,14 +100,14 @@ site :orsay do |site_uid| ...@@ -100,14 +100,14 @@ site :orsay do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => nil} {:interface => 'SATA', :size => 80.GB, :driver => nil}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-10G', :rate => 10.giga, :enabled => true, {:interface => 'Myri-10G', :rate => 10.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => "Myrinet", :version => "10G-PCIE-8A-C"}, :vendor => "Myrinet", :version => "10G-PCIE-8A-C"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false} {:interface => 'Ethernet', :rate => 1.G, :enabled => false}
] ]
end end
end end
...@@ -117,7 +117,7 @@ site :orsay do |site_uid| ...@@ -117,7 +117,7 @@ site :orsay do |site_uid|
node "#{cluster_uid}-#{182+i}" do node "#{cluster_uid}-#{182+i}" do
processor({ processor({
:version => "250", :version => "250",
:clock_speed => 2.4.giga :clock_speed => 2.4.G
}) })
end end
end end
......
generators/input/rennes.rb
+ 18
− 18
View file @ d7c0c9e9
...@@ -30,7 +30,7 @@ site :rennes do |site_uid| ...@@ -30,7 +30,7 @@ site :rennes do |site_uid|
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "5148 LV", :version => "5148 LV",
:clock_speed => 2.33.giga, :clock_speed => 2.33.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
...@@ -39,7 +39,7 @@ site :rennes do |site_uid| ...@@ -39,7 +39,7 @@ site :rennes do |site_uid|
:cache_l2 => nil :cache_l2 => nil
}) })
main_memory({ main_memory({
:ram_size => 8.GB(true), # bytes :ram_size => 8.GiB,
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -49,15 +49,15 @@ site :rennes do |site_uid| ...@@ -49,15 +49,15 @@ site :rennes do |site_uid|
:kernel => "2.6.19.1" :kernel => "2.6.19.1"
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 300.GB(false), :driver => "megaraid_sas", :raid => "0"}, {:interface => 'SATA', :size => 300.GB, :driver => "megaraid_sas", :raid => "0"},
{:interface => 'SATA', :size => 300.GB(false), :driver => "megaraid_sas", :raid => "0"} {:interface => 'SATA', :size => 300.GB, :driver => "megaraid_sas", :raid => "0"}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-10G', :rate => 10.giga, {:interface => 'Myri-10G', :rate => 10.G,
:switch => "c6509-grid", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "c6509-grid", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}, :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "bnx2"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "bnx2"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "bnx2"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "bnx2"}
] ]
end end
end end
...@@ -79,7 +79,7 @@ site :rennes do |site_uid| ...@@ -79,7 +79,7 @@ site :rennes do |site_uid|
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "5148 LV", :version => "5148 LV",
:clock_speed => 2.33.giga, :clock_speed => 2.33.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
...@@ -88,7 +88,7 @@ site :rennes do |site_uid| ...@@ -88,7 +88,7 @@ site :rennes do |site_uid|
:cache_l2 => nil :cache_l2 => nil
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # bytes :ram_size => 4.GiB,
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -98,14 +98,14 @@ site :rennes do |site_uid| ...@@ -98,14 +98,14 @@ site :rennes do |site_uid|
:kernel => "2.6.19.1" :kernel => "2.6.19.1"
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 160.GB(false), :driver => "mptsas"} {:interface => 'SATA', :size => 160.GB, :driver => "mptsas"}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-10G', :rate => 10.giga, {:interface => 'Myri-10G', :rate => 10.G,
:switch => "c6509-grid", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "c6509-grid", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}, :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "bnx2"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "bnx2"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "bnx2"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "bnx2"}
] ]
end end
end end
...@@ -127,7 +127,7 @@ site :rennes do |site_uid| ...@@ -127,7 +127,7 @@ site :rennes do |site_uid|
:vendor => "Intel", :vendor => "Intel",
:model => "Intel Xeon", :model => "Intel Xeon",
:version => "L5420", :version => "L5420",
:clock_speed => 2.5.giga, :clock_speed => 2.5.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
...@@ -136,7 +136,7 @@ site :rennes do |site_uid| ...@@ -136,7 +136,7 @@ site :rennes do |site_uid|
:cache_l2 => nil :cache_l2 => nil
}) })
main_memory({ main_memory({
:ram_size => 32.GB(true), # bytes :ram_size => 32.GiB,
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -146,11 +146,11 @@ site :rennes do |site_uid| ...@@ -146,11 +146,11 @@ site :rennes do |site_uid|
:kernel => "2.6.28" :kernel => "2.6.28"
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 160.GB(false), :driver => "ata_piix"} {:interface => 'SATA', :size => 160.GB, :driver => "ata_piix"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "e1000e"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000e"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000e"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000e"}
] ]
end end
end end
......
generators/input/sophia.rb
+ 25
− 25
View file @ d7c0c9e9
...@@ -28,16 +28,16 @@ site :sophia do |site_uid| ...@@ -28,16 +28,16 @@ site :sophia do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "246", :version => "246",
:clock_speed => 2.giga, :clock_speed => 2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -46,14 +46,14 @@ site :sophia do |site_uid| ...@@ -46,14 +46,14 @@ site :sophia do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'IDE', :size => 80.GB(false), :driver => "amd74xx"} {:interface => 'IDE', :size => 80.GB, :driver => "amd74xx"}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-2000', :rate => 2.giga, :enabled => true, {:interface => 'Myri-2000', :rate => 2.G, :enabled => true,
:switch => "cisco1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "cisco1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "M3F-PCIXF-2"}, :vendor => 'Myrinet', :version => "M3F-PCIXF-2"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "tg3"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "tg3"}
] ]
end end
end end
...@@ -74,16 +74,16 @@ site :sophia do |site_uid| ...@@ -74,16 +74,16 @@ site :sophia do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "275", :version => "275",
:clock_speed => 2.2.giga, :clock_speed => 2.2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # bytes :ram_size => 4.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -92,17 +92,17 @@ site :sophia do |site_uid| ...@@ -92,17 +92,17 @@ site :sophia do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SAS', :size => 73.GB(false), :driver => "mptsas", :raid => "0"}, {:interface => 'SAS', :size => 73.GB, :driver => "mptsas", :raid => "0"},
{:interface => 'SAS', :size => 73.GB(false), :driver => "mptsas", :raid => "0"} {:interface => 'SAS', :size => 73.GB, :driver => "mptsas", :raid => "0"}
] ]
network_adapters [ network_adapters [
{:interface => 'Myri-2000', :rate => 2.giga, :enabled => true, {:interface => 'Myri-2000', :rate => 2.G, :enabled => true,
:switch => "edgeiron48gs", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "edgeiron48gs", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "M3F-PCIXF-2"}, :vendor => 'Myrinet', :version => "M3F-PCIXF-2"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "e1000"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
] ]
end end
end end
...@@ -123,16 +123,16 @@ site :sophia do |site_uid| ...@@ -123,16 +123,16 @@ site :sophia do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "2218", :version => "2218",
:clock_speed => 2.6.giga, :clock_speed => 2.6.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 4.GB(true), # bytes :ram_size => 4.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -141,15 +141,15 @@ site :sophia do |site_uid| ...@@ -141,15 +141,15 @@ site :sophia do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 250.GB(false), :driver => "sata_nv"} {:interface => 'SATA', :size => 250.GB, :driver => "sata_nv"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "fastiron", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "fastiron", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => "NVIDIA", :version => "MCP55 Pro"}, :vendor => "NVIDIA", :version => "MCP55 Pro"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :vendor => "NVIDIA", :version => "MCP55 Pro"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :vendor => "NVIDIA", :version => "MCP55 Pro"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c"}
] ]
end end
end end
......
generators/input/toulouse.rb
+ 13
− 13
View file @ d7c0c9e9
...@@ -29,7 +29,7 @@ site :toulouse do |site_uid| ...@@ -29,7 +29,7 @@ site :toulouse do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "248", :version => "248",
:clock_speed => 2.2.giga, :clock_speed => 2.2.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
...@@ -38,7 +38,7 @@ site :toulouse do |site_uid| ...@@ -38,7 +38,7 @@ site :toulouse do |site_uid|
:cache_l2 => nil :cache_l2 => nil
}) })
main_memory({ main_memory({
:ram_size => 2.GB(true), # bytes :ram_size => 2.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -47,13 +47,13 @@ site :toulouse do |site_uid| ...@@ -47,13 +47,13 @@ site :toulouse do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SCSI', :size => 73.GB(false), :driver => "mptspi"} {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "cict-switch", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "cict-switch", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"}, :driver => "tg3"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "tg3"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "tg3"}
] ]
end end
end end
...@@ -75,16 +75,16 @@ site :toulouse do |site_uid| ...@@ -75,16 +75,16 @@ site :toulouse do |site_uid|
:vendor => "AMD", :vendor => "AMD",
:model => "AMD Opteron", :model => "AMD Opteron",
:version => "2218", :version => "2218",
:clock_speed => 2.6.giga, :clock_speed => 2.6.G,
:instruction_set => "", :instruction_set => "",
:other_description => "", :other_description => "",
:cache_l1 => nil, :cache_l1 => nil,
:cache_l1i => nil, :cache_l1i => nil,
:cache_l1d => nil, :cache_l1d => nil,
:cache_l2 => 1.MB :cache_l2 => 1.MiB
}) })
main_memory({ main_memory({
:ram_size => 8.GB(true), # bytes :ram_size => 8.GiB, # bytes
:virtual_size => nil :virtual_size => nil
}) })
operating_system({ operating_system({
...@@ -93,15 +93,15 @@ site :toulouse do |site_uid| ...@@ -93,15 +93,15 @@ site :toulouse do |site_uid|
:version => nil :version => nil
}) })
storage_devices [ storage_devices [
{:interface => 'SATA', :size => 250.GB(false), :driver => "sata_nv"} {:interface => 'SATA', :size => 250.GB, :driver => "sata_nv"}
] ]
network_adapters [ network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, {:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "r4", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :switch => "r4", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => "NVIDIA", :version => "MCP55 Pro", :driver => "forcedeth"}, :vendor => "NVIDIA", :version => "MCP55 Pro", :driver => "forcedeth"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :vendor => "NVIDIA", :version => "MCP55 Pro", :driver => "forcedeth"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :vendor => "NVIDIA", :version => "MCP55 Pro", :driver => "forcedeth"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c", :driver => "tg3"}, {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c", :driver => "tg3"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c", :driver => "tg3"} {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :vendor => "Broadcom", :version => "BCM5715c", :driver => "tg3"}
] ]
end end
end end
......
generators/lib/core_extensions.rb
+ 12
− 15
View file @ d7c0c9e9
class Numeric class Numeric
def TB(correct = true) def K; self*10**3; end
if correct then self*1024**4; else self.tera/(1.024**4); end def M; self*10**6; end
end def G; self*10**9; end
# Returns the number of bytes. def T; self*10**12; end
#
# If you know that the provided number is not correct (in the case of hard drive capacities for example), {
# setting +correct+ to +false+ will return the "real" number of bytes (e.g. HD 160GB has in reality 149011611938.477 bytes). :KiB => 1024, :MiB => 1024**2, :GiB => 1024**3, :TiB => 1024**4,
def GB(correct = true) :KB => 1.K/1.024, :MB => 1.M/1.024**2, :GB => 1.G/1.024**3, :TB => 1.T/1.024**4
if correct then self*1024**3; else self.giga/(1.024**3); end }.each do |method, multiplier|
end define_method(method) do
def MB(correct = true) self*multiplier
if correct then self*1024**2; else self.mega/(1.024**2); end end
end end
def mega; self*1_000_000; end
def giga; self*1_000_000_000; end
def tera; self*1_000_000_000_000; end
end end
class String class String
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment