From e51a0a182e425cbff09fb504f1595aa5c5e64931 Mon Sep 17 00:00:00 2001 From: Nils Date: Tue, 12 Mar 2024 20:37:11 +0100 Subject: [PATCH] gb --- build/01_create_database.sql | 4 ++-- build/02_get.sh | 2 +- build/03_copy.pl | 8 ++++---- build/05_copy_instances.pl | 8 ++++---- build/site.pl | 6 +++--- build/src/comparison.tt2 | 10 +++++----- build/src/gpu.tt2 | 2 +- build/src/hana.tt2 | 2 +- build/src/instance.tt2 | 4 ++-- build/src/instance_in_region.tt2 | 4 ++-- build/src/instances_tr.tt2 | 4 ++-- build/src/main.js | 6 +++--- build/src/meta.tt2 | 24 ++++++++++++------------ build/src/region.tt2 | 2 +- build/src/sap.tt2 | 2 +- build/src/vs.tt2 | 8 ++++---- 16 files changed, 48 insertions(+), 48 deletions(-) diff --git a/build/01_create_database.sql b/build/01_create_database.sql index 955e420b6..f9118808a 100644 --- a/build/01_create_database.sql +++ b/build/01_create_database.sql @@ -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', @@ -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', diff --git a/build/02_get.sh b/build/02_get.sh index ee017d7aa..734c720ca 100644 --- a/build/02_get.sh +++ b/build/02_get.sh @@ -19,7 +19,7 @@ printf "%s;" \ "zone" \ "guestCpus" \ "isSharedCpu" \ - "memoryGiB" \ + "memoryGB" \ "guestAcceleratorCount" \ "guestAcceleratorType" \ "maximumPersistentDisks" \ diff --git a/build/03_copy.pl b/build/03_copy.pl index 10674414c..752e1f51b 100644 --- a/build/03_copy.pl +++ b/build/03_copy.pl @@ -58,7 +58,7 @@ SELECT name, description, zone, guestCpus, isSharedCpu, - memoryGiB, + memoryGB, guestAcceleratorCount, guestAcceleratorType, maximumPersistentDisks, maximumPersistentDisksSizeGb, deprecated @@ -69,7 +69,7 @@ $sth->bind_columns (\my ( $name, $description, $zone, $guestCpus, $isSharedCpu, - $memoryGiB, + $memoryGB, $guestAcceleratorCount, $guestAcceleratorType, $maximumPersistentDisks, $maximumPersistentDisksSizeGb, $deprecated @@ -89,7 +89,7 @@ ( '$name', '$description', '$location', '$region', '$zone', '$guestCpus', '$isSharedCpu', - '$memoryGiB', + '$memoryGB', '$guestAcceleratorCount', '$guestAcceleratorType', '$maximumPersistentDisks', '$maximumPersistentDisksSizeGb' ) @@ -103,7 +103,7 @@ INSERT INTO machinetypes ( 'name', 'description', 'location', 'region', 'zone', 'guestCpus', 'isSharedCpu', - 'memoryGiB', + 'memoryGB', 'guestAcceleratorCount', 'guestAcceleratorType', 'maximumPersistentDisks', 'maximumPersistentDisksSizeGb' ) VALUES diff --git a/build/05_copy_instances.pl b/build/05_copy_instances.pl index a36fdaec6..db22411d2 100644 --- a/build/05_copy_instances.pl +++ b/build/05_copy_instances.pl @@ -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 @@ -54,7 +54,7 @@ $zoneCount, $zones, $guestCpus, $isSharedCpu, - $memoryGiB, + $memoryGB, $guestAcceleratorCount, $guestAcceleratorType, $maximumPersistentDisks, $maximumPersistentDisksSizeGb )); @@ -77,7 +77,7 @@ ( '$name', '$description', '$location', '$region', '$zoneCount', '$zones', '$guestCpus', '$isSharedCpu', - '$memoryGiB', + '$memoryGB', '$guestAcceleratorCount', '$guestAcceleratorType', '$maximumPersistentDisks', '$maximumPersistentDisksSizeGb' ) @@ -91,7 +91,7 @@ INSERT INTO instances ( 'name', 'description', 'location', 'region', 'zoneCount', 'zones', 'vCpus', 'sharedCpu', - 'memoryGiB', + 'memoryGB', 'acceleratorCount', 'acceleratorType', 'disks', 'disksSizeGb' ) VALUES diff --git a/build/site.pl b/build/site.pl index 1634fe923..3cdc8483f 100644 --- a/build/site.pl +++ b/build/site.pl @@ -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, @@ -297,7 +297,7 @@ vCpus, LOWER(sharedCpu) AS sharedCpu, intel, amd, arm, availableCpuPlatformCount, cpuPlatformCount, cpuBaseClock, cpuTurboClock, cpuSingleMaxTurboClock, - memoryGiB, + memoryGB, sap, saps, hana, zoneCount, sud, @@ -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, diff --git a/build/src/comparison.tt2 b/build/src/comparison.tt2 index 0838d1c42..84b1dbc60 100644 --- a/build/src/comparison.tt2 +++ b/build/src/comparison.tt2 @@ -6,10 +6,10 @@

