graffy
/
concho
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
concho/tests/test1.py

92 lines
4.4 KiB
Python
Raw Normal View History

decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
from concho.dell import DellMatinfoCsvConfigurator
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
from concho.dell import MatinfoConfigurator
adapted concho's dell html parser to dell's 2021 web pages format note : dell's 2020 web pages are still supported
2021-04-07 23:07:11 +02:00
from concho.dell import DellConfiguratorParser2020
from concho.dell import DellConfiguratorParser2021
added hpe's dl360 gen10+ configurations - added support for hpe web pages for which the cpu options are not present in the javascript catalog. For these pages we have to find the cpu options in the html content
2023-01-24 19:01:17 +01:00
from concho.hpe import HpeConfiguratorParser, HpeCpuChoiceConfiguratorParser
the user can now choose what to plot and for which configs Now concho is much more generic, as this modification completes the refactoring initiated last week.
2020-10-01 19:18:53 +02:00
from concho.procs_chooser import plot_configurators
from concho.procs_chooser import ConfigPrice
added hpe's dl360 gen10+ configurations - added support for hpe web pages for which the cpu options are not present in the javascript catalog. For these pages we have to find the cpu options in the html content
2023-01-24 19:01:17 +01:00
from concho.procs_chooser import ConfigFlops
the user can now choose what to plot and for which configs Now concho is much more generic, as this modification completes the refactoring initiated last week.
2020-10-01 19:18:53 +02:00
from concho.procs_chooser import ConfigFlopsPerEuro
refactored because the code was hard to maintain and was hacked in lots of ways (handling of 4 servers per host). - the prices are now retrived from matinfo's downloaded pages - the derived prices (such as the price without cpu) are now automatically computed, rather than hardcoded from (hand computation) - although it's a bit dirty, the architecture of the code is more generic: - each configuration is now stored in a Config object, which is able to compute its price. - dell specific code is now decoupled into a separate file. warnings: - the refactoring is designed to handle the old price tables but this work is not finished (the code using the old price tables is broken at the moment) - the computed price is currently overestimated, as the price of the base memory dimms should be substracted - disks are not currently handled
2020-09-25 16:35:13 +02:00
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
def test_all_matinfo_2020_configs():
refactored because the code was hard to maintain and was hacked in lots of ways (handling of 4 servers per host). - the prices are now retrived from matinfo's downloaded pages - the derived prices (such as the price without cpu) are now automatically computed, rather than hardcoded from (hand computation) - although it's a bit dirty, the architecture of the code is more generic: - each configuration is now stored in a Config object, which is able to compute its price. - dell specific code is now decoupled into a separate file. warnings: - the refactoring is designed to handle the old price tables but this work is not finished (the code using the old price tables is broken at the moment) - the computed price is currently overestimated, as the price of the base memory dimms should be substracted - disks are not currently handled
2020-09-25 16:35:13 +02:00
# configurator = DellMatinfoConfigurator('rcrc1406676-4834664 - Cat2 Conf4 PowerEdge R640 - Dell.html')
# print(configurator)
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
configurators = [
DellMatinfoCsvConfigurator('c6420-20200716-price.tsv'),
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
MatinfoConfigurator('rcrc1406676-4834664 - Cat2 Conf4 PowerEdge R640 - Dell.html', DellConfiguratorParser2020()),
MatinfoConfigurator('rcrc1406676-4824727 - Cat 2 Conf 7 PowerEdge R940 - Dell.html', DellConfiguratorParser2020()),
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
# dell.DellPowerEdgeR940(),
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
]
the user can now choose what to plot and for which configs Now concho is much more generic, as this modification completes the refactoring initiated last week.
2020-10-01 19:18:53 +02:00
plot_configurators(configurators=configurators, ram_per_core=4.0e9, xaxis_def=ConfigPrice(), yaxis_def=ConfigFlopsPerEuro(), plot_title='total cost including electricity')
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
def test_credits_2020_configs():
# configurator = DellMatinfoConfigurator('rcrc1406676-4834664 - Cat2 Conf4 PowerEdge R640 - Dell.html')
# print(configurator)
configurators = [
DellMatinfoCsvConfigurator('c6420-20200716-price.tsv'),
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
MatinfoConfigurator('rcrc1406676-4834664 - Cat2 Conf4 PowerEdge R640 - Dell.html', DellConfiguratorParser2020()),
MatinfoConfigurator('rcrc1406676-4824727 - Cat 2 Conf 7 PowerEdge R940 - Dell.html', DellConfiguratorParser2020()),
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
# dell.DellPowerEdgeR940(),
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
]
the user can now choose what to plot and for which configs Now concho is much more generic, as this modification completes the refactoring initiated last week.
2020-10-01 19:18:53 +02:00
# config_filter = lambda config : config.cpu.uid in [
# 'intel-xeon-gold-5222',
# 'intel-xeon-gold-6226r',
# 'intel-xeon-gold-6230r',
# 'intel-xeon-gold-6234r',
# 'intel-xeon-gold-6240r',
# 'intel-xeon-gold-6248r',
# 'intel-xeon-gold-6230',
# 'intel-xeon-gold-6240',
# ]
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
def config_filter(config):
return config.get_price() < 40000.0
adapted concho's dell html parser to dell's 2021 web pages format note : dell's 2020 web pages are still supported
2021-04-07 23:07:11 +02:00
plot_configurators(configurators=configurators, ram_per_core=4.0e9, xaxis_def=ConfigPrice(), yaxis_def=ConfigFlopsPerEuro(), plot_title='physmol/ts credit 2020 configs', config_filter=config_filter)
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
adapted concho's dell html parser to dell's 2021 web pages format note : dell's 2020 web pages are still supported
2021-04-07 23:07:11 +02:00
def test_credits_2021_configs():
configurators = [
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
MatinfoConfigurator('20210407 - Cat2 Conf4 PowerEdge R640 - Dell.html', DellConfiguratorParser2021()),
MatinfoConfigurator('20210407 - Cat2 Conf7 PowerEdge R940 - Dell.html', DellConfiguratorParser2021()),
MatinfoConfigurator('20210407 - Cat2 Conf8 PowerEdge R7525 - Dell.html', DellConfiguratorParser2021()),
# MatinfoConfigurator('20210407 - Cat2 Conf10 PowerEdge R6525 - Dell.html', DellConfiguratorParser2021()),
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
]
adapted concho's dell html parser to dell's 2021 web pages format note : dell's 2020 web pages are still supported
2021-04-07 23:07:11 +02:00
# config_filter = lambda config : config.cpu.uid in [
# 'intel-xeon-gold-5222',
# 'intel-xeon-gold-6226r',
# 'intel-xeon-gold-6230r',
# 'intel-xeon-gold-6234r',
# 'intel-xeon-gold-6240r',
# 'intel-xeon-gold-6248r',
# 'intel-xeon-gold-6230',
# 'intel-xeon-gold-6240',
# ]
made code style compliant with pep8 conventions
2023-01-20 11:45:01 +01:00
def config_filter(config):
return config.get_price() < 40000.0
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
concho is now able to parse r6525 configurations - added support for amd epyc rome processors - handled the case where the 'additional processor' section doesn't exist in the web page (as it's the case in r6525 configurations)
2021-04-08 10:18:32 +02:00
plot_configurators(configurators=configurators, ram_per_core=4.0e9, xaxis_def=ConfigPrice(), yaxis_def=ConfigFlopsPerEuro(), plot_title='physmol/ts credit 2021 configs', config_filter=config_filter)
decoupled config genration from plot This allows the user to choose another set of configurations without touching plot code
2020-10-01 11:01:08 +02:00
refactored because the code was hard to maintain and was hacked in lots of ways (handling of 4 servers per host). - the prices are now retrived from matinfo's downloaded pages - the derived prices (such as the price without cpu) are now automatically computed, rather than hardcoded from (hand computation) - although it's a bit dirty, the architecture of the code is more generic: - each configuration is now stored in a Config object, which is able to compute its price. - dell specific code is now decoupled into a separate file. warnings: - the refactoring is designed to handle the old price tables but this work is not finished (the code using the old price tables is broken at the moment) - the computed price is currently overestimated, as the price of the base memory dimms should be substracted - disks are not currently handled
2020-09-25 16:35:13 +02:00
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
def test_ur1_presents_2023_configs():
configurators = [
added hpe's dl360 gen10+ configurations - added support for hpe web pages for which the cpu options are not present in the javascript catalog. For these pages we have to find the cpu options in the html content
2023-01-24 19:01:17 +01:00
# MatinfoConfigurator('20210407 - Cat2 Conf4 PowerEdge R640 - Dell.html', DellConfiguratorParser2021()),
improvements: - added the dell equivalent machines to the graph to see how they compare - updated the price of electricity
2023-01-23 15:29:42 +01:00
MatinfoConfigurator('20230120-cat2-conf3-hpe-dl360-gen10.html', HpeConfiguratorParser()),
added hpe's dl360 gen10+ configurations - added support for hpe web pages for which the cpu options are not present in the javascript catalog. For these pages we have to find the cpu options in the html content
2023-01-24 19:01:17 +01:00
MatinfoConfigurator('20230123-cat2-conf10-hpe-dl360-gen10plus-cpuchoice.html', HpeCpuChoiceConfiguratorParser()),
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
]
def config_filter(config):
return True # config.get_price() < 40000.0
plot_configurators(configurators=configurators, ram_per_core=4.0e9, xaxis_def=ConfigPrice(), yaxis_def=ConfigFlopsPerEuro(), plot_title='physmol/ts credit 2023 configs', config_filter=config_filter)
added hpe's dl360 gen10+ configurations - added support for hpe web pages for which the cpu options are not present in the javascript catalog. For these pages we have to find the cpu options in the html content
2023-01-24 19:01:17 +01:00
# plot_configurators(configurators=configurators, ram_per_core=4.0e9, xaxis_def=ConfigPrice(), yaxis_def=ConfigFlops(), plot_title='physmol/ts credit 2023 configs', config_filter=config_filter)
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
refactored because the code was hard to maintain and was hacked in lots of ways (handling of 4 servers per host). - the prices are now retrived from matinfo's downloaded pages - the derived prices (such as the price without cpu) are now automatically computed, rather than hardcoded from (hand computation) - although it's a bit dirty, the architecture of the code is more generic: - each configuration is now stored in a Config object, which is able to compute its price. - dell specific code is now decoupled into a separate file. warnings: - the refactoring is designed to handle the old price tables but this work is not finished (the code using the old price tables is broken at the moment) - the computed price is currently overestimated, as the price of the base memory dimms should be substracted - disks are not currently handled
2020-09-25 16:35:13 +02:00
if __name__ == '__main__':
added the ability to read the ctalog from a hpe configurator web page - note: only the page for HP Proliant DL360 gen10 has been tested Bug 3463 - adapter concho (outil d'aide au choix achat cpu pour hpc) au catalogue hpe
2023-01-20 19:12:14 +01:00
test_ur1_presents_2023_configs()