From 77bf61bf63b5227900c34355cc39e93dc19e233e Mon Sep 17 00:00:00 2001
From: xiayifan <xiayifan1@huawei.com>
Date: Fri, 29 Jan 2021 14:47:32 +0800
Subject: [PATCH] UI device memory profiling bugfix 1.The memory value is
 incorrectly calculated when the unit is KiB 2.Tensor namne and size can be
 sorted in table data 3.The memory displayed in the overview bar is optimized

---
 mindinsight/ui/src/locales/en-us.json         |  1 +
 mindinsight/ui/src/locales/zh-cn.json         |  1 +
 .../ui/src/views/profiling/memory-detail.vue  | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/mindinsight/ui/src/locales/en-us.json b/mindinsight/ui/src/locales/en-us.json
index d5e80239..b4698053 100644
--- a/mindinsight/ui/src/locales/en-us.json
+++ b/mindinsight/ui/src/locales/en-us.json
@@ -489,6 +489,7 @@
       "memoryGiBUnit": "GiB",
       "memoryMiBUnit": "MiB",
       "memoryKiBUnit": "KiB",
+      "memoryByteUnit": "B",
       "usedMemory": "Memory Usage",
       "operatorMemoryAssign": "Operator Memory Allocation",
       "tensorName": "Tensor Name",
diff --git a/mindinsight/ui/src/locales/zh-cn.json b/mindinsight/ui/src/locales/zh-cn.json
index 03cc9d18..25faacfc 100644
--- a/mindinsight/ui/src/locales/zh-cn.json
+++ b/mindinsight/ui/src/locales/zh-cn.json
@@ -488,6 +488,7 @@
       "memoryGiBUnit": "GiB",
       "memoryMiBUnit": "MiB",
       "memoryKiBUnit": "KiB",
+      "memoryByteUnit": "B",
       "usedMemory": "内存使用",
       "operatorMemoryAssign": "算子内存分配",
       "tensorName": "张量名称",
diff --git a/mindinsight/ui/src/views/profiling/memory-detail.vue b/mindinsight/ui/src/views/profiling/memory-detail.vue
index f2daf76e..f7ae712d 100644
--- a/mindinsight/ui/src/views/profiling/memory-detail.vue
+++ b/mindinsight/ui/src/views/profiling/memory-detail.vue
@@ -105,7 +105,7 @@ limitations under the License.
                       height="100%"
                       tooltip-effect="light"
                       :empty-text="breakdownsInitOver ? $t('public.noData') : $t('public.dataLoading')">
-              <el-table-column prop="name">
+              <el-table-column prop="name" sortable>
                 <template slot="header">
                   <span :title="$t('profiling.memory.tensorName')">
                     {{$t('profiling.memory.tensorName')}}
@@ -115,7 +115,7 @@ limitations under the License.
                   <div class="cell">{{scope.row.name}}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="size">
+              <el-table-column prop="size" sortable>
                 <template slot="header">
                   <span :title="$t('profiling.memory.totalTensorMemoryAssign')">
                     {{$t('profiling.memory.totalTensorMemoryAssign')}}
@@ -214,6 +214,7 @@ export default {
         this.$t('profiling.memory.memoryGiBUnit'),
         this.$t('profiling.memory.memoryMiBUnit'),
         this.$t('profiling.memory.memoryKiBUnit'),
+        this.$t('profiling.memory.memoryByteUnit'),
       ],
       chartClickListenerOn: false, // Listening on discount click events
       curSelectedPointIndex: 0, // Subscript of the current selection point
@@ -685,9 +686,10 @@ export default {
       if (number === baseStr) {
         return baseStr;
       }
-      const loopCount = this.unitList.length;
+      const loopCount = this.unitList.length - 1;
+      const fixedLimit = 2;
       let baseNumber = number;
-      let utilIndex = -1;
+      let utilIndex = loopCount;
       let resultStr = '';
       for (let i = 0; i < loopCount; i++) {
         if (baseNumber >= 1) {
@@ -697,17 +699,12 @@ export default {
           baseNumber = baseNumber * this.unitBase;
         }
       }
-      if (utilIndex < 0) {
-        utilIndex = loopCount - 1;
-      }
       if (type === 1) {
-        resultStr = `${this.formmateNummber(baseNumber)}`;
+        resultStr = `${Number(baseNumber.toFixed(fixedLimit))}`;
       } else if (type === 2) {
         resultStr = `${this.unitList[utilIndex]}`;
       } else {
-        resultStr = `${this.formmateNummber(baseNumber)} ${
-          this.unitList[utilIndex]
-        }`;
+        resultStr = `${Number(baseNumber.toFixed(fixedLimit))} ${this.unitList[utilIndex]}`;
       }
       return resultStr;
     },