From 727df6b58099d98cb8d2f8039aef874219b2f956 Mon Sep 17 00:00:00 2001 From: huanruizhi Date: Thu, 13 Nov 2025 14:34:37 +0000 Subject: [PATCH 1/2] =?UTF-8?q?!2919=20input=5Fshape=20options=E6=AD=A3?= =?UTF-8?q?=E5=88=99=E6=A0=A1=E9=AA=8C=E6=A0=BC=E5=BC=8F=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=20Merge=20pull=20request=20!2919=20from=20huanruizhi/dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tf_adapter/util/npu_attrs.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf_adapter/util/npu_attrs.cc b/tf_adapter/util/npu_attrs.cc index 80f512b66..781677d43 100644 --- a/tf_adapter/util/npu_attrs.cc +++ b/tf_adapter/util/npu_attrs.cc @@ -348,7 +348,7 @@ inline Status CheckInputShape(const std::string &input_shape) { } for (auto input : inputs) { std::string input_tmp = input + ","; - std::regex pattern(R"(\w{1,}:((\d{1,}|-\d{1,}),)+)"); + std::regex pattern(R"([\s\S]+:((\d{1,}|-\d{1,}),)+)"); if (!regex_match(input_tmp, pattern)) { return errors::InvalidArgument("input_shape string style is invalid"); } -- Gitee From c2277dbe84d5772fefd11cb1d0893da701c20e9f Mon Sep 17 00:00:00 2001 From: TangQunzhang Date: Thu, 13 Nov 2025 14:34:46 +0000 Subject: [PATCH 2/2] !3052 remove external from header files Merge pull request !3052 from TangQunzhang/ge_dev --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9729fc53d..54deeb449 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,11 +154,11 @@ else() ${TOP_DIR}/inc/ ${TOP_DIR}/inc/external/ ${TOP_DIR}/inc/common/ + ${TOP_DIR}/metadef/inc/external/ ${TOP_DIR}/graphengine/inc/ ${TOP_DIR}/graphengine/inc/external/ ${TOP_DIR}/metadef/inc/ ${TOP_DIR}/metadef/inc/graph/ - ${TOP_DIR}/metadef/inc/external/ ${TOP_DIR}/air/inc/graph_metadef/ ${TOP_DIR}/air/inc/graph_metadef/graph/ ${TOP_DIR}/air/inc/graph_metadef/external/ -- Gitee