Skip to content

Commit 4876542

Browse files
nadneinnadnein
authored
Merge pull request #18 from qbic-projects/change-server-to-compute-cluster
Changed 'server' to 'compute cluster'
2 parents 0cfa4ab + acccfe6 commit 4876542

7 files changed

Lines changed: 37 additions & 24 deletions

‎app/src/main/groovy/org/cpuInfoFetcher/AMDSpecificationsFetcher.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class AMDSpecificationsFetcher extends SpecificationsFetcher {
120120
// Map for intended usage per specification category
121121
Map<String, String> intended_usage_map = [
122122
'processors': 'local',
123-
'server-processor': 'server',
124-
'accelerators': 'server',
123+
'server-processor': 'compute cluster',
124+
'accelerators': 'compute cluster',
125125
'embedded': 'embedded',
126126
'professional-graphics': 'graphics',
127127
'graphics': 'graphics',

‎app/src/main/groovy/org/cpuInfoFetcher/AmpereSpecificationsFetcher.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class AmpereSpecificationsFetcher extends SpecificationsFetcher {
5353
String xPath_query = './/div/*[contains(text(), "Ampere Altra Family Products")]/..//table'
5454

5555
Element table = this.scraper.scrape(url, xPath_query).first()
56-
String intended_usage = 'server' // ampere processors intended for server use in general
56+
String intended_usage = 'compute cluster' // ampere processors intended for compute cluster use in general
5757
df = this.scraper.parse_table(table)
5858
df = add_metadata(df, url, intended_usage)
5959
df = df.cols().selectAs(Map.of('ORDERING PART NUMBER', 'product_id'))

‎app/src/main/groovy/org/cpuInfoFetcher/IntelSpecificationsFetcher.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class IntelSpecificationsFetcher extends SpecificationsFetcher {
8989
'Intel® Xeon Phi® Processors',
9090
timeFormat.format(this.localTime.now()) ,
9191
'https://www.intel.com/content/www/us/en/ark/featurefilter.html',
92-
'server',
92+
'compute cluster',
9393
'https://www.intel.com/content/www/us/en/ark/featurefilter.html?productType=873&1_Filter-Family=75557')
9494

9595
df = df.toDataFrame()
@@ -279,7 +279,7 @@ class IntelSpecificationsFetcher extends SpecificationsFetcher {
279279
Map<String, String> intended_usage_map = [
280280
'Intel® Core™ Ultra' : 'local',
281281
'Intel® Core™' : 'local',
282-
'Intel® Xeon®' : 'server',
282+
'Intel® Xeon®' : 'compute cluster',
283283
'Intel Atom®' : 'local',
284284
'Intel® Pentium®' : 'local',
285285
'Intel® Celeron®' : 'local',

‎app/src/main/groovy/org/cpuInfoFetcher/ProcessSpecificationsTable.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static DataFrame computeDefaultTdps(DataFrame specifications) {
113113
$col('threads').castAsInt().avg().as("avg_threads"),
114114
$col('tdp (W)').castAsDouble().avg().as("avg_tdp"))
115115

116-
DataFrame local_server_rows = aggregatedDf.rows({ it.get('intended_usage') == 'local' || it.get('intended_usage') == 'server' })
116+
DataFrame local_server_rows = aggregatedDf.rows({ it.get('intended_usage') == 'local' || it.get('intended_usage') == 'compute cluster' })
117117
.select()
118118

119119
Double unknown_avg_cores = (local_server_rows.sum { it.get('avg_cores') } as Double) / local_server_rows.height()

‎app/src/test/groovy/org/cpuinfofetcher/IntelSpecificationsFetcherTest.groovy‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class IntelSpecificationsFetcherTest extends Specification {
103103
def 'check existence of model website'() {
104104
setup:
105105
HttpRequest request = HttpRequest.newBuilder()
106-
.uri(URI.create('https://www.intel.com/content/www/us/en/products/sku/35635/intel-atom-processor-230-512k-cache-1-60-ghz-533-mhz-fsb/specifications.html'))
106+
.uri(URI.create('https://www.intel.com/content/www/us/en/products/sku/230902/intel-core-i31215ul-processor-10m-cache-up-to-4-40-ghz/specifications.html'))
107107
.build()
108108

109109
when:
@@ -120,7 +120,7 @@ class IntelSpecificationsFetcherTest extends Specification {
120120
.foldByRow('product_id', 'url', 'name', 'intended_usage')
121121
.of(
122122
'0',
123-
'https://www.intel.com/content/www/us/en/products/sku/35635/intel-atom-processor-230-512k-cache-1-60-ghz-533-mhz-fsb/specifications.html',
123+
'https://www.intel.com/content/www/us/en/products/sku/230902/intel-core-i31215ul-processor-10m-cache-up-to-4-40-ghz/specifications.html',
124124
'some_name',
125125
'local'
126126
)
@@ -132,16 +132,29 @@ class IntelSpecificationsFetcherTest extends Specification {
132132
then:
133133
specifications.getColumnsIndex().toList() == [
134134
'product_id', 'name', 'time', 'source', 'intended_usage', 'Product Collection', 'Code Name', 'Vertical Segment',
135-
'Processor Number', 'Lithography', 'Total Cores', 'Processor Base Frequency', 'Cache', 'Bus Speed',
136-
'FSB Parity', 'TDP', 'VID Voltage Range', 'Marketing Status', 'Launch Date', 'Servicing Status',
137-
'Embedded Options Available', 'Sockets Supported', 'TCASE', 'Package Size', 'Processing Die Size',
138-
'# of Processing Die Transistors', 'Intel® Turbo Boost Technology ‡',
139-
'Intel® Hyper-Threading Technology ‡', 'Intel® Virtualization Technology (VT-x) ‡',
140-
'Intel® Virtualization Technology for Directed I/O (VT-d) ‡', 'Intel® 64 ‡', 'Instruction Set',
141-
'Instruction Set Extensions', 'Idle States', 'Enhanced Intel SpeedStep® Technology',
142-
'Intel® Demand Based Switching', 'Thermal Monitoring Technologies',
143-
'Intel® Trusted Execution Technology ‡', 'Execute Disable Bit ‡'
144-
]
135+
'Processor Number', 'Lithography', 'Total Cores', '# of Performance-cores', '# of Efficient-cores', 'Total Threads',
136+
'Max Turbo Frequency', 'Performance-core Max Turbo Frequency', 'Efficient-core Max Turbo Frequency',
137+
'Processor Base Frequency', 'Cache', 'Processor Base Power', 'TDP', 'Minimum Assured Power', 'Maximum Assured Power',
138+
'Marketing Status', 'Launch Date', 'Embedded Options Available', 'Use Conditions', 'Max Memory Size (dependent on memory type)',
139+
'Memory Types', 'Max # of Memory Channels', 'ECC Memory Supported ‡', 'GPU Name‡', 'Graphics Max Dynamic Frequency',
140+
'Graphics Output', 'Execution Units', 'Max Resolution (HDMI)‡', 'Max Resolution (DP)‡', 'Max Resolution (eDP - Integrated Flat Panel)‡',
141+
'DirectX* Support', 'OpenGL* Support', 'OpenCL* Support', 'Multi-Format Codec Engines', 'Intel® Quick Sync Video',
142+
'# of Displays Supported ‡', 'Device ID', 'Intel® Thunderbolt™ 4', 'Microprocessor PCIe Revision', 'Chipset / PCH PCIe Revision',
143+
'Max # of PCI Express Lanes', 'Sockets Supported', 'Max CPU Configuration', 'TJUNCTION', 'Package Size',
144+
'Max Operating Temperature', 'Intel® Volume Management Device (VMD)', 'Intel® Gaussian & Neural Accelerator',
145+
'Intel® Thread Director', 'Intel® Image Processing Unit', 'Intel® Smart Sound Technology', 'Intel® Wake on Voice',
146+
'Intel® High Definition Audio', 'MIPI SoundWire*', 'Intel® Deep Learning Boost (Intel® DL Boost) on CPU',
147+
'Intel® Adaptix™ Technology', 'Intel® Speed Shift Technology', 'Intel® Turbo Boost Technology ‡',
148+
'Intel® Hyper-Threading Technology ‡', 'Instruction Set', 'Instruction Set Extensions', 'Thermal Monitoring Technologies',
149+
'Intel® Flex Memory Access', 'Intel® Hardware Shield Eligibility ‡', 'Intel® Threat Detection Technology (TDT)',
150+
'Intel® Active Management Technology (AMT) ‡', 'Intel® Standard Manageability (ISM) ‡', 'Intel® Remote Platform Erase (RPE) ‡',
151+
'Intel® One-Click Recovery ‡', 'Intel® QuickAssist Software Acceleration', 'Intel® Control-Flow Enforcement Technology',
152+
'Intel® Total Memory Encryption - Multi Key', 'Intel® Total Memory Encryption', 'Intel® AES New Instructions',
153+
'Secure Key', 'Intel® OS Guard', 'Intel® Trusted Execution Technology ‡', 'Execute Disable Bit ‡',
154+
'Intel® Boot Guard', 'Mode-based Execute Control (MBEC)', 'Intel® Stable IT Platform Program (SIPP)',
155+
'Intel® Virtualization Technology with Redirect Protection (VT-rp) ‡', 'Intel® Virtualization Technology (VT-x) ‡',
156+
'Intel® Virtualization Technology for Directed I/O (VT-d) ‡', 'Intel® VT-x with Extended Page Tables (EPT) ‡'
157+
]
145158
}
146159

147160
}

‎app/src/test/groovy/org/cpuinfofetcher/ProcessSpecificationsTableTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ class ProcessSpecificationsTableTest extends Specification {
4242
setup:
4343
DataFrame input = DataFrame
4444
.foldByColumn("intended_usage", "cores", "threads", "tdp (W)", "Launch Year/Last Time Buy")
45-
.of("local", "server", "embedded", "local", "server", "embedded", "embedded",
45+
.of("local", "compute cluster", "embedded", "local", "compute cluster", "embedded", "embedded",
4646
2, 8, 4, 4, 16, 4, 4,
4747
2, 16, 8, 4, 32, 8, 8,
4848
15.0, 15.0, 1.5, 15.0, 10.0, 1.5, 2.5,
4949
2022, 2023, 2027, 2025, 2030, 2021, -1)
5050
DataFrame expected = DataFrame
5151
.foldByColumn("intended_usage", "cores", "threads", "tdp (W)", "Launch Year/Last Time Buy")
52-
.of("local", "server", "embedded", "local", "server", "embedded", "embedded", "default local", "default server", "default embedded", "default unknown",
52+
.of("local", "compute cluster", "embedded", "local", "compute cluster", "embedded", "embedded", "default local", "default compute cluster", "default embedded", "default unknown",
5353
2, 8, 4, 4, 16, 4, 4, 1, 1, 1, 1,
5454
2, 16, 8, 4, 32, 8, 8, 1, 2.0, 2.0, 1.8,
5555
15.0, 15.0, 1.5, 15.0, 10.0, 1.5, 2.5, 15.0, 12.5, 1.5, 13.75,

‎app/src/test/groovy/org/cpuinfofetcher/SpecificationsFetcherTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ class SpecificationsFetcherTest extends Specification {
8787
)
8888

8989
where:
90-
passIntendedUsage | source | intendedUsage || expectedIntendedUsage
91-
false | 'some_source' | _ || 'unknown'
92-
true | 'some_source' | 'local' || 'local'
93-
true | 'other_source'| 'server' || 'server'
90+
passIntendedUsage | source | intendedUsage || expectedIntendedUsage
91+
false | 'some_source' | _ || 'unknown'
92+
true | 'some_source' | 'local' || 'local'
93+
true | 'other_source'| 'compute cluster' || 'compute cluster'
9494
}
9595

9696

0 commit comments

Comments
 (0)
⚡