diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c530301cf2..e7d4a66395 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -282,7 +282,7 @@ if (onnxruntime_BUILD_WEBASSEMBLY) # Build with sourcemap support set(CMAKE_CXX_FLAGS_DEBUG "-g4 --source-map-base ${onnxruntime_WEBASSEMBLY_SOURCEMAP_BASE}") else() - # override default "-g3" as it generates super huge (1GB+) WASM targets which fails to load + # override default "-g3" as it generates super huge (1GB+) WASM targets which fails to load set(CMAKE_CXX_FLAGS_DEBUG "-g2") endif() @@ -833,7 +833,7 @@ if (WIN32) if(onnxruntime_USE_OPENMP) list(APPEND ORT_WARNING_FLAGS "/wd6993") # Code analysis ignores OpenMP constructs endif() - + # Treat warning as error if onnxruntime_DEV_MODE is ON # For cross-compiled ARM64 binaries, there are too many warnings to fix, hence ignore warnings for now if (onnxruntime_DEV_MODE AND NOT CMAKE_CROSSCOMPILING) @@ -988,7 +988,7 @@ function(onnxruntime_set_compile_flags target_name) if (MSVC) target_compile_options(${target_name} PRIVATE "$<$:SHELL:--compiler-options /utf-8>" "$<$>:/utf-8>") target_compile_options(${target_name} PRIVATE "$<$:SHELL:--compiler-options /sdl>" "$<$>:/sdl>") - set_target_properties(${target_name} + set_target_properties(${target_name} PROPERTIES VS_GLOBAL_CAExcludePath "${ORT_BINARY_DIR};${ORT_SOURCE_DIR}") if (onnxruntime_ENABLE_STATIC_ANALYSIS) target_compile_options(${target_name} PRIVATE "$<$>:/analyze:stacksize 131072>") @@ -997,7 +997,7 @@ function(onnxruntime_set_compile_flags target_name) # Enable warning target_compile_options(${target_name} PRIVATE "$<$:SHELL:--compiler-options -Wall>" "$<$>:-Wall>") target_compile_options(${target_name} PRIVATE "$<$>:-Wextra>") - + if(onnxruntime_DEV_MODE) target_compile_options(${target_name} PRIVATE "$<$:SHELL:--compiler-options -Werror>" "$<$>:-Werror>") endif() @@ -1018,26 +1018,26 @@ function(onnxruntime_set_compile_flags target_name) endif() endif() foreach(ORT_FLAG ${ORT_WARNING_FLAGS}) - target_compile_options(${target_name} PRIVATE "$<$:SHELL:--compiler-options ${ORT_FLAG}>" "$<$>:${ORT_FLAG}>") + target_compile_options(${target_name} PRIVATE "$<$:SHELL:--compiler-options ${ORT_FLAG}>" "$<$>:${ORT_FLAG}>") endforeach() endfunction() function(onnxruntime_add_shared_library target_name) add_library(${target_name} SHARED ${ARGN}) - target_link_directories(${target_name} PRIVATE ${onnxruntime_LINK_DIRS}) - onnxruntime_set_compile_flags(${target_name}) + target_link_directories(${target_name} PRIVATE ${onnxruntime_LINK_DIRS}) + onnxruntime_set_compile_flags(${target_name}) target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${ONNXRUNTIME_ROOT}) if(onnxruntime_ENABLE_LTO) set_target_properties(${target_name} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE) set_target_properties(${target_name} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) set_target_properties(${target_name} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL TRUE) - endif() + endif() endfunction() function(onnxruntime_add_static_library target_name) add_library(${target_name} ${ARGN}) target_link_directories(${target_name} PRIVATE ${onnxruntime_LINK_DIRS}) - onnxruntime_set_compile_flags(${target_name}) + onnxruntime_set_compile_flags(${target_name}) target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${ONNXRUNTIME_ROOT}) if(onnxruntime_ENABLE_LTO) set_target_properties(${target_name} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE) @@ -1054,9 +1054,9 @@ function(onnxruntime_add_shared_library_module target_name) #On Windows, this target shouldn't generate an import lib, but I don't know how to disable it. add_library(${target_name} MODULE ${ARGN}) endif() - + target_link_directories(${target_name} PRIVATE ${onnxruntime_LINK_DIRS}) - onnxruntime_set_compile_flags(${target_name}) + onnxruntime_set_compile_flags(${target_name}) target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${ONNXRUNTIME_ROOT}) if(onnxruntime_ENABLE_LTO) set_target_properties(${target_name} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE) @@ -1072,7 +1072,7 @@ function(onnxruntime_add_executable target_name) endif() add_executable(${target_name} ${ARGN}) target_link_directories(${target_name} PRIVATE ${onnxruntime_LINK_DIRS}) - onnxruntime_set_compile_flags(${target_name}) + onnxruntime_set_compile_flags(${target_name}) target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${ONNXRUNTIME_ROOT}) if(onnxruntime_ENABLE_LTO) set_target_properties(${target_name} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE) @@ -1312,6 +1312,10 @@ if(onnxruntime_USE_OPENVINO) elseif (${VER} MATCHES "2021.4" OR $ENV{INTEL_OPENVINO_DIR} MATCHES "2021.4") set(OPENVINO_VERSION "2021.4") add_definitions(-DOPENVINO_2021_4=1) + elseif ($ENV{INTEL_OPENVINO_DIR} MATCHES "openvino") + set(OPENVINO_VERSION "2021.3") + add_definitions(-DOPENVINO_2021_3=1) + add_definitions(-DOPENVINO_2021_4=1) else() message(FATAL_ERROR "Unsupported OpenVINO version: ${INTEL_OPENVINO_DIR}") endif() @@ -1609,7 +1613,7 @@ if(onnxruntime_ENABLE_EAGER_MODE) list(APPEND ONNXRUNTIME_TARGETS onnxruntime_eager) endif() foreach(target_name ${ONNXRUNTIME_TARGETS}) - include(${target_name}.cmake) + include(${target_name}.cmake) endforeach() if (CMAKE_SYSTEM_NAME STREQUAL "Android") diff --git a/onnxruntime/core/providers/openvino/backends/basic_backend.cc b/onnxruntime/core/providers/openvino/backends/basic_backend.cc index a3981ad08a..36976ad24f 100644 --- a/onnxruntime/core/providers/openvino/backends/basic_backend.cc +++ b/onnxruntime/core/providers/openvino/backends/basic_backend.cc @@ -142,9 +142,6 @@ BasicBackend::BasicBackend(const ONNX_NAMESPACE::ModelProto& model_proto, config["MYRIAD_HW_INJECT_STAGES"] = CONFIG_VALUE(NO); config["MYRIAD_COPY_OPTIMIZATION"] = CONFIG_VALUE(NO); } - - //to check preprocessing inside model - config["MYRIAD_CHECK_PREPROCESSING_INSIDE_MODEL"] = CONFIG_VALUE(NO); #else if (subgraph_context_.set_vpu_config) { config["VPU_DETECT_NETWORK_BATCH"] = CONFIG_VALUE(NO); @@ -153,6 +150,10 @@ BasicBackend::BasicBackend(const ONNX_NAMESPACE::ModelProto& model_proto, config["VPU_HW_INJECT_STAGES"] = CONFIG_VALUE(NO); config["VPU_COPY_OPTIMIZATION"] = CONFIG_VALUE(NO); } + #endif + #if defined(OPENVINO_2021_4) + //to check preprocessing inside model + config["MYRIAD_CHECK_PREPROCESSING_INSIDE_MODEL"] = CONFIG_VALUE(NO); #endif } try {