From a8f9b813119a69e6cd7b9fac11ce7f962f356152 Mon Sep 17 00:00:00 2001
From: tronzhang <zhangzhaochuang@huawei.com>
Date: Fri, 5 Nov 2021 14:25:00 +0800
Subject: [PATCH] upgrade Ascend software package Nov 5

---
 graphengine                                               | 2 +-
 mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc | 2 +-
 .../device/ascend/executor/ai_core_dynamic_kernel.cc      | 2 ++
 mindspore/run_check/_check_version.py                     | 8 ++++----
 version.txt                                               | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/graphengine b/graphengine
index 9bce7edf7f..b4368cd036 160000
--- a/graphengine
+++ b/graphengine
@@ -1 +1 @@
-Subproject commit 9bce7edf7fdfc377b426a42c4da69572dc1f1285
+Subproject commit b4368cd0361c25a79e24579356bcbda47e738161
diff --git a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc
index bfe964f645..1b09b8f320 100644
--- a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc
+++ b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc
@@ -324,7 +324,7 @@ void DataDumper::OpDebugRegister() {
     return;
   }
 
-  rtError_t rt_ret = rtMalloc(&op_debug_buffer_addr_, kOpDebugHostMemSize, RT_MEMORY_DDR);
+  rtError_t rt_ret = rtMalloc(&op_debug_buffer_addr_, kOpDebugHostMemSize, RT_MEMORY_TS);
   if (rt_ret != RT_ERROR_NONE) {
     MS_LOG(EXCEPTION) << "[DataDump] Call rtMalloc failed, ret = " << rt_ret;
   }
diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.cc b/mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.cc
index a3a69e3d10..c24e2cf5b9 100644
--- a/mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.cc
+++ b/mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.cc
@@ -22,6 +22,8 @@
 #include "utils/convert_utils_base.h"
 #include "utils/ms_context.h"
 #include "runtime/device/kernel_runtime_manager.h"
+#include "runtime/kernel.h"
+#include "runtime/mem.h"
 #include "pipeline/jit/static_analysis/static_analysis.h"
 #include "runtime/device/ascend/executor/tiling/op_tiling_adapter.h"
 #include "common/trans.h"
diff --git a/mindspore/run_check/_check_version.py b/mindspore/run_check/_check_version.py
index 5c9aa8a622..88c3c95316 100644
--- a/mindspore/run_check/_check_version.py
+++ b/mindspore/run_check/_check_version.py
@@ -19,8 +19,8 @@ import time
 import subprocess
 from pathlib import Path
 from abc import abstractmethod, ABCMeta
-import numpy as np
 from packaging import version
+import numpy as np
 from mindspore import log as logger
 from ..version import __version__
 from ..default_config import __package_name__
@@ -207,7 +207,7 @@ class AscendEnvChecker(EnvChecker):
     """ascend environment check"""
 
     def __init__(self):
-        self.version = ["1.79"]
+        self.version = ["1.80"]
         atlas_nnae_version = "/usr/local/Ascend/nnae/latest/fwkacllib/version.info"
         atlas_toolkit_version = "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/version.info"
         hisi_fwk_version = "/usr/local/Ascend/fwkacllib/version.info"
@@ -304,7 +304,7 @@ class AscendEnvChecker(EnvChecker):
             return
 
         try:
-            import te # pylint: disable=unused-import
+            import te  # pylint: disable=unused-import
         # pylint: disable=broad-except
         except Exception:
             if Path(self.tbe_path).is_dir():
@@ -410,7 +410,7 @@ def check_version_and_env_config():
     try:
         # check version of ascend site or cuda
         env_checker.check_version()
-        from .. import _c_expression # pylint: disable=unused-import
+        from .. import _c_expression  # pylint: disable=unused-import
         env_checker.set_env()
     except ImportError as e:
         env_checker.check_env(e)
diff --git a/version.txt b/version.txt
index 3e1ad720b1..ce6a70b9d8 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.5.0
\ No newline at end of file
+1.6.0
\ No newline at end of file