Skip to content

Commit

Permalink
gb
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cyclenerd
Cyclenerd committed Mar 12, 2024
1 parent a15264e commit e51a0a1
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions build/01_create_database.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CREATE TABLE "machinetypes" (
'zone' TEXT NOT NULL DEFAULT '',
'guestCpus' INT NOT NULL DEFAULT '0',
'isSharedCpu' TEXT NOT NULL DEFAULT 'false',
'memoryGiB' REAL NOT NULL DEFAULT '0.0',
'memoryGB' REAL NOT NULL DEFAULT '0.0',
'guestAcceleratorCount' INT NOT NULL DEFAULT '0',
'guestAcceleratorType' TEXT NOT NULL DEFAULT '',
'maximumPersistentDisks' INT NOT NULL DEFAULT '0',
Expand Down Expand Up @@ -60,7 +60,7 @@ CREATE TABLE "instances" (
"coremarkScore" REAL DEFAULT '',
"standardDeviation" REAL DEFAULT '',
"sampleCount" REAL DEFAULT '',
"memoryGiB" REAL DEFAULT '0.0',
"memoryGB" REAL DEFAULT '0.0',
"acceleratorCount" REAL DEFAULT '0.0',
"acceleratorType" TEXT DEFAULT '',
"disks" REAL DEFAULT '0.0',
Expand Down
2 changes: 1 addition & 1 deletion build/02_get.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ printf "%s;" \
"zone" \
"guestCpus" \
"isSharedCpu" \
"memoryGiB" \
"memoryGB" \
"guestAcceleratorCount" \
"guestAcceleratorType" \
"maximumPersistentDisks" \
Expand Down
8 changes: 4 additions & 4 deletions build/03_copy.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
SELECT
name, description, zone,
guestCpus, isSharedCpu,
memoryGiB,
memoryGB,
guestAcceleratorCount, guestAcceleratorType,
maximumPersistentDisks, maximumPersistentDisksSizeGb,
deprecated
Expand All @@ -69,7 +69,7 @@
$sth->bind_columns (\my (
$name, $description, $zone,
$guestCpus, $isSharedCpu,
$memoryGiB,
$memoryGB,
$guestAcceleratorCount, $guestAcceleratorType,
$maximumPersistentDisks, $maximumPersistentDisksSizeGb,
$deprecated
Expand All @@ -89,7 +89,7 @@
(
'$name', '$description', '$location', '$region', '$zone',
'$guestCpus', '$isSharedCpu',
'$memoryGiB',
'$memoryGB',
'$guestAcceleratorCount', '$guestAcceleratorType',
'$maximumPersistentDisks', '$maximumPersistentDisksSizeGb'
)
Expand All @@ -103,7 +103,7 @@
INSERT INTO machinetypes (
'name', 'description', 'location', 'region', 'zone',
'guestCpus', 'isSharedCpu',
'memoryGiB',
'memoryGB',
'guestAcceleratorCount', 'guestAcceleratorType',
'maximumPersistentDisks', 'maximumPersistentDisksSizeGb'
) VALUES
Expand Down
8 changes: 4 additions & 4 deletions build/05_copy_instances.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
(SELECT COUNT(zone) FROM machinetypes WHERE name LIKE M.name AND region LIKE M.region) AS zoneCount,
(SELECT GROUP_CONCAT(zone) FROM machinetypes WHERE name LIKE M.name AND region LIKE M.region ORDER BY zone) AS zones,
guestCpus, isSharedCpu,
memoryGiB,
memoryGB,
guestAcceleratorCount, guestAcceleratorType,
maximumPersistentDisks, maximumPersistentDisksSizeGb
FROM machinetypes M
Expand All @@ -54,7 +54,7 @@
$zoneCount,
$zones,
$guestCpus, $isSharedCpu,
$memoryGiB,
$memoryGB,
$guestAcceleratorCount, $guestAcceleratorType,
$maximumPersistentDisks, $maximumPersistentDisksSizeGb
));
Expand All @@ -77,7 +77,7 @@
(
'$name', '$description', '$location', '$region', '$zoneCount', '$zones',
'$guestCpus', '$isSharedCpu',
'$memoryGiB',
'$memoryGB',
'$guestAcceleratorCount', '$guestAcceleratorType',
'$maximumPersistentDisks', '$maximumPersistentDisksSizeGb'
)
Expand All @@ -91,7 +91,7 @@
INSERT INTO instances (
'name', 'description', 'location', 'region', 'zoneCount', 'zones',
'vCpus', 'sharedCpu',
'memoryGiB',
'memoryGB',
'acceleratorCount', 'acceleratorType',
'disks', 'disksSizeGb'
) VALUES
Expand Down
6 changes: 3 additions & 3 deletions build/site.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
(SELECT cpuPlatform FROM instances WHERE name = I.name ORDER BY cpuPlatformCount) AS cpuPlatform,
MAX(cpuBaseClock) AS cpuBaseClock, MAX(cpuTurboClock) AS cpuTurboClock, MAX(cpuSingleMaxTurboClock) AS cpuSingleMaxTurboClock,
MAX(coremarkScore) AS coremarkScore, MAX(standardDeviation) AS standardDeviation, MAX(sampleCount) AS sampleCount,
memoryGiB,
memoryGB,
bandwidth, tier1,
disks, disksSizeGb/1024 AS diskSizeTiB, localSsd,
acceleratorCount, acceleratorType,
Expand Down Expand Up @@ -297,7 +297,7 @@
vCpus, LOWER(sharedCpu) AS sharedCpu,
intel, amd, arm, availableCpuPlatformCount, cpuPlatformCount,
cpuBaseClock, cpuTurboClock, cpuSingleMaxTurboClock,
memoryGiB,
memoryGB,
sap, saps, hana,
zoneCount,
sud,
Expand Down Expand Up @@ -487,7 +487,7 @@
ROUND(coremarkScore, 0) AS coremarkScore,
ROUND(standardDeviation, 0) AS standardDeviation,
ROUND(sampleCount, 0) AS sampleCount,
memoryGiB,
memoryGB,
bandwidth, tier1,
disks, disksSizeGb/1024 AS diskSizeTiB, localSsd,
ROUND(acceleratorCount, 0) AS acceleratorCount,
Expand Down
10 changes: 5 additions & 5 deletions build/src/comparison.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<p>
Google Compute Engine machine type comparison
<a href="/[% instance_a.name %].html" title="Show machine type [% instance_a.name %] in all regions">[% instance_a.name %]</a>
([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory)
([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory)
versus
<a href="/[% instance_b.name %].html" title="Show machine type [% instance_b.name %] in all regions">[% instance_b.name %]</a>
([% instance_b.vCpus %] vCPU, [% instance_b.memoryGiB %] GB memory).
([% instance_b.vCpus %] vCPU, [% instance_b.memoryGB %] GB memory).
</p>
</blockquote>

Expand Down Expand Up @@ -62,9 +62,9 @@
</tr>
<tr>
<th>Memory</th>
<td class="table-active">[% instance_a.memoryGiB %] GB</td>
[% tableCompareNumber(instance_a.memoryGiB || 0, instance_b.memoryGiB || 0) %]
<td>[% instance_b.memoryGiB %] GB</td>
<td class="table-active">[% instance_a.memoryGB %] GB</td>
[% tableCompareNumber(instance_a.memoryGB || 0, instance_b.memoryGB || 0) %]
<td>[% instance_b.memoryGB %] GB</td>
</tr>
<tr>
<th>CPU Platform</th>
Expand Down
2 changes: 1 addition & 1 deletion build/src/gpu.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Not every GCE machine type with GPU is available in every Google Cloud region.
<td><a href="[% instance.name %].html" title="Google Compute Engine machine type [% instance.name %]">[% instance.name %]</a></td>
<td class="text-nowrap">[% instance.vCpus %][% badgeSharedCpu(instance) %]</td>
<td class="frequency" title="CPU base clock frequency: [% instance.cpuBaseClock %] GHz">[% instance.cpuBaseClock %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGiB %] GiB">[% instance.memoryGiB %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGB %] GB">[% instance.memoryGB %]</td>
<td title="Accelerator (GPUs): [% instance.acceleratorCount %]">[% instance.acceleratorCount %]</td>
<td title="Accelerator Type: [% instance.acceleratorType %]">[% instance.acceleratorType %]</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion build/src/hana.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Not every certified Google Cloud VM is available in every region.
<td><a href="[% instance.name %].html" title="Google Compute Engine machine type [% instance.name %]">[% instance.name %]</a></td>
<td class="text-nowrap">[% instance.vCpus %][% badgeSharedCpu(instance) %]</td>
<td class="frequency" title="CPU base clock frequency: [% instance.cpuBaseClock %] GHz">[% instance.cpuBaseClock %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGiB %] GiB">[% instance.memoryGiB %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGB %] GB">[% instance.memoryGB %]</td>
<td title="SAP Standard Benchmark: [% instance.saps %]">[% instance.saps %]</td>
<td>
[% badgeCpuManufactur(instance) %]
Expand Down
4 changes: 2 additions & 2 deletions build/src/instance.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<blockquote class="blockquote">
<p>
[% IF instance.family %][% instance.family %][% END %]
Google Compute Engine machine type [% instance.name %] with [% instance.vCpus%] vCPU and [% instance.memoryGiB %] GB memory.
Google Compute Engine machine type [% instance.name %] with [% instance.vCpus%] vCPU and [% instance.memoryGB %] GB memory.
[%- IF instance.sap || instance.hana -%]
GCE machine type [% instance.name %] is certified for
[% IF instance.sap %]SAP applications[% END %]
Expand Down Expand Up @@ -44,7 +44,7 @@
</tr>
<tr>
<th>Memory</th>
<td>[% instance.memoryGiB %] GB</td>
<td>[% instance.memoryGB %] GB</td>
</tr>
<tr>
<th>CPU Manufactur</th>
Expand Down
4 changes: 2 additions & 2 deletions build/src/instance_in_region.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<p>
[% IF instance.family %][% instance.family %][% END %]
Google Compute Engine machine type <a href="/[% instance.name %].html" title="Show machine type [% instance.name %] in all regions">[% instance.name %]</a>
with [% instance.vCpus%] vCPU and [% instance.memoryGiB %] GB memory
with [% instance.vCpus%] vCPU and [% instance.memoryGB %] GB memory
in Google Cloud region <a href="/[% instance.region %].html" title="Show all machine types in region [% instance.region %]">[% instance.region %]</a>
[% IF instance.regionLocationLong %]([% instance.regionLocationLong %])[% ELSIF instance.regionLocation %]([% instance.regionLocation %])[% END %].
[%- IF instance.sap || instance.hana -%]
Expand Down Expand Up @@ -67,7 +67,7 @@
</tr>
<tr>
<th>Memory</th>
<td>[% instance.memoryGiB %] GB</td>
<td>[% instance.memoryGB %] GB</td>
</tr>
<tr>
<th>CPU Manufactur</th>
Expand Down
4 changes: 2 additions & 2 deletions build/src/instances_tr.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<td><a href="/[% instance.name %].html" title="Google Compute Engine machine type [% instance.name %]">[% instance.name %]</a></td>
<td class="text-nowrap">[% instance.vCpus %][% badgeSharedCpu(instance) %]</td>
<td class="frequency" title="CPU base clock frequency: [% instance.cpuBaseClock %] GHz">[% instance.cpuBaseClock %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGiB %] GiB">[% instance.memoryGiB %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGB %] GB">[% instance.memoryGB %]</td>
<td>
[% badgeCpuManufactur(instance) %]
[% badgeGpu(instance) %]
Expand Down Expand Up @@ -87,7 +87,7 @@
<td class="text-nowrap">[% instance.vCpus %][% badgeSharedCpu(instance) %]</td>
<td class="frequency" title="CPU base clock frequency: [% instance.cpuBaseClock %] GHz">[% instance.cpuBaseClock %]</td>
<td title="CPU Platform: [% instance.cpuPlatform %]">[% instance.cpuPlatform | replace('\[','') | replace('\]','') | replace('Intel','') | replace('AMD','') %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGiB %] GiB">[% instance.memoryGiB %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGB %] GB">[% instance.memoryGB %]</td>
<td>
[% badgeGpu(instance) %]
[% badgeSap(instance) %]
Expand Down
6 changes: 3 additions & 3 deletions build/src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const gridOptions = {
return '<a href="./'+ params.data.region +'/'+ params.value +'.html">'+ params.value + '</a>';
},
tooltipValueGetter: params => {
return 'Machine type '+ params.value +' ('+ params.data.vCpus + ' vCPUs, '+ params.data.memoryGiB + ' GB, '+ params.data.bandwidth + ' Gbps) in region '+ params.data.region;
return 'Machine type '+ params.value +' ('+ params.data.vCpus + ' vCPUs, '+ params.data.memoryGB + ' GB, '+ params.data.bandwidth + ' Gbps) in region '+ params.data.region;
},
pinned: 'left',
//rowDrag: true,
Expand Down Expand Up @@ -335,11 +335,11 @@ const gridOptions = {
children: [
{
headerName: 'RAM',
field: "memoryGiB",
field: "memoryGB",
cellClass: 'memory',
filter: 'agNumberColumnFilter',
filterParams: filterParamsNumber,
headerTooltip: 'Random-access memory (GiB)',
headerTooltip: 'Random-access memory (GB)',
width: 120,
},
]
Expand Down
24 changes: 12 additions & 12 deletions build/src/meta.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,32 +139,32 @@

[%- ELSIF template.name == 'instance.tt2' -%]
<title>[% instance.name %] - Google Cloud Compute Machine</title>
<meta name="description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGiB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<meta name="description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<link rel="canonical" href="[% site.url %]/[% instance.name %].html">
<meta name="twitter:title" content="Google Machine Type [% instance.name %]">
<meta name="twitter:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGiB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<meta name="twitter:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<meta property="og:title" content="Google Machine Type [% instance.name %]">
<meta property="og:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGiB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<meta property="og:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<meta property="og:url" content="[% site.url %]/[% instance.name %].html">

[%- ELSIF template.name == 'comparison.tt2' -%]
<title>[% instance_a.name %] / [% instance_b.name %] - Google Cloud</title>
<meta name="description" content="Google Compute Engine machine type comparison [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory) versus [% instance_b.name %] ([% instance_b.vCpus %] vCPU, [% instance_b.memoryGiB %] GB memory).">
<meta name="description" content="Google Compute Engine machine type comparison [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory) versus [% instance_b.name %] ([% instance_b.vCpus %] vCPU, [% instance_b.memoryGB %] GB memory).">
<link rel="canonical" href="[% site.url %]/comparison/[% instance_a.name %]/vs/[% instance_b.name %].html">
<meta name="twitter:title" content="Comparison [% instance_a.name %] vs. [% instance_b.name %]">
<meta name="twitter:description" content="Google Compute Engine machine type comparison [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory) versus [% instance_b.name %] ([% instance_b.vCpus %] vCPU, [% instance_b.memoryGiB %] GB memory).">
<meta name="twitter:description" content="Google Compute Engine machine type comparison [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory) versus [% instance_b.name %] ([% instance_b.vCpus %] vCPU, [% instance_b.memoryGB %] GB memory).">
<meta property="og:title" content="Comparison [% instance_a.name %] vs. [% instance_b.name %]">
<meta property="og:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGiB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<meta property="og:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGB %] GB memory. Available in [% regions.size %] Google Cloud Platform region[% IF regions.size > 1 %]s[% END %].">
<meta property="og:url" content="[% site.url %]/comparison/[% instance_a.name %]/vs/[% instance_b.name %].html">

[%- ELSIF template.name == 'vs.tt2'-%]
<title>[% instance_a.name %] - GCE Machine Type Comparison</title>
<meta name="description" content="Compare Google Compute Engine machine type [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory) with other Google Cloud Platform GCE machine types.">
<meta name="description" content="Compare Google Compute Engine machine type [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory) with other Google Cloud Platform GCE machine types.">
<link rel="canonical" href="[% site.url %]/comparison/[% instance_a.name %]/vs.html">
<meta name="twitter:title" content="Compare Machine Type [% instance_a.name %]">
<meta name="twitter:description" content="Compare Google Compute Engine machine type [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory) with other Google Cloud Platform GCE machine types.">
<meta name="twitter:description" content="Compare Google Compute Engine machine type [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory) with other Google Cloud Platform GCE machine types.">
<meta property="og:title" content="Compare Machine Type [% instance_a.name %]">
<meta property="og:description" content="Compare Google Compute Engine machine type [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory) with other Google Cloud Platform GCE machine types.">
<meta property="og:description" content="Compare Google Compute Engine machine type [% instance_a.name %] ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory) with other Google Cloud Platform GCE machine types.">
<meta property="og:url" content="[% site.url %]/comparison/[% instance_a.name %]/vs.html">

[%- ELSIF template.name == 'region.tt2'-%]
Expand All @@ -179,12 +179,12 @@

[%- ELSIF template.name == 'instance_in_region.tt2'-%]
<title>[% instance.name %] in [% instance.region %] - Google Cloud</title>
<meta name="description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGiB %] GB memory in Google Cloud region [% instance.region %].">
<meta name="description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGB %] GB memory in Google Cloud region [% instance.region %].">
<link rel="canonical" href="[% site.url %]/[% instance.region %]/[% instance.name %].html">
<meta name="twitter:title" content="Machine Type [% instance.name %] in Region [% instance.region %]">
<meta name="twitter:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGiB %] GB memory in Google Cloud region [% instance.region %].">
<meta name="twitter:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGB %] GB memory in Google Cloud region [% instance.region %].">
<meta property="og:title" content="Machine Type [% instance.name %] in Region [% instance.region %]">
<meta property="og:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGiB %] GB memory in Google Cloud region [% instance.region %].">
<meta property="og:description" content="Google Compute Engine machine type [% instance.name %] with [% instance.vCpus %] vCPU and [% instance.memoryGB %] GB memory in Google Cloud region [% instance.region %].">
<meta property="og:url" content="[% site.url %]/[% instance.region %]/[% instance.name %].html">

[%- ELSIF template.name == 'images.tt2' -%]
Expand Down
2 changes: 1 addition & 1 deletion build/src/region.tt2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ IF disk.name == 'local-ssd'; minDiskSize = 375; END;
</td>
<td class="text-nowrap">[% instance.vCpus %][% badgeSharedCpu(instance) %]</td>
<td class="frequency" title="CPU base clock frequency: [% instance.cpuBaseClock %] GHz">[% instance.cpuBaseClock %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGiB %] GiB">[% instance.memoryGiB %]</td>
<td class="memory" title="Random-access memory: [% instance.memoryGB %] GB">[% instance.memoryGB %]</td>
<td>
[% IF instance.intel %]<span class="badge bg-primary">Intel</span>[% END %]
[% IF instance.amd %]<span class="badge bg-success">AMD</span>[% END %]
Expand Down
Loading

0 comments on commit e51a0a1

Please sign in to comment.