From 05bce53c7f96b20ad5525f74fc6d59c8a9aeb95a Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 24 Mar 2023 13:30:54 +0100 Subject: [PATCH] Adapt test json data to new schema --- .gitignore | 1 + .../emmy/1403/244/1608923076/data.json | 9 ----- .../emmy/1404/397/1609300556/data.json | 9 ----- test/data.json | 40 ++++++++----------- 4 files changed, 17 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index c2ae117..2633b10 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /web/frontend/node_modules .vscode/settings.json /sanitize-archive +.vscode/launch.json diff --git a/test/archive/emmy/1403/244/1608923076/data.json b/test/archive/emmy/1403/244/1608923076/data.json index 36232fc..eb4fecc 100644 --- a/test/archive/emmy/1403/244/1608923076/data.json +++ b/test/archive/emmy/1403/244/1608923076/data.json @@ -5,7 +5,6 @@ "base": "load" }, "timestep": 60, - "scope": "node", "series": [ { "hostname": "e0102", @@ -92878,7 +92877,6 @@ ] } ], - "scope": "node", "timestep": 60, "unit": { "base": "Hz", @@ -139323,7 +139321,6 @@ } ], "timestep": 60, - "scope": "node", "unit": { "base": "W" } @@ -185608,7 +185605,6 @@ ] } ], - "scope": "node", "timestep": 60 } }, @@ -185618,7 +185614,6 @@ "base": "B/s", "prefix": "G" }, - "scope": "node", "timestep": 60, "series": [ { @@ -278497,7 +278492,6 @@ } ], "timestep": 60, - "scope": "node" } }, "mem_used": { @@ -324936,7 +324930,6 @@ "hostname": "e0951" } ], - "scope": "node", "timestep": 60, "unit": { "base": "B/s", @@ -324947,7 +324940,6 @@ "flops_dp": { "node": { "timestep": 60, - "scope": "node", "series": [ { "statistics": { @@ -417828,7 +417820,6 @@ } } ], - "scope": "node", "timestep": 60 } } diff --git a/test/archive/emmy/1404/397/1609300556/data.json b/test/archive/emmy/1404/397/1609300556/data.json index c17e856..0529d52 100644 --- a/test/archive/emmy/1404/397/1609300556/data.json +++ b/test/archive/emmy/1404/397/1609300556/data.json @@ -2,7 +2,6 @@ "flops_dp": { "node": { "timestep": 60, - "scope": "node", "series": [ { "hostname": "e0151", @@ -92943,7 +92942,6 @@ ] } ], - "scope": "node", "timestep": 60, "unit": { "base": "B", @@ -92954,7 +92952,6 @@ "flops_sp": { "node": { "timestep": 60, - "scope": "node", "series": [ { "hostname": "e0151", @@ -185900,7 +185897,6 @@ } ], "timestep": 60, - "scope": "node" } }, "mem_bw": { @@ -232375,7 +232371,6 @@ ] } ], - "scope": "node", "timestep": 60 } }, @@ -232384,7 +232379,6 @@ "unit": { "base": "IPC" }, - "scope": "node", "timestep": 60, "series": [ { @@ -278700,7 +278694,6 @@ "base": "W" }, "timestep": 60, - "scope": "node", "series": [ { "data": [ @@ -371641,14 +371634,12 @@ ] } ], - "scope": "node", "timestep": 60 } }, "cpu_load": { "node": { "timestep": 60, - "scope": "node", "series": [ { "data": [ diff --git a/test/data.json b/test/data.json index 589f298..1fce05f 100644 --- a/test/data.json +++ b/test/data.json @@ -4,12 +4,11 @@ "unit": { "base": "" }, - "scope": "core", "timestep": 30, "series": [ { "hostname": "taurusi6489", - "id": 0, + "id": "0", "statistics": { "min": 0.09090909090909093, "avg": 0.9173553719008265, @@ -31,7 +30,7 @@ }, { "hostname": "taurusi6489", - "id": 1, + "id": "1", "statistics": { "min": 0.03694102397926118, "avg": 0.045968409230268584, @@ -53,7 +52,7 @@ }, { "hostname": "taurusi6490", - "id": 10, + "id": "10", "statistics": { "min": 0.10505319148936171, "avg": 0.9186411992263056, @@ -75,7 +74,7 @@ }, { "hostname": "taurusi6490", - "id": 11, + "id": "11", "statistics": { "min": 0.05286048845767815, "avg": 0.07053823838706144, @@ -104,12 +103,11 @@ "unit": { "base": "IPC" }, - "scope": "core", "timestep": 60, "series": [ { "hostname": "taurusi6489", - "id": 0, + "id": "0", "statistics": { "min": 1.3808406263195592, "avg": 1.3960848578375105, @@ -125,7 +123,7 @@ }, { "hostname": "taurusi6489", - "id": 1, + "id": "1", "statistics": { "min": 0.30469640475234366, "avg": 0.8816944294664065, @@ -141,7 +139,7 @@ }, { "hostname": "taurusi6490", - "id": 10, + "id": "10", "statistics": { "min": 1.3791232173760588, "avg": 1.3850247295506815, @@ -157,7 +155,7 @@ }, { "hostname": "taurusi6490", - "id": 11, + "id": "11", "statistics": { "min": 0.6424094604392216, "avg": 0.9544442638400293, @@ -180,12 +178,11 @@ "unit": { "base": "F/s" }, - "scope": "core", "timestep": 60, "series": [ { "hostname": "taurusi6489", - "id": 0, + "id": "0", "statistics": { "min": 0.0, "avg": 184.2699002412084, @@ -201,7 +198,7 @@ }, { "hostname": "taurusi6489", - "id": 1, + "id": "1", "statistics": { "min": 0.13559227208748068, "avg": 273.2997868356056, @@ -217,7 +214,7 @@ }, { "hostname": "taurusi6490", - "id": 10, + "id": "10", "statistics": { "min": 0.0, "avg": 1678.8419461262179, @@ -233,7 +230,7 @@ }, { "hostname": "taurusi6490", - "id": 11, + "id": "11", "statistics": { "min": 45.28689133054866, "avg": 609.6644949204072, @@ -256,12 +253,11 @@ "unit": { "base": "B/s" }, - "scope": "socket", "timestep": 60, "series": [ { "hostname": "taurusi6489", - "id": 0, + "id": "0", "statistics": { "min": 653671812.1661415, "avg": 1637585527.5854635, @@ -277,7 +273,7 @@ }, { "hostname": "taurusi6490", - "id": 0, + "id": "0", "statistics": { "min": 1520190251.61048, "avg": 1572477682.3850098, @@ -300,7 +296,6 @@ "unit": { "base": "B/s" }, - "scope": "node", "timestep": 30, "series": [ { @@ -354,7 +349,6 @@ "unit": { "base": "B/s" }, - "scope": "node", "timestep": 30, "series": [ { @@ -408,7 +402,6 @@ "unit": { "base": "B" }, - "scope": "node", "timestep": 30, "series": [ { @@ -462,12 +455,11 @@ "unit": { "base": "W" }, - "scope": "socket", "timestep": 60, "series": [ { "hostname": "taurusi6489", - "id": 0, + "id": "0", "statistics": { "min": 35.50647456742635, "avg": 72.08313211552377, @@ -483,7 +475,7 @@ }, { "hostname": "taurusi6490", - "id": 0, + "id": "0", "statistics": { "min": 83.8466923147859, "avg": 85.18572681122097,