From 666d60d6f8e8f1a62fa88908e297bcc647fb0678 Mon Sep 17 00:00:00 2001
From: fengxuefeng <fengxuefeng2@huawei.com>
Date: Wed, 28 Apr 2021 10:47:50 +0800
Subject: [PATCH] Modify the layout ,timeline download file name and the link
 address of the profiler page

---
 mindinsight/ui/src/locales/en-us.json                     | 6 +++---
 mindinsight/ui/src/locales/zh-cn.json                     | 2 +-
 .../ui/src/views/profiling-gpu/profiling-dashboard.vue    | 8 ++++++--
 .../ui/src/views/profiling/profiling-dashboard.vue        | 8 ++++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/mindinsight/ui/src/locales/en-us.json b/mindinsight/ui/src/locales/en-us.json
index 4648d194..8dde9229 100644
--- a/mindinsight/ui/src/locales/en-us.json
+++ b/mindinsight/ui/src/locales/en-us.json
@@ -314,7 +314,7 @@
       "desc": "How Do I Use Profiler for Profiling?",
       "anchor": ["desc"],
       "url": [
-        "https://www.mindspore.cn/tutorial/training/en/master/advanced_use/performance_profiling.html"
+        "https://www.mindspore.cn/tutorial/training/en/master/advanced_use/performance_profiling_ascend.html"
       ],
       "gpuUrl": [
         "https://www.mindspore.cn/tutorial/training/en/master/advanced_use/performance_profiling_gpu.html"
@@ -679,8 +679,7 @@
       "abs_mean_update_ratio_lt": "Ratio of mean update <",
       "param": "Threshold",
       "max_min_lt": "MAX-MIN <",
-      "max_min_gt": "MAX-MIN >",
-      "outdateTip": "When a watchpoint list or the current step is modified, the result may be outdated. Check again or perform subsequent step training. "
+      "max_min_gt": "MAX-MIN >"
     },
     "tensorTuningAdvice": {
       "operator_real_data_validation": [
@@ -818,6 +817,7 @@
     "recommendDetail": "The recommended watchpoints check zero tensors, gradient disappearances, and update weight above threshold.",
     "use": "Yes",
     "notUse": "No",
+    "outdateTip": "When a watchpoint list or the current step is modified, the result may be outdated. Check again or perform subsequent step training. ",
     "versionConflictTip": "MindSpore and MindInsight versions do not match. MindSpore version: {msv}; MindInsight version: {miv}",
     "checkTips": {
       "nan": "A tensor contains NaN, ",
diff --git a/mindinsight/ui/src/locales/zh-cn.json b/mindinsight/ui/src/locales/zh-cn.json
index 836efc9e..e6485d3b 100644
--- a/mindinsight/ui/src/locales/zh-cn.json
+++ b/mindinsight/ui/src/locales/zh-cn.json
@@ -313,7 +313,7 @@
       "desc": "如何使用Profiler进行性能分析",
       "anchor": ["desc"],
       "url": [
-        "https://www.mindspore.cn/tutorial/training/zh-CN/master/advanced_use/performance_profiling.html"
+        "https://www.mindspore.cn/tutorial/training/zh-CN/master/advanced_use/performance_profiling_ascend.html"
       ],
       "gpuUrl": [
         "https://www.mindspore.cn/tutorial/training/zh-CN/master/advanced_use/performance_profiling_gpu.html"
diff --git a/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue b/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue
index cf705d36..60f08b89 100644
--- a/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue
+++ b/mindinsight/ui/src/views/profiling-gpu/profiling-dashboard.vue
@@ -826,7 +826,10 @@ export default {
       const second = dealNumber(date.getSeconds());
       const millisecond = date.getMilliseconds();
       const timestamp = `${year}${mouth}${day}${hour}${minute}${second}${millisecond}`;
-      return `timeline_${this.trainingJobId}_${this.currentCard}_${timestamp}.json`;
+      return (
+        `timeline_${this.trainingJobId}_${this.currentCard}` +
+        `_ScopeNumber=${this.timelineInfo.scopeNameNum}_${timestamp}.json`
+      );
     },
     /**
      * Keep the number with n decimal places.
@@ -1255,6 +1258,7 @@ export default {
   float: left;
   font-weight: bold;
   font-size: 18px;
+  max-width: 300px;
 }
 .pro-router-wrap > div .title-wrap .tip-icon {
   float: right;
@@ -1508,7 +1512,7 @@ export default {
   width: 100px;
 }
 .pro-router-wrap .op-time-content {
-  height: calc(100% - 54px);
+  height: calc(100% - 72px);
   overflow: auto;
 }
 .pro-router-wrap .pie-chart {
diff --git a/mindinsight/ui/src/views/profiling/profiling-dashboard.vue b/mindinsight/ui/src/views/profiling/profiling-dashboard.vue
index e2790f99..67e7e192 100644
--- a/mindinsight/ui/src/views/profiling/profiling-dashboard.vue
+++ b/mindinsight/ui/src/views/profiling/profiling-dashboard.vue
@@ -1202,7 +1202,10 @@ export default {
       const second = dealNumber(date.getSeconds());
       const millisecond = date.getMilliseconds();
       const timestamp = `${year}${mouth}${day}${hour}${minute}${second}${millisecond}`;
-      return `timeline_${this.trainingJobId}_${this.currentCard}_${timestamp}.json`;
+      return (
+        `timeline_${this.trainingJobId}_${this.currentCard}` +
+        `_ScopeNumber=${this.timelineInfo.scopeNameNum}_${timestamp}.json`
+      );
     },
     /**
      * Keep the number with n decimal places.
@@ -1258,6 +1261,7 @@ export default {
   float: left;
   font-weight: bold;
   font-size: 18px;
+  max-width: 300px;
 }
 .pro-router-wrap > div .title-wrap .tip-icon {
   float: right;
@@ -1512,7 +1516,7 @@ export default {
   width: 100px;
 }
 .pro-router-wrap .op-time-content {
-  height: calc(100% - 54px);
+  height: calc(100% - 72px);
   overflow: auto;
 }
 .pro-router-wrap .pie-chart {