From c550b58f0087a903a25dc66189c0a45b46804ed2 Mon Sep 17 00:00:00 2001
From: zhanjun <zhanjun6@hisilicon.com>
Date: Tue, 11 Nov 2025 17:35:02 +0800
Subject: [PATCH 1/2] update submodule

---
 third_party/cann-graph-engine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/cann-graph-engine b/third_party/cann-graph-engine
index f15250ed..0793faa7 160000
--- a/third_party/cann-graph-engine
+++ b/third_party/cann-graph-engine
@@ -1 +1 @@
-Subproject commit f15250ed4eae9ce6bb910556b293e57c65077757
+Subproject commit 0793faa773b5fe4478ecc34ee78b6f07863bb2d5
-- 
Gitee


From 3878615fdc0fc6eec294b46c278464bb03fbb77a Mon Sep 17 00:00:00 2001
From: zhanjun <zhanjun6@hisilicon.com>
Date: Tue, 11 Nov 2025 21:11:45 +0800
Subject: [PATCH 2/2] fix slog

---
 cmake/modules/Findslog.cmake         | 14 +++++++-------
 cmake/modules/Findunified_dlog.cmake | 21 +++++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/cmake/modules/Findslog.cmake b/cmake/modules/Findslog.cmake
index cf1ca521..6105a61d 100644
--- a/cmake/modules/Findslog.cmake
+++ b/cmake/modules/Findslog.cmake
@@ -15,7 +15,7 @@ endif()
 set(_cmake_targets_defined "")
 set(_cmake_targets_not_defined "")
 set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS slog alog slog_headers)
+foreach(_cmake_expected_target IN ITEMS slog alog old_slog_headers)
     list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
     if(TARGET "${_cmake_expected_target}")
         list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -81,20 +81,20 @@ if(slog_FOUND)
     add_library(slog SHARED IMPORTED)
     set_target_properties(slog PROPERTIES
         INTERFACE_COMPILE_DEFINITIONS "LOG_CPP;PROCESS_LOG"
-        INTERFACE_LINK_LIBRARIES "slog_headers"
+        INTERFACE_LINK_LIBRARIES "old_slog_headers"
         IMPORTED_LOCATION "${slog_SHARED_LIBRARY}"
     )
 
     add_library(alog SHARED IMPORTED)
     set_target_properties(alog PROPERTIES
         INTERFACE_COMPILE_DEFINITIONS "LOG_CPP;PROCESS_LOG"
-        INTERFACE_LINK_LIBRARIES "slog_headers"
+        INTERFACE_LINK_LIBRARIES "old_slog_headers"
         IMPORTED_LOCATION "${alog_SHARED_LIBRARY}"
     )
 
-    add_library(slog_headers INTERFACE IMPORTED)
-    set_target_properties(slog_headers PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${slog_INCLUDE_DIR};${slog_INCLUDE_DIR}/slog;${slog_INCLUDE_DIR}/slog/toolchain"
+    add_library(old_slog_headers INTERFACE IMPORTED)
+    set_target_properties(old_slog_headers PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${slog_INCLUDE_DIR};${slog_INCLUDE_DIR}/slog;${slog_INCLUDE_DIR}/slog/toolchain"
     )
 
     include(CMakePrintHelpers)
@@ -104,7 +104,7 @@ if(slog_FOUND)
     cmake_print_properties(TARGETS alog
         PROPERTIES INTERFACE_COMPILE_DEFINITIONS INTERFACE_LINK_LIBRARIES IMPORTED_LOCATION
     )
-    cmake_print_properties(TARGETS slog_headers
+    cmake_print_properties(TARGETS old_slog_headers
         PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
     )
 endif()
diff --git a/cmake/modules/Findunified_dlog.cmake b/cmake/modules/Findunified_dlog.cmake
index 4d19cff1..7a939ae6 100644
--- a/cmake/modules/Findunified_dlog.cmake
+++ b/cmake/modules/Findunified_dlog.cmake
@@ -15,7 +15,7 @@ endif()
 set(_cmake_targets_defined "")
 set(_cmake_targets_not_defined "")
 set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS unified_dlog unified_dlog_headers)
+foreach(_cmake_expected_target IN ITEMS unified_dlog slog_headers)
     list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
     if(TARGET "${_cmake_expected_target}")
         list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -43,8 +43,9 @@ unset(_cmake_targets_defined)
 unset(_cmake_targets_not_defined)
 unset(_cmake_expected_targets)
 
-find_path(_INCLUDE_DIR
-    NAMES base/dlog_pub.h
+find_path(_INCLUDE_DIR_DLOG_PUB
+    NAMES dlog_pub.h
+    PATH_SUFFIXES pkg_inc/base
     NO_CMAKE_SYSTEM_PATH
     NO_CMAKE_FIND_ROOT_PATH)
 
@@ -59,12 +60,12 @@ find_package_handle_standard_args(unified_dlog
     FOUND_VAR
         unified_dlog_FOUND
     REQUIRED_VARS
-        _INCLUDE_DIR
+        _INCLUDE_DIR_DLOG_PUB
         unified_dlog_SHARED_LIBRARY
 )
 
 if(unified_dlog_FOUND)
-    set(unified_dlog_INCLUDE_DIR "${_INCLUDE_DIR}")
+    set(unified_dlog_INCLUDE_DIR "${_INCLUDE_DIR_DLOG_PUB}")
     include(CMakePrintHelpers)
     message(STATUS "Variables in unified_dlog module:")
     cmake_print_variables(unified_dlog_INCLUDE_DIR)
@@ -72,20 +73,20 @@ if(unified_dlog_FOUND)
 
     add_library(unified_dlog SHARED IMPORTED)
     set_target_properties(unified_dlog PROPERTIES
-        INTERFACE_LINK_LIBRARIES "unified_dlog_headers"
+        INTERFACE_LINK_LIBRARIES "slog_headers"
         IMPORTED_LOCATION "${unified_dlog_SHARED_LIBRARY}"
     )
 
-    add_library(unified_dlog_headers INTERFACE IMPORTED)
-    set_target_properties(unified_dlog_headers PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${unified_dlog_INCLUDE_DIR}"
+    add_library(slog_headers INTERFACE IMPORTED)
+    set_target_properties(slog_headers PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${unified_dlog_INCLUDE_DIR}"
     )
 
     include(CMakePrintHelpers)
     cmake_print_properties(TARGETS unified_dlog
         PROPERTIES INTERFACE_LINK_LIBRARIES IMPORTED_LOCATION
     )
-    cmake_print_properties(TARGETS unified_dlog_headers
+    cmake_print_properties(TARGETS slog_headers
         PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
     )
 endif()
-- 
Gitee