Google Compute Engine machine type comparison [% instance_a.name %] - ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory) + ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory) versus [% instance_b.name %] - ([% instance_b.vCpus %] vCPU, [% instance_b.memoryGiB %] GB memory). + ([% instance_b.vCpus %] vCPU, [% instance_b.memoryGB %] GB memory).

@@ -62,9 +62,9 @@ Memory - [% instance_a.memoryGiB %] GB - [% tableCompareNumber(instance_a.memoryGiB || 0, instance_b.memoryGiB || 0) %] - [% instance_b.memoryGiB %] GB + [% instance_a.memoryGB %] GB + [% tableCompareNumber(instance_a.memoryGB || 0, instance_b.memoryGB || 0) %] + [% instance_b.memoryGB %] GB CPU Platform diff --git a/build/src/gpu.tt2 b/build/src/gpu.tt2 index 6f1d2ed4f..94d9f0a4f 100644 --- a/build/src/gpu.tt2 +++ b/build/src/gpu.tt2 @@ -56,7 +56,7 @@ Not every GCE machine type with GPU is available in every Google Cloud region. [% instance.name %] [% instance.vCpus %][% badgeSharedCpu(instance) %] [% instance.cpuBaseClock %] - [% instance.memoryGiB %] + [% instance.memoryGB %] [% instance.acceleratorCount %] [% instance.acceleratorType %] diff --git a/build/src/hana.tt2 b/build/src/hana.tt2 index eecc40451..909154583 100644 --- a/build/src/hana.tt2 +++ b/build/src/hana.tt2 @@ -54,7 +54,7 @@ Not every certified Google Cloud VM is available in every region. [% instance.name %] [% instance.vCpus %][% badgeSharedCpu(instance) %] [% instance.cpuBaseClock %] - [% instance.memoryGiB %] + [% instance.memoryGB %] [% instance.saps %] [% badgeCpuManufactur(instance) %] diff --git a/build/src/instance.tt2 b/build/src/instance.tt2 index c86efe0c9..558bd5649 100644 --- a/build/src/instance.tt2 +++ b/build/src/instance.tt2 @@ -4,7 +4,7 @@

[% 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 %] @@ -44,7 +44,7 @@ Memory - [% instance.memoryGiB %] GB + [% instance.memoryGB %] GB CPU Manufactur diff --git a/build/src/instance_in_region.tt2 b/build/src/instance_in_region.tt2 index 3286fdc06..aaea5bfda 100644 --- a/build/src/instance_in_region.tt2 +++ b/build/src/instance_in_region.tt2 @@ -10,7 +10,7 @@

