From 89c0fe5dcedf72f4db586aab4f7486a22d1a52c9 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 7 Apr 2020 09:40:30 +0800 Subject: dldt: upgrade 2019r3.1 -> 2020r1 Release notes: https://software.intel.com/en-us/articles/OpenVINO-RelNotes Signed-off-by: Anuj Mittal --- .../opencv/files/0004-disable-werror.patch | 97 ---------------------- 1 file changed, 97 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch deleted file mode 100644 index ca912fdf..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 1ca4d5de754c6ee90f685f2706f657800cad8386 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 27 Sep 2019 20:32:08 +0800 -Subject: [PATCH 4/7] disable werror - -This shouldn't be enabled and leads to multiple errors when compiling -cldnn and samples. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal -Signed-off-by: Chin Huat Ang ---- - inference-engine/cmake/os_flags.cmake | 1 - - inference-engine/samples/CMakeLists.txt | 1 - - inference-engine/src/extension/CMakeLists.txt | 1 - - inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 -- - inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 - - inference-engine/tools/CMakeLists.txt | 1 - - 6 files changed, 7 deletions(-) - -diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake -index ad15859..d471246 100644 ---- a/inference-engine/cmake/os_flags.cmake -+++ b/inference-engine/cmake/os_flags.cmake -@@ -47,7 +47,6 @@ if (WIN32) - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}") - endif() - else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ") - if (APPLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function") -diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 25f9f23..9aa5d5a 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -59,7 +59,6 @@ if (WIN32) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings - endif() - else() -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") #treating warnings as errors - if (APPLE) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") - elseif(UNIX) -diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt -index fb14ebe..228bb8c 100644 ---- a/inference-engine/src/extension/CMakeLists.txt -+++ b/inference-engine/src/extension/CMakeLists.txt -@@ -25,7 +25,6 @@ if (WIN32) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings - endif() - else() -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - endif() - - if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) -diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt -index 03e5bad..b9a3f5d 100644 ---- a/inference-engine/thirdparty/clDNN/CMakeLists.txt -+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt -@@ -760,8 +760,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") - MultiProcessorCompilation - DeadCodeEliminate - ExtensionsEnabled -- TreatWarnAsErrorEnabled -- WarnLevel4 - NoFastMath - StackProtector - ) -diff --git a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake -index a541215..bed8a59 100644 ---- a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake -+++ b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake -@@ -63,7 +63,6 @@ if(MSVC) - endif() - elseif(UNIX OR MINGW) - append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas") -- append_if_product(CMAKE_CCXX_FLAGS "-Werror") - append(CMAKE_CCXX_FLAGS "-fvisibility=internal") - append(CMAKE_C_FLAGS "-std=c99") - append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden") -diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt -index 3d80df3..b6cb7d8 100644 ---- a/inference-engine/tools/CMakeLists.txt -+++ b/inference-engine/tools/CMakeLists.txt -@@ -24,7 +24,6 @@ endif() - if (WIN32) - # add_compile_options("/WX") - else() -- add_compile_options("-Werror") - endif() - - if (ENABLE_OPENCV) --- -2.7.4 - -- cgit v1.2.3-54-g00ecf