diff --git a/CMakeLists.txt b/CMakeLists.txt index 9729fc53defb5b8f56750e56195da1dc6a95e17e..54deeb449d1dec0cc06bc14bbb67d0814fb570ad 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/ diff --git a/tf_adapter/util/npu_attrs.cc b/tf_adapter/util/npu_attrs.cc index 80f512b66f2030fbda9a3094f520f1dbac7f6db9..781677d43805a8bec4853802e97888fad451e551 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"); }