From 1b8c4e293c3d1196569fee6425a46f16f8ef674d Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Tue, 5 Sep 2023 11:46:34 +0200 Subject: [PATCH] Change to prod data, allow and handle null data - fix errors regarding render timing - always collect time info in transFormData function - remove size from polar plot --- web/frontend/src/Job.root.svelte | 38 ++-- web/frontend/src/Status.root.svelte | 18 +- web/frontend/src/plots/Polar.svelte | 3 +- web/frontend/src/plots/Roofline.svelte | 285 +++++++++++-------------- web/frontend/src/units.js | 4 +- web/frontend/src/utils.js | 44 ++-- 6 files changed, 180 insertions(+), 212 deletions(-) diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte index 153b8f9..b0db95e 100644 --- a/web/frontend/src/Job.root.svelte +++ b/web/frontend/src/Job.root.svelte @@ -4,6 +4,7 @@ groupByScope, fetchMetricsStore, checkMetricDisabled, + transformDataForRoofline } from "./utils.js"; import { Row, @@ -130,8 +131,8 @@ lazyFetchMoreMetrics(); let plots = {}, + roofWidth, jobTags, - fullWidth, statsTable; $: document.title = $initq.fetching ? "Loading..." @@ -190,7 +191,6 @@ })); -
{#if $initq.error} @@ -245,7 +245,6 @@ {/if} - c.name == $initq.data.job.cluster) - .subClusters.find( - (sc) => sc.name == $initq.data.job.subCluster - )} - flopsAny={$jobMetrics.data.jobMetrics.find( - (m) => m.name == "flops_any" && m.scope == "node" - )} - memBw={$jobMetrics.data.jobMetrics.find( - (m) => m.name == "mem_bw" && m.scope == "node" - )} - /> +
+ c.name == $initq.data.job.cluster) + .subClusters.find( + (sc) => sc.name == $initq.data.job.subCluster + )} + data={ + transformDataForRoofline ( + $jobMetrics.data.jobMetrics.find((m) => m.name == "flops_any" && m.scope == "node").metric, + $jobMetrics.data.jobMetrics.find((m) => m.name == "mem_bw" && m.scope == "node").metric + ) + } + /> +
{:else} diff --git a/web/frontend/src/Status.root.svelte b/web/frontend/src/Status.root.svelte index 8e162ab..73060c6 100644 --- a/web/frontend/src/Status.root.svelte +++ b/web/frontend/src/Status.root.svelte @@ -31,8 +31,8 @@ export let cluster; let plotWidths = [], - colWidth1 = 0, - colWidth2 = 0 + colWidth1, + colWidth2 let from = new Date(Date.now() - 5 * 60 * 1000), to = new Date(Date.now()); const topOptions = [ @@ -429,14 +429,14 @@ data.subCluster == subCluster.name + data={ + transformPerNodeDataForRoofline( + $mainQuery.data.nodeMetrics.filter( + (data) => data.subCluster == subCluster.name + ) ) - )} + } /> {/key}
@@ -444,7 +444,7 @@ {/each} -
+
diff --git a/web/frontend/src/plots/Polar.svelte b/web/frontend/src/plots/Polar.svelte index e556cc2..b5c488f 100644 --- a/web/frontend/src/plots/Polar.svelte +++ b/web/frontend/src/plots/Polar.svelte @@ -22,7 +22,6 @@ LineElement ); - export let size export let metrics export let cluster export let jobMetrics @@ -95,7 +94,7 @@
- +