!7669 add rpath for opp default directories

Merge pull request !7669 from yanghaoran/master

mindspore/ccsrc/CMakeLists.txt

@@ -267,6 +267,8 @@ if (ENABLE_D)
     set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/fwkacllib/lib64)
     set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/add-ons)
     set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/opp/op_impl/built-in/ai_core/tbe/op_tiling)
+    set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/nnae/latest/opp/op_impl/built-in/ai_core/tbe/op_tiling)
+    set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/ascend-toolkit/latest/opp/op_impl/built-in/ai_core/tbe/op_tiling)
 elseif (ENABLE_GPU)
     set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/cuda/lib64)
 endif ()

mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc

@@ -316,6 +316,7 @@ bool AscendKernelRuntime::Load(session::KernelGraph *graph, bool is_task_sink) {
   if (!is_task_sink) {
     return true;
   }
+  rtCtxSetCurrent(rt_context_hccl_);
   // Do HcomExecutorInitialize
   if (graph->is_dynamic_shape() && !HcclExecutorManager::GetInstance().Initialize()) {
     MS_LOG(ERROR) << "Init Hccl Executor Failed";
@@ -651,6 +652,11 @@ bool AscendKernelRuntime::InitDevice() {
     }
   }
 
+  ret = rtCtxGetCurrent(&rt_context_hccl_);
+  if (ret != RT_ERROR_NONE || rt_context_hccl_ == nullptr) {
+    MS_LOG(ERROR) << "Call rtCtxGetCurrent failed, ret[" << ret << "]";
+  }
+
   ret = rtCtxCreate(&rt_context_, 0, device_id_);
   if (ret != RT_ERROR_NONE) {
     MS_EXCEPTION(DeviceProcessError) << "Call rtCtxCreate, ret[" << static_cast<int>(ret) << "]";

mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.h

@@ -76,6 +76,7 @@ class AscendKernelRuntime : public KernelRuntime {
   void LaunchDataDump(GraphId graph_id);
 
   rtContext_t rt_context_{nullptr};
+  rtContext_t rt_context_hccl_{nullptr};
   bool initialized_{false};
   unordered_map<GraphId, vector<std::shared_ptr<TaskInfo>>> task_map_;
   unordered_map<GraphId, std::shared_ptr<ge::model_runner::DavinciModel>> graph_model_map_;

mindspore/ccsrc/runtime/device/ascend/executor/hccl_dynamic_kernel.cc

@@ -87,11 +87,7 @@ void HcclDynamicKernel::StaticShapeExecute() {
 
 void HcclDynamicKernel::Execute() {
   MS_LOG(INFO) << "Start Execute";
-  if (!is_dynamic_shape_) {
-    MS_LOG(INFO) << "Not Dynamic, call hcom api";
-    StaticShapeExecute();
-    return;
-  }
+
   auto handle = HcclExecutorManager::GetInstance().handle();
   auto EnqueueHcomOperation =
     (HcclResult(*)(ge::HcomOpertion, std::function<void(HcclResult status)>))dlsym(handle, "EnqueueHcomOpertion");