diff --git a/metadef b/metadef index 5d06bc7..d4d3655 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 5d06bc7547189f24195b3cedcb0bfc3d787c80a5 +Subproject commit d4d3655d2257c8e3e78b338aa02af47bdcfda21b diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt index 3b17728..db446e1 100644 --- a/parser/CMakeLists.txt +++ b/parser/CMakeLists.txt @@ -59,24 +59,12 @@ target_include_directories(fmk_parser PRIVATE ${PARSER_DIR} ${PARSER_DIR}/inc ${PARSER_DIR}/parser - ${PARSER_DIR}/../ge - ${PARSER_DIR}/../inc - ${PARSER_DIR}/../inc/framework - ${PARSER_DIR}/../inc/common/util - ${PARSER_DIR}/../inc/external - ${PARSER_DIR}/../third_party/fwkacllib/inc ${METADEF_DIR}/inc ${METADEF_DIR}/inc/graph ${METADEF_DIR}/inc/register ${METADEF_DIR}/inc/external ${METADEF_DIR}/inc/external/graph ${METADEF_DIR}/inc/external/register - #### independent compile ##### - ${METADEF_DIR}/third_party/graphengine/ge - ${METADEF_DIR}/third_party/graphengine/inc - ${METADEF_DIR}/third_party/graphengine/inc/framework - ${METADEF_DIR}/third_party/graphengine/inc/external - ${METADEF_DIR}/third_party/fwkacllib/inc #### temp #### ${PARSER_DIR}/../graphengine/inc/common/util ${PARSER_DIR}/../graphengine/inc/external @@ -84,7 +72,20 @@ target_include_directories(fmk_parser PRIVATE ${PARSER_DIR}/../graphengine/inc ${PARSER_DIR}/../graphengine/ge ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/proto/ge + ${CMAKE_BINARY_DIR}/proto/ge + #### blue zone compile ##### + ${PARSER_DIR}/../ge + ${PARSER_DIR}/../inc + ${PARSER_DIR}/../inc/framework + ${PARSER_DIR}/../inc/common/util + ${PARSER_DIR}/../inc/external + ${PARSER_DIR}/../third_party/fwkacllib/inc + #### blue independent compile ##### + ${METADEF_DIR}/third_party/graphengine/ge + ${METADEF_DIR}/third_party/graphengine/inc + ${METADEF_DIR}/third_party/graphengine/inc/framework + ${METADEF_DIR}/third_party/graphengine/inc/external + ${METADEF_DIR}/third_party/fwkacllib/inc ) target_link_libraries(fmk_parser diff --git a/parser/common/CMakeLists.txt b/parser/common/CMakeLists.txt index 9c3be13..276d2c2 100644 --- a/parser/common/CMakeLists.txt +++ b/parser/common/CMakeLists.txt @@ -41,24 +41,12 @@ target_include_directories(parser_common PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${PARSER_DIR} ${PARSER_DIR}/parser - ${PARSER_DIR}/../ge - ${PARSER_DIR}/../inc - ${PARSER_DIR}/../inc/framework - ${PARSER_DIR}/../inc/common/util - ${PARSER_DIR}/../inc/external - ${PARSER_DIR}/../third_party/fwkacllib/inc ${METADEF_DIR}/inc ${METADEF_DIR}/inc/graph ${METADEF_DIR}/inc/register ${METADEF_DIR}/inc/external ${METADEF_DIR}/inc/external/graph ${METADEF_DIR}/inc/external/register - #### independent compile ##### - ${METADEF_DIR}/third_party/graphengine/ge - ${METADEF_DIR}/third_party/graphengine/inc - ${METADEF_DIR}/third_party/graphengine/inc/framework - ${METADEF_DIR}/third_party/graphengine/inc/external - ${METADEF_DIR}/third_party/fwkacllib/inc #### temp #### ${PARSER_DIR}/../graphengine/inc/common/util ${PARSER_DIR}/../graphengine/inc/external @@ -67,6 +55,19 @@ target_include_directories(parser_common PRIVATE ${PARSER_DIR}/../graphengine/ge ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/proto/ge + #### blue zone compile ##### + ${PARSER_DIR}/../ge + ${PARSER_DIR}/../inc + ${PARSER_DIR}/../inc/framework + ${PARSER_DIR}/../inc/common/util + ${PARSER_DIR}/../inc/external + ${PARSER_DIR}/../third_party/fwkacllib/inc + #### independent compile ##### + ${METADEF_DIR}/third_party/graphengine/ge + ${METADEF_DIR}/third_party/graphengine/inc + ${METADEF_DIR}/third_party/graphengine/inc/framework + ${METADEF_DIR}/third_party/graphengine/inc/external + ${METADEF_DIR}/third_party/fwkacllib/inc ) target_link_libraries(parser_common PRIVATE diff --git a/parser/onnx/CMakeLists.txt b/parser/onnx/CMakeLists.txt index 26fcce4..84d1178 100644 --- a/parser/onnx/CMakeLists.txt +++ b/parser/onnx/CMakeLists.txt @@ -29,24 +29,12 @@ target_include_directories(fmk_onnx_parser PRIVATE ${PARSER_DIR} ${PARSER_DIR}/inc ${PARSER_DIR}/parser - ${PARSER_DIR}/../ge - ${PARSER_DIR}/../inc - ${PARSER_DIR}/../inc/common/util - ${PARSER_DIR}/../inc/framework - ${PARSER_DIR}/../inc/external - ${PARSER_DIR}/../third_party/fwkacllib/inc ${METADEF_DIR}/inc ${METADEF_DIR}/inc/graph ${METADEF_DIR}/inc/register ${METADEF_DIR}/inc/external ${METADEF_DIR}/inc/external/graph ${METADEF_DIR}/inc/external/register - #### independent compile ##### - ${METADEF_DIR}/third_party/graphengine/ge - ${METADEF_DIR}/third_party/graphengine/inc - ${METADEF_DIR}/third_party/graphengine/inc/framework - ${METADEF_DIR}/third_party/graphengine/inc/external - ${METADEF_DIR}/third_party/fwkacllib/inc #### temp #### ${PARSER_DIR}/../graphengine/inc/common/util ${PARSER_DIR}/../graphengine/inc/external @@ -55,6 +43,19 @@ target_include_directories(fmk_onnx_parser PRIVATE ${PARSER_DIR}/../graphengine/ge ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/proto/ge + #### blue zone compile ##### + ${PARSER_DIR}/../ge + ${PARSER_DIR}/../inc + ${PARSER_DIR}/../inc/common/util + ${PARSER_DIR}/../inc/framework + ${PARSER_DIR}/../inc/external + ${PARSER_DIR}/../third_party/fwkacllib/inc + #### independent compile ##### + ${METADEF_DIR}/third_party/graphengine/ge + ${METADEF_DIR}/third_party/graphengine/inc + ${METADEF_DIR}/third_party/graphengine/inc/framework + ${METADEF_DIR}/third_party/graphengine/inc/external + ${METADEF_DIR}/third_party/fwkacllib/inc ) target_link_libraries(fmk_onnx_parser PRIVATE