From 68153208a3fb75fc719a9721627642422970bb7a Mon Sep 17 00:00:00 2001
From: fanxiaotong <fanxiaotong32@163.com>
Date: Tue, 24 Oct 2023 19:59:22 +0800
Subject: [PATCH 1/2] fix bug

---
 profiler/cluster_analyse/README.md                            | 2 +-
 .../cluster_kernels_analysis/cluster_prof_Info_analysis.py    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/profiler/cluster_analyse/README.md b/profiler/cluster_analyse/README.md
index 6352130c0..8981ac453 100644
--- a/profiler/cluster_analyse/README.md
+++ b/profiler/cluster_analyse/README.md
@@ -92,4 +92,4 @@ K列：Communication（Not Overlapped and Exclude Receive）指剔除recieve算
 
 - "LOCAL"是片内拷贝，速率非常快，不需要考虑。
 - “HCCS”或“PCIE”是节点内片间拷贝，速度在18GB左右或以上比较正常。
-- “RDMA”是节点间拷贝，910A速度在12GB左右或以上；910B速度在23-25GB左右比较正常。
+- “RDMA”是节点间拷贝，910A速度在12GB左右或以上。
diff --git a/profiler/cluster_analyse/cluster_kernels_analysis/cluster_prof_Info_analysis.py b/profiler/cluster_analyse/cluster_kernels_analysis/cluster_prof_Info_analysis.py
index 3b2b05676..88ff0dd3f 100644
--- a/profiler/cluster_analyse/cluster_kernels_analysis/cluster_prof_Info_analysis.py
+++ b/profiler/cluster_analyse/cluster_kernels_analysis/cluster_prof_Info_analysis.py
@@ -64,7 +64,7 @@ class FormDataProcessor:
         file = self.files[0]
         df = pd.read_csv(file)
         if 'aiv_time(us)' in df.columns:
-            return "ASCEND_910B"
+            return "ASCEND_NEW"
         return "ASCEND_OTHER"
 
     def getDeviceId(self, dir_path):
@@ -89,7 +89,7 @@ class ViewInfoManager:
     def setOpSummaryColumnsParams(self):
         # 有些数据除了用表格的列进行分组之外，还添加了其他属性对数据进行分类，这部分数据放在extend_attr_to_group里面
         self.op_summary_columns_dict = {
-            'ASCEND_910B': {
+            'ASCEND_NEW': {
                 'TimeToCsvAnalyzer':
                     {'columns_to_group': ["Op Name", "Input Shapes", "Input Data Types", "Output Shapes"],
                      'extend_attr_to_group': ["device_id", "node_id"],
-- 
Gitee


From 0a58de627d17e0f47d6e64cadba0c9998b884275 Mon Sep 17 00:00:00 2001
From: fanxiaotong <fanxiaotong32@163.com>
Date: Fri, 15 Dec 2023 10:24:30 +0800
Subject: [PATCH 2/2] delete

---
 .../cluster_profiling_data_copy.sh            | 46 -------------------
 profiler/distribute_tools/config.json         | 14 ------
 2 files changed, 60 deletions(-)
 delete mode 100644 profiler/distribute_tools/cluster_profiling_data_copy.sh
 delete mode 100644 profiler/distribute_tools/config.json

diff --git a/profiler/distribute_tools/cluster_profiling_data_copy.sh b/profiler/distribute_tools/cluster_profiling_data_copy.sh
deleted file mode 100644
index 38892b2ba..000000000
--- a/profiler/distribute_tools/cluster_profiling_data_copy.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2023, Huawei Technologies Co., Ltd.
-# All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0  (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# 汇聚节点的信息 ip地址、用户名、密码、profiling存储路径
-
-get_copy_node()
-{
-    cat ${config_path} | python3 -c 'import sys,json;[print(node) for node in json.load(sys.stdin)["cluster"].keys()]'
-}
-
-get_value_by_key()
-{
-    local node=$1
-    local key=$2
-    cat ${config_path} | python3 -c 'import sys,json;print(json.load(sys.stdin)["cluster"]['\"${node}\"']['\"${key}\"'])'
-}
-
-config_path=$1
-target_dir=$2
-
-node_list=$(get_copy_node ${config_path})
-echo "-----begin-copy---"
-
-for node in ${node_list}
-do
-    user=$(get_value_by_key ${node} "user")
-    passwd=$(get_value_by_key ${node} "passwd")
-	src_dir=$(get_value_by_key ${node} "dir")
-    echo "------------------user:${user}----node:${node}---------------------"
-    sshpass -p "${passwd}" scp -o StrictHostKeyChecking=no -r "${user}"@"${node}":"${src_dir}" "${target_dir}"
-done
diff --git a/profiler/distribute_tools/config.json b/profiler/distribute_tools/config.json
deleted file mode 100644
index 04f49e728..000000000
--- a/profiler/distribute_tools/config.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "cluster": {
-                "10.xxx.xxx.1": {
-                "user": "root",
-                "passwd": "xxx",
-                "dir": "/home/data/test"
-                },
-                "10.xxx.xxx.2": {
-                "user": "root",
-                "passwd": "xxx",
-                "dir": "/home/data/test"
-                }
-              }
-}
\ No newline at end of file
-- 
Gitee