From 90b225ce8a00aafd94d0aef5f85e73adce91d5f2 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 27 Sep 2019 22:55:27 +0800 Subject: dldt-inference-engine: upgrade 2019r1.1 -> 2019r2 * Release notes: https://software.intel.com/en-us/articles/OpenVINO-RelNotes * Enable unit tests to be built and tested using ptest mechanism. * Include patches from Clear Linux for build fixes. * Switch to using python3 and threading to using TBB. Switch ENABLE_OPENCV to off so opencv from system is used. * Remove do_install and patch Makefiles instead to install libraries correctly. Signed-off-by: Anuj Mittal --- .../opencv/files/0001-disable-tests.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch deleted file mode 100644 index af6febde..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 888db5ced39bba933753c7f8b0b0ef4f900578a9 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 27 Aug 2019 08:06:46 +0800 -Subject: [PATCH] disable tests - -Disable tests for now since they build a local copy of gflags etc. - -Upstream-Status: Inappropriate [Configuration] - -Signed-off-by: Anuj Mittal - ---- - inference-engine/CMakeLists.txt | 1 - - inference-engine/samples/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt -index 9e15382..bdf874e 100644 ---- a/inference-engine/CMakeLists.txt -+++ b/inference-engine/CMakeLists.txt -@@ -131,7 +131,6 @@ include(CheckCXXCompilerFlag) - include(cpplint) - - add_subdirectory(src) --add_subdirectory(tests) - add_subdirectory(thirdparty) - set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") - -diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 4e13c11..a8a9946 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -93,7 +93,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE) - set (HAVE_SYS_STAT_H 1) - set (HAVE_INTTYPES_H 1) - --add_subdirectory(thirdparty/gflags) - - if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") -- cgit v1.2.3-54-g00ecf