[% IF instance.family %][% instance.family %][% END %] Google Compute Engine machine type [% instance.name %] - with [% instance.vCpus%] vCPU and [% instance.memoryGiB %] GB memory + with [% instance.vCpus%] vCPU and [% instance.memoryGB %] GB memory in Google Cloud region [% instance.region %] [% IF instance.regionLocationLong %]([% instance.regionLocationLong %])[% ELSIF instance.regionLocation %]([% instance.regionLocation %])[% END %]. [%- IF instance.sap || instance.hana -%] @@ -67,7 +67,7 @@ Memory - [% instance.memoryGiB %] GB + [% instance.memoryGB %] GB CPU Manufactur diff --git a/build/src/instances_tr.tt2 b/build/src/instances_tr.tt2 index d235d04ac..95c6e6d9f 100644 --- a/build/src/instances_tr.tt2 +++ b/build/src/instances_tr.tt2 @@ -30,7 +30,7 @@ [% instance.name %] [% instance.vCpus %][% badgeSharedCpu(instance) %] [% instance.cpuBaseClock %] -[% instance.memoryGiB %] +[% instance.memoryGB %] [% badgeCpuManufactur(instance) %] [% badgeGpu(instance) %] @@ -87,7 +87,7 @@ [% instance.vCpus %][% badgeSharedCpu(instance) %] [% instance.cpuBaseClock %] [% instance.cpuPlatform | replace('\[','') | replace('\]','') | replace('Intel','') | replace('AMD','') %] -[% instance.memoryGiB %] +[% instance.memoryGB %] [% badgeGpu(instance) %] [% badgeSap(instance) %] diff --git a/build/src/main.js b/build/src/main.js index f30fd4d87..3d8000d20 100644 --- a/build/src/main.js +++ b/build/src/main.js @@ -73,7 +73,7 @@ const gridOptions = { return ''+ params.value + ''; }, 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, @@ -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, }, ] diff --git a/build/src/meta.tt2 b/build/src/meta.tt2 index cc45400ff..689eb9278 100644 --- a/build/src/meta.tt2 +++ b/build/src/meta.tt2 @@ -139,32 +139,32 @@ [%- ELSIF template.name == 'instance.tt2' -%] [% instance.name %] - Google Cloud Compute Machine - + - + - + [%- ELSIF template.name == 'comparison.tt2' -%] [% instance_a.name %] / [% instance_b.name %] - Google Cloud - + - + - + [%- ELSIF template.name == 'vs.tt2'-%] [% instance_a.name %] - GCE Machine Type Comparison - + - + - + [%- ELSIF template.name == 'region.tt2'-%] @@ -179,12 +179,12 @@ [%- ELSIF template.name == 'instance_in_region.tt2'-%] [% instance.name %] in [% instance.region %] - Google Cloud - + - + - + [%- ELSIF template.name == 'images.tt2' -%] diff --git a/build/src/region.tt2 b/build/src/region.tt2 index 2d7136988..fc6643d73 100644 --- a/build/src/region.tt2 +++ b/build/src/region.tt2 @@ -136,7 +136,7 @@ IF disk.name == 'local-ssd'; minDiskSize = 375; END; [% instance.vCpus %][% badgeSharedCpu(instance) %] [% instance.cpuBaseClock %] - [% instance.memoryGiB %] + [% instance.memoryGB %] [% IF instance.intel %]Intel[% END %] [% IF instance.amd %]AMD[% END %] diff --git a/build/src/sap.tt2 b/build/src/sap.tt2 index 5d54d2742..9ea5e616f 100644 --- a/build/src/sap.tt2 +++ b/build/src/sap.tt2 @@ -55,7 +55,7 @@ Not every certified GCE machine type is available in every Google Cloud region. [% instance.name %] [% instance.vCpus %][% badgeSharedCpu(instance) %] [% instance.cpuBaseClock %] - [% instance.memoryGiB %] + [% instance.memoryGB %] [% instance.saps %] [% badgeCpuManufactur(instance) %] diff --git a/build/src/vs.tt2 b/build/src/vs.tt2 index e972315d5..1c9ab005f 100644 --- a/build/src/vs.tt2 +++ b/build/src/vs.tt2 @@ -6,7 +6,7 @@

Compare Google Compute Engine machine type [% instance_a.name %] - ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGiB %] GB memory) + ([% instance_a.vCpus %] vCPU, [% instance_a.memoryGB %] GB memory) with other GCE machine types.

@@ -45,7 +45,7 @@ [% instance.vCpus %][% badgeSharedCpu(instance) %] - [% instance.memoryGiB %] + [% instance.memoryGB %] [% badgeCpuManufactur(instance) %] [% badgeGpu(instance) %] @@ -84,8 +84,8 @@ [% tableCompareNumber(instance_a.vCpus || 0, instance.vCpus || 0) %] [% instance.vCpus %][% badgeSharedCpu(instance) %] - [% tableCompareNumber(instance_a.memoryGiB || 0, instance.memoryGiB || 0) %] - [% instance.memoryGiB %] + [% tableCompareNumber(instance_a.memoryGB || 0, instance.memoryGB || 0) %] + [% instance.memoryGB %] [% badgeCpuManufactur(instance) %] [% badgeGpu(instance) %]