From 10a7c093453f8d6c33a705aa953d9fc68fdd6341 Mon Sep 17 00:00:00 2001 From: xiayifan Date: Fri, 19 Feb 2021 16:21:28 +0800 Subject: [PATCH] UI Add a dashboard page and entry of cpu and memory --- mindinsight/ui/src/locales/en-us.json | 2 + mindinsight/ui/src/locales/zh-cn.json | 2 + mindinsight/ui/src/router.js | 16 + .../ui/src/views/profiling-gpu/operator.vue | 4 +- .../profiling-gpu/profiling-dashboard.vue | 31 +- .../ui/src/views/profiling-gpu/profiling.vue | 151 +++- .../profiling-gpu/resource-utilization.vue | 473 ++++++++++ .../profiling/cpu-detail.vue} | 373 +++++++- .../ui/src/views/profiling/data-process.vue | 258 +----- .../ui/src/views/profiling/memory-detail.vue | 33 +- .../ui/src/views/profiling/operator.vue | 4 +- .../views/profiling/profiling-dashboard.vue | 29 +- .../ui/src/views/profiling/profiling.vue | 194 +++-- .../views/profiling/resource-utilization.vue | 816 ++++++++++++++++++ .../ui/src/views/profiling/step-trace.vue | 15 +- 15 files changed, 1977 insertions(+), 424 deletions(-) create mode 100644 mindinsight/ui/src/views/profiling-gpu/resource-utilization.vue rename mindinsight/ui/src/{mixins/cpu-utilization.vue => views/profiling/cpu-detail.vue} (63%) create mode 100644 mindinsight/ui/src/views/profiling/resource-utilization.vue diff --git a/mindinsight/ui/src/locales/en-us.json b/mindinsight/ui/src/locales/en-us.json index 25329d30..c2e31d1f 100644 --- a/mindinsight/ui/src/locales/en-us.json +++ b/mindinsight/ui/src/locales/en-us.json @@ -477,6 +477,8 @@ "processCpuUtil": "Process CPU Usage", "operatorCpuUtil": "Operator CPU Usage", "utilizationTitle": "Usage(%)", + "trainingPerformance": "Training Performance", + "resourceUtilization": "Resource Utilization", "memory": { "memoryDetailLink": "Memory Usage Information", "overView": "Memory Allocation OverView", diff --git a/mindinsight/ui/src/locales/zh-cn.json b/mindinsight/ui/src/locales/zh-cn.json index f248b756..527783a8 100644 --- a/mindinsight/ui/src/locales/zh-cn.json +++ b/mindinsight/ui/src/locales/zh-cn.json @@ -476,6 +476,8 @@ "processCpuUtil": "进程CPU利用率", "operatorCpuUtil": "算子CPU利用率", "utilizationTitle": "利用率(%)", + "trainingPerformance": "训练性能", + "resourceUtilization": "资源利用", "memory": { "memoryDetailLink": "内存使用情况", "overView": "内存分配概览", diff --git a/mindinsight/ui/src/router.js b/mindinsight/ui/src/router.js index 505a602c..b9be4aae 100644 --- a/mindinsight/ui/src/router.js +++ b/mindinsight/ui/src/router.js @@ -103,6 +103,14 @@ export default new Router({ path: 'memory-detail', component: () => import('./views/profiling/memory-detail.vue'), }, + { + path: 'cpu-detail', + component: () => import('./views/profiling/cpu-detail.vue'), + }, + { + path: 'resource-utilization', + component: () => import('./views/profiling/resource-utilization.vue'), + }, ], }, { @@ -123,10 +131,18 @@ export default new Router({ path: 'operator', component: () => import('./views/profiling-gpu/operator.vue'), }, + { + path: 'resource-utilization', + component: () => import('./views/profiling-gpu/resource-utilization.vue'), + }, { path: 'step-trace', component: () => import('./views/profiling/step-trace.vue'), }, + { + path: 'cpu-detail', + component: () => import('./views/profiling/cpu-detail.vue'), + }, ], }, { diff --git a/mindinsight/ui/src/views/profiling-gpu/operator.vue b/mindinsight/ui/src/views/profiling-gpu/operator.vue index e17eed24..ed25c524 100644 --- a/mindinsight/ui/src/views/profiling-gpu/operator.vue +++ b/mindinsight/ui/src/views/profiling-gpu/operator.vue @@ -1197,11 +1197,11 @@ export default { } .operator .operator-title { padding: 0 15px; - font-size: 16px; + font-size: 18px; font-weight: bold; } .operator .cl-profiler { - height: calc(100% - 21px); + height: calc(100% - 24px); overflow-y: auto; width: 100%; background: #fff; diff --git a/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue b/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue index 88abdd3c..269af089 100644 --- a/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue +++ b/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue @@ -1,5 +1,5 @@ @@ -757,12 +764,12 @@ export default { } .cl-memory-detail .title-content .title-text { - font-size: 20px; + font-size: 18px; } .cl-memory-detail .top-content .content-item { display: flex; - height: calc(100% - 24px); + height: calc(100% - 21px); width: 100%; } @@ -817,7 +824,7 @@ export default { .cl-memory-detail .bottom-content .chart-container .chart-content, .cl-memory-detail .bottom-content .table-container .table-content { margin-top: 16px; - height: calc(100% - 30px); + height: calc(100% - 37px); } .cl-memory-detail .bottom-content .chart-container { height: calc(60% - 20px); @@ -827,7 +834,7 @@ export default { height: 40%; } .cl-memory-detail .title-item { - font-size: 18px; + font-size: 16px; font-weight: bold; } .cl-memory-detail .el-table td, diff --git a/mindinsight/ui/src/views/profiling/operator.vue b/mindinsight/ui/src/views/profiling/operator.vue index a9b36936..a4936d9c 100644 --- a/mindinsight/ui/src/views/profiling/operator.vue +++ b/mindinsight/ui/src/views/profiling/operator.vue @@ -1521,11 +1521,11 @@ export default { } .operator .operator-title { padding: 0 15px; - font-size: 16px; + font-size: 18px; font-weight: bold; } .operator .cl-profiler { - height: calc(100% - 21px); + height: calc(100% - 24px); overflow-y: auto; width: 100%; background: #fff; diff --git a/mindinsight/ui/src/views/profiling/profiling-dashboard.vue b/mindinsight/ui/src/views/profiling/profiling-dashboard.vue index 8b0c0cfe..7ad49eb3 100644 --- a/mindinsight/ui/src/views/profiling/profiling-dashboard.vue +++ b/mindinsight/ui/src/views/profiling/profiling-dashboard.vue @@ -1,5 +1,5 @@