graffy
/
concho
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added current dell poweredge r660 configurator 

work related to [https://bugzilla.ipr.univ-rennes.fr/show_bug.cgi?id=4171]
This commit is contained in:
Guillaume Raffy 2025-10-23 16:44:21 +02:00
parent 40ec1807fd
commit b2e305eef5
5 changed files with 12716 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
catalogs/cpu_table.tsv
View File

@ -234,12 +234,19 @@ intel-xeon-platinum-8480+ 2.0 56 2 350 0 0 105.0
intel-xeon-platinum-8490h 1.9 60 8 350 0 0 112.5 intel-xeon-platinum-8490h 1.9 60 8 350 0 0 112.5
intel-xeon-platinum-9462 2.7 32 2 350 0 0 75.0 intel-xeon-platinum-9462 2.7 32 2 350 0 0 75.0
intel-xeon-silver-4509y 2.6 8 2 125 0 0 22.5
intel-xeon-silver-4510 2.4 12 2 150 0 0 30.0
intel-xeon-silver-4514y 2.0 16 2 150 0 0 30.0 intel-xeon-silver-4514y 2.0 16 2 150 0 0 30.0
intel-xeon-gold-6526y 2.8 16 2 195 0 0 37.5 intel-xeon-gold-6526y 2.8 16 2 195 0 0 37.5
intel-xeon-gold-6534 3.9 8 2 195 0 0 22.5 intel-xeon-gold-6534 3.9 8 2 195 0 0 22.5
intel-xeon-gold-6542y 2.9 24 2 250 0 0 60.0 intel-xeon-gold-6542y 2.9 24 2 250 0 0 60.0
intel-xeon-gold-6544y 3.6 16 2 270 0 0 45.0
intel-xeon-gold-6548n 2.8 32 2 250 0 0 60.0
intel-xeon-gold-6548y+ 2.5 32 2 250 0 0 60.0 intel-xeon-gold-6548y+ 2.5 32 2 250 0 0 60.0
intel-xeon-platinum-8562y+ 2.8 32 2 300 0 0 60.0 intel-xeon-platinum-8562y+ 2.8 32 2 300 0 0 60.0
intel-xeon-platinum-8568y+ 2.3 48 2 350 0 0 300.0
intel-xeon-platinum-8580 2.0 60 2 350 0 0 350.0
intel-xeon-platinum-8592+ 1.9 64 2 330 0 0 320.0
intel-xeon-performance-6505p 2.2 12 2 150 0 0 48.0 intel-xeon-performance-6505p 2.2 12 2 150 0 0 48.0
intel-xeon-performance-6507p 3.5 8 2 150 0 0 48.0 intel-xeon-performance-6507p 3.5 8 2 150 0 0 48.0

1 #id clock num_cores max_cpus tdp cpumark_1_cpu cpumark_2_cpu l3_cache_mb
234 intel-xeon-gold-6526y intel-xeon-silver-4510 2.8 2.4 16 12 2 195 150 0 0 37.5 30.0
235 intel-xeon-gold-6534 intel-xeon-silver-4514y 3.9 2.0 8 16 2 195 150 0 0 22.5 30.0
236 intel-xeon-gold-6542y intel-xeon-gold-6526y 2.9 2.8 24 16 2 250 195 0 0 60.0 37.5
237 intel-xeon-gold-6534 3.9 8 2 195 0 0 22.5
238 intel-xeon-gold-6542y 2.9 24 2 250 0 0 60.0
239 intel-xeon-gold-6548y+ intel-xeon-gold-6544y 2.5 3.6 32 16 2 250 270 0 0 60.0 45.0
240 intel-xeon-platinum-8562y+ intel-xeon-gold-6548n 2.8 32 32 2 300 250 0 0 60.0
241 intel-xeon-performance-6505p intel-xeon-gold-6548y+ 2.2 2.5 12 32 2 150 250 0 0 48.0 60.0
242 intel-xeon-performance-6507p intel-xeon-platinum-8562y+ 3.5 2.8 8 32 2 150 300 0 0 48.0 60.0
243 intel-xeon-platinum-8568y+ 2.3 48 2 350 0 0 300.0
244 intel-xeon-platinum-8580 2.0 60 2 350 0 0 350.0
245 intel-xeon-performance-6515p intel-xeon-platinum-8592+ 2.3 1.9 16 64 2 150 330 0 0 72.0 320.0
246 intel-xeon-performance-6517p intel-xeon-performance-6505p 3.2 2.2 16 12 2 190 150 0 0 72.0 48.0
247 intel-xeon-performance-6507p 3.5 8 2 150 0 0 48.0
248 intel-xeon-performance-6515p 2.3 16 2 150 0 0 72.0
249 intel-xeon-performance-6517p 3.2 16 2 190 0 0 72.0
250 intel-xeon-performance-6520p 2.4 24 2 210 0 0 144.0
251 intel-xeon-performance-6527p 3.0 24 2 250 0 0 144.0
252 intel-xeon-performance-6714p 4.0 8 2 165 0 0 48.0

12691
catalogs/dell/2025-10/20251023 - Cat2 Conf 2-2-03_ DELL Poweredge R660.html Normal file
View File

File diff suppressed because one or more lines are too long

24
concho/dell.py
View File

@ -485,12 +485,16 @@ class DellConfiguratorParser(IHtmlConfiguratorParser):
# Processeur Intel® Xeon® 6 Performance 6507P 3,5 GHz, 8C/16T, 24 GT/s, 48 Mo de cache, Turbo (150 W), mémoire DDR5-6400 # Processeur Intel® Xeon® 6 Performance 6507P 3,5 GHz, 8C/16T, 24 GT/s, 48 Mo de cache, Turbo (150 W), mémoire DDR5-6400
# Intel® Xeon® 6 Performance 6714P 4,0 GHz, 8C/16T, 24 GT/s, 330 Mo de cache, Turbo (165 W), mémoire DDR5-6400 # Intel® Xeon® 6 Performance 6714P 4,0 GHz, 8C/16T, 24 GT/s, 330 Mo de cache, Turbo (165 W), mémoire DDR5-6400
# Processeur Intel® Xeon® Platinum 8460Y+ 2 GHz, 40C/80T, 16 GT/s, cache 105 Mo, Turbo, HT (300 W), mémoire DDR5 4 800 MHz # Processeur Intel® Xeon® Platinum 8460Y+ 2 GHz, 40C/80T, 16 GT/s, cache 105 Mo, Turbo, HT (300 W), mémoire DDR5 4 800 MHz
match = re.match(r'^(Processeur\s)?Intel[®]?\sXeon[®]?(\s+6)?\s+(?P<cpu_class>Silver|Gold|Platinium|Platinum|Performance)\s+(?P<cpu_number>[0-9][0-9][0-9][0-9][PRLYU]?[+]?).*', label) match = re.match(r'^(processeur\s)?intel[®]?\sxeon[®]?(\s+6)?\s+(?P<cpu_class>silver|gold|platinium|platinum|performance)\s+(?P<cpu_number>[0-9][0-9][0-9][0-9][prlyusnq]?[+]?).*', label.lower())
if match: if match:
cpu_class = match['cpu_class'].lower() cpu_class = match['cpu_class'].lower()
if cpu_class == 'platinium': if cpu_class == 'platinium':
cpu_class = 'platinum' cpu_class = 'platinum'
cpu_id = "intel-xeon-%s-%s" % (cpu_class, match['cpu_number'].lower()) cpu_number = match['cpu_number'].lower()
if cpu_number == '8568y':
# xeon 8568y doesn't exist, it is 8568y+
cpu_number = '8568y+'
cpu_id = "intel-xeon-%s-%s" % (cpu_class, cpu_number)
if self.additional_cpu_is_automatic(): if self.additional_cpu_is_automatic():
num_cpus = 2 num_cpus = 2
if match is None: if match is None:
@ -840,12 +844,14 @@ class DellConfiguratorParser(IHtmlConfiguratorParser):
# in the case of r6525, there was no additional processor module, and therefore we have no way to estimate the price of the base processor (amd-epyc-7262) # in the case of r6525, there was no additional processor module, and therefore we have no way to estimate the price of the base processor (amd-epyc-7262)
# so we fallback to an hardcoded estimated price from wikipedia # so we fallback to an hardcoded estimated price from wikipedia
base_cpu_price = { if base_cpu.uid == 'amd-epyc-7262':
'amd-epyc-7262': 550.0, base_cpu_price = 550.0
'amd-epyc-9115': DellConfiguratorParser._estimate_base_cpu_price_from_public_prices(cpu_uid=base_cpu.uid), elif base_cpu.uid in ['amd-epyc-9115', 'intel-xeon-silver-4514y', 'intel-xeon-performance-6505p']:
'intel-xeon-silver-4514y': DellConfiguratorParser._estimate_base_cpu_price_from_public_prices(cpu_uid=base_cpu.uid), base_cpu_price = DellConfiguratorParser._estimate_base_cpu_price_from_public_prices(cpu_uid=base_cpu.uid)
'intel-xeon-performance-6505p': DellConfiguratorParser._estimate_base_cpu_price_from_public_prices(cpu_uid=base_cpu.uid), elif base_cpu.uid == 'intel-xeon-silver-4410y':
}[base_cpu.uid] base_cpu_price = 500.0 # arbitrary choice
else:
assert False, 'unable to deduce the price of base cpu %s' % base_cpu.uid
configurator.modules['processor'].add_option(Option(base_cpu, base_cpu_price)) configurator.modules['processor'].add_option(Option(base_cpu, base_cpu_price))
assert configurator.get_item_price(base_cpu.uid) is not None, 'failed to find the price of base cpu %s' % base_cpu.uid assert configurator.get_item_price(base_cpu.uid) is not None, 'failed to find the price of base cpu %s' % base_cpu.uid
@ -1056,7 +1062,7 @@ class DellConfiguratorParser2025(DellConfiguratorParser):
assert title_span_element is not None assert title_span_element is not None
title = title_span_element.text_content().replace('\n', '').strip() # eg 'Cat2 Conf 2-2-07: Dell Poweredge R670' title = title_span_element.text_content().replace('\n', '').strip() # eg 'Cat2 Conf 2-2-07: Dell Poweredge R670'
# Cat3 Conf 3-2-01 : Poweredge R760xa # Cat3 Conf 3-2-01 : Poweredge R760xa
match = re.match(r'^Cat[0-9]+ Conf\s+[0-9\-]+\s*:\s*(Dell )?Poweredge (?P<chassis_type>[CR][0-9][0-9][0-9][0-9]?[xa]*).*', title) match = re.match(r'^cat[0-9]+ conf\s+[0-9\-]+\s*:\s*(dell )?poweredge (?P<chassis_type>[cr][0-9][0-9][0-9][0-9]?[xa]*).*', title.lower())
assert match, 'unhandled title : %s' % title assert match, 'unhandled title : %s' % title
# print(match['cpu_class'], match['cpu_number']) # print(match['cpu_class'], match['cpu_number'])
chassis_id = "dell-poweredge-%s" % (match['chassis_type'].lower(), ) # eg "dell-poweredge-r670" chassis_id = "dell-poweredge-%s" % (match['chassis_type'].lower(), ) # eg "dell-poweredge-r670"

3
concho/procs_chooser.py
View File

@ -175,6 +175,7 @@ def plot_configs(configs: List[Config], xaxis_def: ConfigAxisDef, yaxis_def: Con
'dell-poweredge-r630': 0.6, 'dell-poweredge-r630': 0.6,
'dell-poweredge-r640': 0.6, 'dell-poweredge-r640': 0.6,
'dell-poweredge-r6525': 0.5, 'dell-poweredge-r6525': 0.5,
'dell-poweredge-r660': 0.55,
'dell-poweredge-r760xa': 0.55, 'dell-poweredge-r760xa': 0.55,
'dell-poweredge-r670': 0.6, 'dell-poweredge-r670': 0.6,
'dell-poweredge-r6725': 0.0, 'dell-poweredge-r6725': 0.0,
@ -200,7 +201,7 @@ def plot_configs(configs: List[Config], xaxis_def: ConfigAxisDef, yaxis_def: Con
(model, proc_id, ram_size) = re.split('_', label) (model, proc_id, ram_size) = re.split('_', label)
return get_marker(proc_id) return get_marker(proc_id)
markerSize = 50 markerSize = 10
plt.subplot(1, 2, 1) plt.subplot(1, 2, 1)

1
tests/test_dell_2025.py
View File

@ -19,6 +19,7 @@ class Test(unittest.TestCase):
def test_dell2_configs(self): def test_dell2_configs(self):
logging.info('Starting test_dell2_configs') logging.info('Starting test_dell2_configs')
configurators = [ configurators = [
HtmlConfigurator(Path('catalogs/dell/2025-10/20251023 - Cat2 Conf 2-2-03_ DELL Poweredge R660.html'), DellConfiguratorParser2025()),
HtmlConfigurator(Path('catalogs/dell/2025-10/20251020 - Cat2 Conf 2-2-07_ Dell Poweredge R670.html'), DellConfiguratorParser2025()), HtmlConfigurator(Path('catalogs/dell/2025-10/20251020 - Cat2 Conf 2-2-07_ Dell Poweredge R670.html'), DellConfiguratorParser2025()),
HtmlConfigurator(Path('catalogs/dell/2025-10/20251022 - Cat3 Conf 3-2-01 _ Poweredge R760xa.html'), DellConfiguratorParser2025()), HtmlConfigurator(Path('catalogs/dell/2025-10/20251022 - Cat3 Conf 3-2-01 _ Poweredge R760xa.html'), DellConfiguratorParser2025()),
HtmlConfigurator(Path('catalogs/dell/2025-10/20251022 - Cat2 Conf 2-2-09_ Dell Poweredge R6725.html'), DellConfiguratorParser2025()), HtmlConfigurator(Path('catalogs/dell/2025-10/20251022 - Cat2 Conf 2-2-09_ Dell Poweredge R6725.html'), DellConfiguratorParser2025()),