From af82e2f67dfe5ad458a282cd1a49df464ab77cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E8=B1=AA=E6=9D=B0?= <tanghaojie1@huawei.com>
Date: Wed, 12 Nov 2025 15:39:42 +0800
Subject: [PATCH] optimize

---
 CMakeLists.txt                 |  1 +
 tf_adapter/kernels/geop_npu.cc | 28 +++++++++++++---------------
 tf_adapter/kernels/geop_npu.h  |  5 ++---
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d16549026..9729fc53d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ if (ENABLE_OPEN_SRC)
     include_directories(${ASCEND_OPENSDK_DIR}/include)
     include_directories(${ASCEND_OPENSDK_DIR}/include/aoe)
     include_directories(${ASCEND_OPENSDK_DIR}/include/slog)
+    include_directories(${ASCEND_OPENSDK_DIR}/include/slog/toolchain)
     include_directories(${ASCEND_OPENSDK_DIR}/include/runtime)
     include_directories(${ASCEND_OPENSDK_DIR}/include/ascendcl/external)
     include_directories(${ASCEND_OPENSDK_DIR}/include/msprof)
diff --git a/tf_adapter/kernels/geop_npu.cc b/tf_adapter/kernels/geop_npu.cc
index e278857ac..82c27e49f 100644
--- a/tf_adapter/kernels/geop_npu.cc
+++ b/tf_adapter/kernels/geop_npu.cc
@@ -1262,8 +1262,7 @@ Status GeOp::SetGraphOptions(OpKernelContext *ctx) {
 
 Status GeOp::CompileGraph(OpKernelContext *ctx, const std::vector<Tensor> &input_vec,
                           const std::vector<ge::Tensor> &inputs,
-                          const uint32_t &graph_id,
-                          const std::vector<std::string> &input_shapes) {
+                          const uint32_t &graph_id) {
   auto ret = ParserGraph(ctx, input_vec);
   if (!ret.ok()) {
     return ret;
@@ -1362,7 +1361,7 @@ Status GeOp::CompileAndRunGraph(OpKernelContext *ctx,
   }
 
   if (graph_handler_.status != CompileDone) {
-    auto ret = CompileGraph(ctx, input_vec, inputs, cache_graph_id, input_shapes);
+    auto ret = CompileGraph(ctx, input_vec, inputs, cache_graph_id);
     ADP_LOG(INFO) << "Set graph_status to CompileDone";
     if (!ret.ok()) {
       graph_handler_.status = Init;
@@ -2238,7 +2237,7 @@ std::string GeOp::BuildSubGraph(FunctionLibraryDefinition *flib_def, const std::
   return sub_graph_def->SerializeAsString();
 }
 
-void GeOp::AnalyzeInputDesc(void *tensor_ptr, ge::Tensor &input, ge::DataType type,
+void GeOp::AnalyzeInputDesc(bool need_collect_shapes, void *tensor_ptr, ge::Tensor &input, ge::DataType type,
                             std::vector<std::string> &input_shapes) const {
   ADP_LOG(INFO) << "[GEOP] Start analyze input tensor.";
   NpuGetNextOutputInfo *output_info = static_cast<NpuGetNextOutputInfo *>(tensor_ptr);
@@ -2247,8 +2246,9 @@ void GeOp::AnalyzeInputDesc(void *tensor_ptr, ge::Tensor &input, ge::DataType ty
     tmp_dims.push_back(dim);
   }
   TensorShape input_shape(tmp_dims);
-  input_shapes.push_back(input_shape.DebugString());
-
+  if (need_collect_shapes) {
+    input_shapes.push_back(input_shape.DebugString());
+  }
   ge::Shape ge_shape(output_info->dims_);
   ge::TensorDesc ge_tensor_desc(ge_shape);
   ge_tensor_desc.SetOriginShape(ge_shape);
@@ -2411,11 +2411,13 @@ Status GeOp::BuildInputTensorInfo(OpKernelContext *const ctx, std::vector<Tensor
                                   std::vector<std::string> &input_shapes, std::vector<ge::Tensor> &inputs) {
   // ctx is not nullptr
   int num_inputs = ctx->num_inputs();
-  std::string cur_input_shapes;
   // populate inputs
   std::shared_ptr<domi::ModelParser> model_parser =
       domi::ModelParserFactory::Instance()->CreateModelParser(domi::FrameworkType::TENSORFLOW);
   REQUIRES_NOT_NULL(model_parser);
+  inputs.reserve(num_inputs);
+  input_vec.reserve(num_inputs);
+  const bool need_collect_shapes = (!IsDynamicConfig() && IsLazyCompile());
   for (int i = 0; i < num_inputs; i++) {
     Tensor tensor(ctx->input(i));
     bool is_equal = false;
@@ -2424,8 +2426,6 @@ Status GeOp::BuildInputTensorInfo(OpKernelContext *const ctx, std::vector<Tensor
     } else if (is_equal) {
       continue;
     }
-    ADP_LOG(INFO) << "[GEOP] Kernel name: " << ctx->op_kernel().name()
-                  << ", Input tensor " << i << " shape: " << tensor.shape().DebugString();
     DataType data_type = tensor.dtype();
     auto tensor_ptr = static_cast<void *>(const_cast<char *>(tensor.tensor_data().data()));
     auto tensor_size = tensor.tensor_data().size();
@@ -2439,10 +2439,9 @@ Status GeOp::BuildInputTensorInfo(OpKernelContext *const ctx, std::vector<Tensor
     }
     if (is_dynamic_getnext_ == "1" && (placeholder_index_.find(std::to_string(i)) == std::string::npos)) {
       REQUIRES_NOT_NULL(tensor_ptr);
-      AnalyzeInputDesc(tensor_ptr, input, type, input_shapes);
+      AnalyzeInputDesc(need_collect_shapes, tensor_ptr, input, type, input_shapes);
     } else {
       std::vector<int64_t> dims;
-      std::string input_shape = tensor.shape().DebugString();
       for (uint32_t dim : tensor.shape().dim_sizes()) {
         dims.push_back(static_cast<int64_t>(dim));
       }
@@ -2451,8 +2450,6 @@ Status GeOp::BuildInputTensorInfo(OpKernelContext *const ctx, std::vector<Tensor
       ge_tensor_desc.SetDataType(type);
       ge_tensor_desc.SetOriginShape(ge_shape);
       input.SetTensorDesc(ge_tensor_desc);
-      ADP_LOG(INFO) << "[GEOP] input_" << i << ", type=" << type << ", tensor_ptr=" << tensor_ptr
-                    << ", tensor_size=" << tensor_size;
       if (type == ge::DT_STRING) {
         REQUIRES_NOT_NULL(tensor_ptr);
         const uint64_t count = static_cast<uint64_t>(tensor.NumElements());
@@ -2463,8 +2460,9 @@ Status GeOp::BuildInputTensorInfo(OpKernelContext *const ctx, std::vector<Tensor
       } else {
         input.SetData(static_cast<uint8_t *>(tensor_ptr), tensor_size, [](uint8_t *) {});
       }
-      input_shapes.push_back(input_shape);
-      cur_input_shapes += input_shape;
+      if (need_collect_shapes) {
+        input_shapes.push_back(tensor.shape().DebugString());
+      }
     }
     inputs.push_back(input);
     input_vec.push_back(tensor);
diff --git a/tf_adapter/kernels/geop_npu.h b/tf_adapter/kernels/geop_npu.h
index 8da492354..7fc55199c 100644
--- a/tf_adapter/kernels/geop_npu.h
+++ b/tf_adapter/kernels/geop_npu.h
@@ -113,8 +113,7 @@ public:
   Status AddGraph(OpKernelContext *ctx, const uint32_t &graph_id);
   Status CompileGraph(OpKernelContext *ctx, const std::vector<Tensor> &input_vec,
                       const std::vector<ge::Tensor> &inputs,
-                      const uint32_t &graph_id,
-                      const std::vector<std::string> &input_shapes);
+                      const uint32_t &graph_id);
   Status BuildGraph(const uint32_t &graph_id, const std::vector<ge::Tensor> &inputs);
   Status RunGraph(OpKernelContext *ctx, const uint32_t &graph_id,
                   const std::vector<ge::Tensor> &inputs,
@@ -166,7 +165,7 @@ public:
 
   Status ChangeInputsShapeDesc();
 
-  void AnalyzeInputDesc(void *tensor_ptr, ge::Tensor &input, ge::DataType type,
+  void AnalyzeInputDesc(bool need_collect_shapes, void *tensor_ptr, ge::Tensor &input, ge::DataType type,
                         std::vector<std::string> &input_shapes) const;
 
   int RunTuning(std::vector<Tensor> &input_vec, std::vector<ge::Tensor> &inputs, const OpKernelContext *const ctx);
-- 
Gitee