diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support')
10 files changed, 79 insertions, 1013 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch new file mode 100644 index 00000000..4474aa3c --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 18 May 2022 12:24:03 +0800 | ||
4 | Subject: [PATCH] CMakeLists: disable Werror | ||
5 | |||
6 | gcc12 highlights minor warnings that cause the build to fail. Ignore | ||
7 | those until they aren't fixed upstream. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | CMakeLists.txt | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index 418483f7..c019fea0 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -146,7 +146,7 @@ else() | ||
21 | set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2") | ||
22 | if(LNX_BUILD) | ||
23 | #A few warnings yet to resolve under esx | ||
24 | - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") | ||
25 | + #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") | ||
26 | set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror") | ||
27 | endif() | ||
28 | set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") | ||
29 | @@ -791,4 +791,4 @@ if(ESX_BUILD) | ||
30 | include(CMake/esx.cmake) | ||
31 | endif() | ||
32 | |||
33 | -add_subdirectory(src/os/nvm_api_sample) | ||
34 | \ No newline at end of file | ||
35 | +add_subdirectory(src/os/nvm_api_sample) | ||
36 | -- | ||
37 | 2.35.3 | ||
38 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch index 7fede93c..8a734ed2 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch | |||
@@ -1,27 +1,29 @@ | |||
1 | 1 | Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut | |
2 | builds | ||
2 | Upstream-Status: Backport | 3 | Upstream-Status: Backport |
3 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 4 | Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com> |
4 | 5 | --- | |
5 | MdePkg/Include/Base.h | 12 ++++++++++++ | 6 | MdePkg/Include/Base.h | 12 ++++++++++++ |
6 | 1 file changed, 12 insertions(+) | 7 | 1 file changed, 12 insertions(+) |
7 | 8 | ||
8 | diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h | 9 | Index: edk2/MdePkg/Include/Base.h |
9 | index 2da08b0c78..072eefdb94 100644 | 10 | =================================================================== |
10 | --- a/MdePkg/Include/Base.h | 11 | --- edk2.orig/MdePkg/Include/Base.h |
11 | +++ b/MdePkg/Include/Base.h | 12 | +++ edk2/MdePkg/Include/Base.h |
12 | @@ -318,7 +318,11 @@ struct _LIST_ENTRY { | 13 | @@ -316,8 +316,12 @@ struct _LIST_ENTRY { |
13 | /// | 14 | #define NULL __null |
14 | /// NULL pointer (VOID *) | 15 | #endif |
15 | /// | 16 | #else |
16 | +#ifndef OS_BUILD | 17 | +#ifndef OS_BUILD |
17 | +#ifndef UNIT_TEST_UEFI_BUILD | 18 | +#ifndef UNIT_TEST_UEFI_BUILD |
18 | #define NULL ((VOID *) 0) | 19 | #define NULL ((VOID *) 0) |
20 | #endif | ||
19 | +#endif | 21 | +#endif |
20 | +#endif | 22 | +#endif |
21 | 23 | ||
22 | // | 24 | // |
23 | // Null character | 25 | // Null character |
24 | @@ -810,6 +814,8 @@ typedef UINTN *BASE_LIST; | 26 | @@ -813,6 +817,8 @@ typedef UINTN *BASE_LIST; |
25 | // Section 2.3.1 of the UEFI 2.3 Specification. | 27 | // Section 2.3.1 of the UEFI 2.3 Specification. |
26 | // | 28 | // |
27 | 29 | ||
@@ -30,28 +32,31 @@ index 2da08b0c78..072eefdb94 100644 | |||
30 | STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); | 32 | STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); |
31 | STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); | 33 | STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); |
32 | STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); | 34 | STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); |
33 | @@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi | 35 | @@ -841,7 +847,8 @@ STATIC_ASSERT (ALIGNOF (CHAR16) == size |
34 | STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); | 36 | STATIC_ASSERT (ALIGNOF (INTN) == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements"); |
35 | STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); | 37 | STATIC_ASSERT (ALIGNOF (UINTN) == sizeof (UINTN), "Alignment of UINTN does not meet UEFI Specification Data Type requirements"); |
36 | STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); | 38 | STATIC_ASSERT (ALIGNOF (VOID *) == sizeof (VOID *), "Alignment of VOID * does not meet UEFI Specification Data Type requirements"); |
39 | - | ||
37 | +#endif | 40 | +#endif |
38 | +#endif | 41 | +#endif |
39 | |||
40 | // | 42 | // |
41 | // The following three enum types are used to verify that the compiler | 43 | // The following three enum types are used to verify that the compiler |
42 | @@ -843,9 +851,13 @@ typedef enum { | 44 | // configuration for enum types is compliant with Section 2.3.1 of the |
43 | __VerifyUint32EnumValue = 0xffffffff | 45 | @@ -861,6 +868,8 @@ typedef enum { |
44 | } __VERIFY_UINT32_ENUM_SIZE; | 46 | __VerifyInt32EnumValue = 0x7fffffff |
47 | } __VERIFY_INT32_ENUM_SIZE; | ||
45 | 48 | ||
46 | +#ifndef OS_BUILD | 49 | +#ifndef OS_BUILD |
47 | +#ifndef UNIT_TEST_UEFI_BUILD | 50 | +#ifndef UNIT_TEST_UEFI_BUILD |
48 | STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); | 51 | STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); |
49 | STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); | 52 | STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); |
50 | STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); | 53 | STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); |
54 | @@ -868,6 +877,8 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_EN | ||
55 | STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE) == sizeof (__VERIFY_UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements"); | ||
56 | STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) == sizeof (__VERIFY_UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements"); | ||
57 | STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements"); | ||
51 | +#endif | 58 | +#endif |
52 | +#endif | 59 | +#endif |
53 | 60 | ||
54 | /** | 61 | /** |
55 | Macro that returns a pointer to the data structure that contains a specified field of | 62 | Macro that returns a pointer to the data structure that contains a specified field of |
56 | -- | ||
57 | 2.31.0.windows.1 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb index 251cd135..7b95ffe4 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb | |||
@@ -15,16 +15,16 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause" | |||
15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ | 15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ |
16 | file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" | 16 | file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" |
17 | 17 | ||
18 | SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ | 18 | SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master_3_0;name=ipmctl; \ |
19 | git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2; \ | 19 | git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/edk2;branch=master \ |
20 | file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ | 20 | file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ |
21 | file://0001-CMakeLists-disable-Werror.patch \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | SRCREV_ipmctl = "3cbc9f7f231f6f03895e0ff8ab797d22075e09b7" | 24 | SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9" |
24 | #tag: edk2-stable202108 | 25 | #tag edk2-stable202408 |
25 | SRCREV_edk2 = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5" | 26 | SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201" |
26 | 27 | SRCREV_FORMAT = "ipmctl_edk2" | |
27 | S = "${WORKDIR}/git" | ||
28 | 28 | ||
29 | inherit cmake dos2unix | 29 | inherit cmake dos2unix |
30 | 30 | ||
@@ -37,3 +37,9 @@ do_configure:prepend() { | |||
37 | ln -sf edk2/${dir} ${S} | 37 | ln -sf edk2/${dir} ${S} |
38 | done | 38 | done |
39 | } | 39 | } |
40 | |||
41 | do_install:append() { | ||
42 | # Remove /var/log/ipmctl as anything created in /var/log will not be | ||
43 | # available when tmpfs is mounted at /var/volatile/log. | ||
44 | rm -rf ${D}${localstatedir}/log | ||
45 | } | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch deleted file mode 100644 index 3c265652..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 419070322898381885b0ffa286905a3b08a23aa6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 9 Jun 2020 11:35:59 +0800 | ||
4 | Subject: [PATCH] don't install licenses and version | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | ngraph/CMakeLists.txt | 8 ++------ | ||
11 | ngraph/test/runtime/CMakeLists.txt | 2 ++ | ||
12 | 2 files changed, 4 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | ||
15 | index a05ca3b15c..9bc507b4c7 100644 | ||
16 | --- a/ngraph/CMakeLists.txt | ||
17 | +++ b/ngraph/CMakeLists.txt | ||
18 | @@ -272,7 +272,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
19 | install(EXPORT ngraphTargets | ||
20 | FILE ngraphTargets.cmake | ||
21 | NAMESPACE ngraph:: | ||
22 | - DESTINATION "deployment_tools/ngraph/cmake" | ||
23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
24 | COMPONENT ngraph_dev) | ||
25 | endif() | ||
26 | |||
27 | @@ -286,7 +286,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
28 | |||
29 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
30 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
31 | - DESTINATION "deployment_tools/ngraph/cmake" | ||
32 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
33 | COMPONENT ngraph_dev) | ||
34 | endif() | ||
35 | |||
36 | @@ -337,7 +337,3 @@ add_subdirectory(test) | ||
37 | if (NGRAPH_PYTHON_BUILD_ENABLE) | ||
38 | add_subdirectory(python) | ||
39 | endif() | ||
40 | - | ||
41 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION | ||
42 | - DESTINATION "deployment_tools/ngraph" | ||
43 | - COMPONENT ngraph) | ||
44 | diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt | ||
45 | index be84499ee0..f65357b751 100644 | ||
46 | --- a/ngraph/test/runtime/CMakeLists.txt | ||
47 | +++ b/ngraph/test/runtime/CMakeLists.txt | ||
48 | @@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | ||
49 | |||
50 | add_subdirectory(interpreter) | ||
51 | add_subdirectory(ie) | ||
52 | + | ||
53 | +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) | ||
54 | -- | ||
55 | 2.32.0 | ||
56 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch deleted file mode 100644 index b16135ee..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch +++ /dev/null | |||
@@ -1,333 +0,0 @@ | |||
1 | From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 8 Apr 2021 14:19:51 +0800 | ||
4 | Subject: [PATCH] inference-engine: use system installed packages | ||
5 | |||
6 | Use installed versions of ade, protobuf, zlib and tbb. | ||
7 | |||
8 | Don't fetch pybind11 at runtime and use the one that we have fetched while | ||
9 | running do_fetch. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | cmake/dependencies.cmake | 19 -------- | ||
16 | inference-engine/CMakeLists.txt | 6 +-- | ||
17 | inference-engine/cmake/dependencies.cmake | 45 ------------------- | ||
18 | inference-engine/cmake/ie_parallel.cmake | 2 +- | ||
19 | .../templates/InferenceEngineConfig.cmake.in | 10 ----- | ||
20 | inference-engine/samples/CMakeLists.txt | 3 +- | ||
21 | .../src/inference_engine/CMakeLists.txt | 4 +- | ||
22 | .../common_test_utils/CMakeLists.txt | 4 +- | ||
23 | .../unit_test_utils/CMakeLists.txt | 3 +- | ||
24 | inference-engine/thirdparty/CMakeLists.txt | 5 +-- | ||
25 | ngraph/python/CMakeLists.txt | 12 +---- | ||
26 | tests/fuzz/src/CMakeLists.txt | 1 - | ||
27 | thirdparty/CMakeLists.txt | 1 - | ||
28 | thirdparty/cnpy/CMakeLists.txt | 4 +- | ||
29 | 14 files changed, 14 insertions(+), 105 deletions(-) | ||
30 | |||
31 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | ||
32 | index 6cb15a077e..74d4ac4124 100644 | ||
33 | --- a/cmake/dependencies.cmake | ||
34 | +++ b/cmake/dependencies.cmake | ||
35 | @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") | ||
36 | if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") | ||
37 | set(protoc_version "3.7.1") | ||
38 | |||
39 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT | ||
40 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" | ||
41 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" | ||
42 | - SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8" | ||
43 | - ) | ||
44 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) | ||
45 | - | ||
46 | - reset_deps_cache(SYSTEM_PROTOC) | ||
47 | - | ||
48 | - find_program( | ||
49 | - SYSTEM_PROTOC | ||
50 | - NAMES protoc | ||
51 | - PATHS "${SYSTEM_PROTOC_ROOT}/bin" | ||
52 | - NO_DEFAULT_PATH) | ||
53 | - if(NOT SYSTEM_PROTOC) | ||
54 | - message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") | ||
55 | - endif() | ||
56 | - | ||
57 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | ||
58 | endif() | ||
59 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | ||
60 | index 1ac7fd8bf6..0615873110 100644 | ||
61 | --- a/inference-engine/CMakeLists.txt | ||
62 | +++ b/inference-engine/CMakeLists.txt | ||
63 | @@ -18,7 +18,7 @@ function(ie_developer_export_targets) | ||
64 | endfunction() | ||
65 | |||
66 | function(ie_developer_export) | ||
67 | - set(all_dev_targets gflags ie_libraries) | ||
68 | + set(all_dev_targets ie_libraries) | ||
69 | foreach(component IN LISTS openvino_export_components) | ||
70 | export(TARGETS ${${component}} NAMESPACE IE:: | ||
71 | APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") | ||
72 | @@ -142,7 +142,7 @@ endif() | ||
73 | # Developer package | ||
74 | # | ||
75 | |||
76 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils) | ||
77 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) | ||
78 | |||
79 | # for Template plugin | ||
80 | if(NGRAPH_INTERPRETER_ENABLE) | ||
81 | @@ -158,7 +158,7 @@ function(ie_generate_dev_package_config) | ||
82 | configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" | ||
83 | "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" | ||
84 | INSTALL_DESTINATION share # not used | ||
85 | - PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR" | ||
86 | + PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR" | ||
87 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) | ||
88 | |||
89 | configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" | ||
90 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake | ||
91 | index b270c46f2d..5f85197a85 100644 | ||
92 | --- a/inference-engine/cmake/dependencies.cmake | ||
93 | +++ b/inference-engine/cmake/dependencies.cmake | ||
94 | @@ -81,51 +81,6 @@ endif () | ||
95 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
96 | reset_deps_cache(TBBROOT TBB_DIR) | ||
97 | |||
98 | - if (WIN32 AND X86_64) | ||
99 | - #TODO: add target_path to be platform specific as well, to avoid following if | ||
100 | - RESOLVE_DEPENDENCY(TBB | ||
101 | - ARCHIVE_WIN "tbb2020_20200415_win.zip" | ||
102 | - TARGET_PATH "${TEMP}/tbb" | ||
103 | - ENVIRONMENT "TBBROOT" | ||
104 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") | ||
105 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | ||
106 | - ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" | ||
107 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | ||
108 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | ||
109 | - SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") | ||
110 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well | ||
111 | - RESOLVE_DEPENDENCY(TBB | ||
112 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" | ||
113 | - TARGET_PATH "${TEMP}/tbb" | ||
114 | - ENVIRONMENT "TBBROOT" | ||
115 | - SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce") | ||
116 | - elseif(LINUX AND X86_64) | ||
117 | - RESOLVE_DEPENDENCY(TBB | ||
118 | - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" | ||
119 | - TARGET_PATH "${TEMP}/tbb" | ||
120 | - ENVIRONMENT "TBBROOT" | ||
121 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") | ||
122 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | ||
123 | - ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" | ||
124 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | ||
125 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | ||
126 | - SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") | ||
127 | - elseif(LINUX AND AARCH64) | ||
128 | - RESOLVE_DEPENDENCY(TBB | ||
129 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" | ||
130 | - TARGET_PATH "${TEMP}/tbb_yocto" | ||
131 | - ENVIRONMENT "TBBROOT" | ||
132 | - SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b") | ||
133 | - elseif(APPLE AND X86_64) | ||
134 | - RESOLVE_DEPENDENCY(TBB | ||
135 | - ARCHIVE_MAC "tbb2020_20200404_mac.tgz" | ||
136 | - TARGET_PATH "${TEMP}/tbb" | ||
137 | - ENVIRONMENT "TBBROOT" | ||
138 | - SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6") | ||
139 | - else() | ||
140 | - message(FATAL_ERROR "TBB is not available on current platform") | ||
141 | - endif() | ||
142 | - | ||
143 | update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") | ||
144 | update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") | ||
145 | |||
146 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | ||
147 | index edf3d2f2b2..6579d0f7ea 100644 | ||
148 | --- a/inference-engine/cmake/ie_parallel.cmake | ||
149 | +++ b/inference-engine/cmake/ie_parallel.cmake | ||
150 | @@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) | ||
151 | find_dependency(TBB COMPONENTS tbb tbbmalloc) | ||
152 | endif() | ||
153 | set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) | ||
154 | - set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) | ||
155 | + set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) | ||
156 | set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) | ||
157 | if (NOT TBB_FOUND) | ||
158 | ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ | ||
159 | diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
160 | index 261edbf3d7..bf217a789a 100644 | ||
161 | --- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
162 | +++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
163 | @@ -86,16 +86,6 @@ endfunction() | ||
164 | set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}") | ||
165 | |||
166 | set(THREADING "@THREADING@") | ||
167 | -if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) | ||
168 | - set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") | ||
169 | - _ie_find_dependency(TBB | ||
170 | - COMPONENTS tbb tbbmalloc | ||
171 | - CONFIG | ||
172 | - PATHS ${TBBROOT}/cmake | ||
173 | - ${_tbb_dir} | ||
174 | - NO_CMAKE_FIND_ROOT_PATH | ||
175 | - NO_DEFAULT_PATH) | ||
176 | -endif() | ||
177 | |||
178 | set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") | ||
179 | _ie_find_dependency(ngraph | ||
180 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | ||
181 | index 7924c56779..ae93857944 100644 | ||
182 | --- a/inference-engine/samples/CMakeLists.txt | ||
183 | +++ b/inference-engine/samples/CMakeLists.txt | ||
184 | @@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") | ||
185 | add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) | ||
186 | set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) | ||
187 | endfunction() | ||
188 | - add_gflags() | ||
189 | + #add_gflags() | ||
190 | endif() | ||
191 | |||
192 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") | ||
193 | - add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) | ||
194 | endif() | ||
195 | |||
196 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") | ||
197 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
198 | index e8ed1a5c4c..2fcb0bed4a 100644 | ||
199 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
200 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
201 | @@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf | ||
202 | INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" | ||
203 | PATH_VARS ${PATH_VARS}) | ||
204 | |||
205 | -set(IE_INCLUDE_DIR "include") | ||
206 | -set(IE_NGRAPH_DIR "../ngraph/cmake") | ||
207 | +set(IE_INCLUDE_DIR "../../include") | ||
208 | +set(IE_NGRAPH_DIR "ngraph") | ||
209 | set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") | ||
210 | set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") | ||
211 | |||
212 | diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
213 | index 5e8643dc5d..031557efc3 100644 | ||
214 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
215 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
216 | @@ -43,7 +43,7 @@ function(add_gtest_libraries) | ||
217 | PROPERTIES FOLDER thirdparty) | ||
218 | endfunction() | ||
219 | |||
220 | -add_gtest_libraries() | ||
221 | +#add_gtest_libraries() | ||
222 | |||
223 | if (MSVC) | ||
224 | set(PUGI pugixml_mt) | ||
225 | @@ -52,8 +52,6 @@ else () | ||
226 | endif () | ||
227 | |||
228 | list(APPEND EXPORT_DEPENDENCIES | ||
229 | - gtest | ||
230 | - gtest_main | ||
231 | ) | ||
232 | |||
233 | set(TARGET_NAME commonTestUtils) | ||
234 | diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | ||
235 | index 7c1d89eabf..2fbd8fc324 100644 | ||
236 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | ||
237 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | ||
238 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) | ||
239 | |||
240 | list(APPEND EXPORT_DEPENDENCIES | ||
241 | commonTestUtils_s | ||
242 | - inference_engine_s | ||
243 | - gmock) | ||
244 | + inference_engine_s) | ||
245 | |||
246 | addIeTarget( | ||
247 | NAME ${TARGET_NAME} | ||
248 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | ||
249 | index f028ebdd8a..9c5bd53466 100644 | ||
250 | --- a/inference-engine/thirdparty/CMakeLists.txt | ||
251 | +++ b/inference-engine/thirdparty/CMakeLists.txt | ||
252 | @@ -62,14 +62,13 @@ else() | ||
253 | target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") | ||
254 | endif() | ||
255 | |||
256 | -add_subdirectory(ade EXCLUDE_FROM_ALL) | ||
257 | add_subdirectory(fluid/modules/gapi) | ||
258 | |||
259 | -set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) | ||
260 | +set_target_properties(fluid PROPERTIES FOLDER thirdparty) | ||
261 | |||
262 | # developer package | ||
263 | |||
264 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) | ||
265 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) | ||
266 | |||
267 | if (NOT USE_SYSTEM_PUGIXML) | ||
268 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) | ||
269 | diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt | ||
270 | index 501bfffb4b..b45612c19c 100644 | ||
271 | --- a/ngraph/python/CMakeLists.txt | ||
272 | +++ b/ngraph/python/CMakeLists.txt | ||
273 | @@ -17,17 +17,7 @@ endif() | ||
274 | |||
275 | include(FetchContent) | ||
276 | |||
277 | -FetchContent_Declare( | ||
278 | - pybind11 | ||
279 | - GIT_REPOSITORY "https://github.com/pybind/pybind11.git" | ||
280 | - GIT_TAG "v2.5.0" | ||
281 | -) | ||
282 | - | ||
283 | -FetchContent_GetProperties(pybind11) | ||
284 | -if(NOT pybind11_POPULATED) | ||
285 | - FetchContent_Populate(pybind11) | ||
286 | - add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) | ||
287 | -endif() | ||
288 | +add_subdirectory(pybind11) | ||
289 | |||
290 | # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 | ||
291 | set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) | ||
292 | diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt | ||
293 | index b9400d9e7e..669938526c 100644 | ||
294 | --- a/tests/fuzz/src/CMakeLists.txt | ||
295 | +++ b/tests/fuzz/src/CMakeLists.txt | ||
296 | @@ -10,7 +10,6 @@ add_custom_target(fuzz) | ||
297 | FILE(GLOB tests "*-fuzzer.cc") | ||
298 | |||
299 | add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) | ||
300 | -add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) | ||
301 | |||
302 | foreach(test_source ${tests}) | ||
303 | get_filename_component(test_name ${test_source} NAME_WE) | ||
304 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | ||
305 | index 2c6b656408..4e86bd21ef 100644 | ||
306 | --- a/thirdparty/CMakeLists.txt | ||
307 | +++ b/thirdparty/CMakeLists.txt | ||
308 | @@ -5,6 +5,5 @@ | ||
309 | add_subdirectory(ittapi) | ||
310 | add_subdirectory(itt_collector) | ||
311 | add_subdirectory(xbyak EXCLUDE_FROM_ALL) | ||
312 | -add_subdirectory(zlib EXCLUDE_FROM_ALL) | ||
313 | add_subdirectory(cnpy EXCLUDE_FROM_ALL) | ||
314 | openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak) | ||
315 | diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt | ||
316 | index 5571cd5f78..e30604927a 100644 | ||
317 | --- a/thirdparty/cnpy/CMakeLists.txt | ||
318 | +++ b/thirdparty/cnpy/CMakeLists.txt | ||
319 | @@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") | ||
320 | target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) | ||
321 | endif() | ||
322 | |||
323 | -target_link_libraries(${TARGET_NAME} PUBLIC zlib) | ||
324 | +target_link_libraries(${TARGET_NAME} PUBLIC z) | ||
325 | target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
326 | "${CMAKE_CURRENT_SOURCE_DIR}/..") | ||
327 | |||
328 | -set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | ||
329 | \ No newline at end of file | ||
330 | +set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | ||
331 | -- | ||
332 | 2.32.0 | ||
333 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch deleted file mode 100644 index 5e7cfb38..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:45:48 +0800 | ||
4 | Subject: [PATCH] Disable Werror | ||
5 | |||
6 | Don't treat warnings as errors. This just leads to failures every time | ||
7 | we upgrade the compiler. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - | ||
14 | ngraph/CMakeLists.txt | 1 - | ||
15 | 2 files changed, 2 deletions(-) | ||
16 | |||
17 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
18 | index d14da47860..08ed695c0d 100644 | ||
19 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
20 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
21 | @@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") | ||
22 | MultiProcessorCompilation | ||
23 | DeadCodeEliminate | ||
24 | ExtensionsEnabled | ||
25 | - TreatWarnAsErrorEnabled | ||
26 | WarnLevel4 | ||
27 | NoFastMath | ||
28 | StackProtector | ||
29 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | ||
30 | index a05ca3b15c..ae888c4cb2 100644 | ||
31 | --- a/ngraph/CMakeLists.txt | ||
32 | +++ b/ngraph/CMakeLists.txt | ||
33 | @@ -197,7 +197,6 @@ if (WIN32) | ||
34 | endif() | ||
35 | |||
36 | if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") | ||
37 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") | ||
38 | endif() | ||
39 | |||
40 | if(WIN32) | ||
41 | -- | ||
42 | 2.32.0 | ||
43 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch deleted file mode 100644 index 145f2585..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch +++ /dev/null | |||
@@ -1,326 +0,0 @@ | |||
1 | From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 11 Jun 2020 14:24:04 +0800 | ||
4 | Subject: [PATCH] cmake installation fixes | ||
5 | |||
6 | Make sure that libraries/samples/binaries are installed correctly. | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | CMakeLists.txt | 15 -------- | ||
11 | .../IEDevScriptsConfig.cmake | 2 +- | ||
12 | cmake/developer_package/packaging.cmake | 8 +++-- | ||
13 | cmake/developer_package/plugins/plugins.cmake | 2 +- | ||
14 | .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++ | ||
15 | inference-engine/samples/CMakeLists.txt | 4 ++- | ||
16 | .../common/format_reader/CMakeLists.txt | 4 ++- | ||
17 | .../src/inference_engine/CMakeLists.txt | 35 ++----------------- | ||
18 | .../src/preprocessing/CMakeLists.txt | 2 +- | ||
19 | .../src/readers/ir_reader/CMakeLists.txt | 2 +- | ||
20 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- | ||
21 | .../tests/unit/cpu/CMakeLists.txt | 2 ++ | ||
22 | .../unit/inference_engine/CMakeLists.txt | 2 ++ | ||
23 | .../tests/unit/vpu/CMakeLists.txt | 2 ++ | ||
24 | .../tools/compile_tool/CMakeLists.txt | 2 +- | ||
25 | ngraph/CMakeLists.txt | 8 ++--- | ||
26 | 16 files changed, 32 insertions(+), 62 deletions(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index e0706a72e8..7920de9a42 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" | ||
33 | |||
34 | # install setupvars | ||
35 | |||
36 | -ie_cpack_add_component(setupvars REQUIRED) | ||
37 | - | ||
38 | if(UNIX) | ||
39 | - install(PROGRAMS scripts/setupvars/setupvars.sh | ||
40 | - DESTINATION bin | ||
41 | - COMPONENT setupvars) | ||
42 | elseif(WIN32) | ||
43 | install(PROGRAMS scripts/setupvars/setupvars.bat | ||
44 | DESTINATION bin | ||
45 | @@ -195,22 +190,12 @@ endif() | ||
46 | # install install_dependencies | ||
47 | |||
48 | if(UNIX) | ||
49 | - ie_cpack_add_component(install_dependencies REQUIRED) | ||
50 | - install(DIRECTORY scripts/install_dependencies/ | ||
51 | - DESTINATION install_dependencies | ||
52 | - COMPONENT install_dependencies) | ||
53 | endif() | ||
54 | |||
55 | # install files for demo | ||
56 | |||
57 | -ie_cpack_add_component(demo_scripts DEPENDS core) | ||
58 | |||
59 | if(UNIX) | ||
60 | - install(DIRECTORY scripts/demo/ | ||
61 | - DESTINATION deployment_tools/demo | ||
62 | - COMPONENT demo_scripts | ||
63 | - USE_SOURCE_PERMISSIONS | ||
64 | - PATTERN *.bat EXCLUDE) | ||
65 | elseif(WIN32) | ||
66 | install(DIRECTORY scripts/demo/ | ||
67 | DESTINATION deployment_tools/demo | ||
68 | diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake | ||
69 | index 0e1fe76db2..97867a24f8 100644 | ||
70 | --- a/cmake/developer_package/IEDevScriptsConfig.cmake | ||
71 | +++ b/cmake/developer_package/IEDevScriptsConfig.cmake | ||
72 | @@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT) | ||
73 | if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) | ||
74 | message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") | ||
75 | endif() | ||
76 | - set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) | ||
77 | + set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) | ||
78 | endif() | ||
79 | |||
80 | # Enable postfixes for Debug/Release builds | ||
81 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake | ||
82 | index 2b5e945b17..adc4bef0bc 100644 | ||
83 | --- a/cmake/developer_package/packaging.cmake | ||
84 | +++ b/cmake/developer_package/packaging.cmake | ||
85 | @@ -5,7 +5,9 @@ | ||
86 | include(CPackComponent) | ||
87 | unset(IE_CPACK_COMPONENTS_ALL CACHE) | ||
88 | |||
89 | -set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
90 | +if (NOT DEFINED IE_CPACK_IE_DIR) | ||
91 | + set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
92 | +endif() | ||
93 | |||
94 | # | ||
95 | # ie_cpack_set_library_dir() | ||
96 | @@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir) | ||
97 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | ||
98 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | ||
99 | else() | ||
100 | - set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
101 | - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
102 | + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) | ||
103 | + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) | ||
104 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
105 | endif() | ||
106 | endfunction() | ||
107 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake | ||
108 | index aae1dbb7fb..e6dac2a478 100644 | ||
109 | --- a/cmake/developer_package/plugins/plugins.cmake | ||
110 | +++ b/cmake/developer_package/plugins/plugins.cmake | ||
111 | @@ -124,7 +124,7 @@ function(ie_add_plugin) | ||
112 | |||
113 | install(TARGETS ${IE_PLUGIN_NAME} | ||
114 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} | ||
115 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}) | ||
116 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component}) | ||
117 | endif() | ||
118 | endfunction() | ||
119 | |||
120 | diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt | ||
121 | index 45b2b3e9ed..55f7dfd214 100644 | ||
122 | --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt | ||
123 | +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt | ||
124 | @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) | ||
125 | if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) | ||
126 | add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) | ||
127 | endif() | ||
128 | + | ||
129 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
130 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | ||
131 | index ae93857944..fba24c6fed 100644 | ||
132 | --- a/inference-engine/samples/CMakeLists.txt | ||
133 | +++ b/inference-engine/samples/CMakeLists.txt | ||
134 | @@ -33,7 +33,7 @@ endif() | ||
135 | |||
136 | if(IE_MAIN_SOURCE_DIR) | ||
137 | # in case if samples are built from IE repo | ||
138 | - set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) | ||
139 | + set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) | ||
140 | # hint for find_package(InferenceEngine in the samples folder) | ||
141 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | ||
142 | # hint for find_package(ngraph in the samples folder) | ||
143 | @@ -256,6 +256,8 @@ macro(ie_add_sample) | ||
144 | if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) | ||
145 | add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) | ||
146 | endif() | ||
147 | + | ||
148 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | ||
149 | endmacro() | ||
150 | |||
151 | # collect all samples subdirectories | ||
152 | diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
153 | index d75061e56c..a2f8bd6397 100644 | ||
154 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
155 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
156 | @@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} | ||
157 | |||
158 | if(COMMAND add_clang_format_target) | ||
159 | add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) | ||
160 | -endif() | ||
161 | \ No newline at end of file | ||
162 | +endif() | ||
163 | + | ||
164 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
165 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
166 | index 5d044e097c..103c187913 100644 | ||
167 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
168 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
169 | @@ -227,35 +227,6 @@ list(APPEND core_components ngraph) | ||
170 | list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR" | ||
171 | "IE_PARALLEL_CMAKE") | ||
172 | |||
173 | -if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) | ||
174 | - ie_cpack_add_component(tbb REQUIRED) | ||
175 | - list(APPEND core_components tbb) | ||
176 | - | ||
177 | - install(DIRECTORY "${TBB}/include" | ||
178 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
179 | - COMPONENT tbb) | ||
180 | - install(DIRECTORY "${TBB}/lib" | ||
181 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
182 | - COMPONENT tbb) | ||
183 | - if(EXISTS "${TBB}/bin") | ||
184 | - install(DIRECTORY "${TBB}/bin" | ||
185 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
186 | - COMPONENT tbb) | ||
187 | - endif() | ||
188 | - install(FILES "${TBB}/LICENSE" | ||
189 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
190 | - COMPONENT tbb) | ||
191 | - | ||
192 | - set(IE_TBB_DIR_INSTALL "external/tbb/cmake") | ||
193 | - set(IE_TBB_DIR "${TBB_DIR}") | ||
194 | - list(APPEND PATH_VARS "IE_TBB_DIR") | ||
195 | - | ||
196 | - install(FILES "${TBB}/cmake/TBBConfig.cmake" | ||
197 | - "${TBB}/cmake/TBBConfigVersion.cmake" | ||
198 | - DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL} | ||
199 | - COMPONENT tbb) | ||
200 | -endif() | ||
201 | - | ||
202 | # Install Inference Engine | ||
203 | |||
204 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) | ||
205 | @@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets | ||
206 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
207 | |||
208 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
209 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
210 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
211 | COMPONENT core) | ||
212 | |||
213 | # Install cmake scripts | ||
214 | @@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
215 | install(EXPORT InferenceEngineTargets | ||
216 | FILE InferenceEngineTargets.cmake | ||
217 | NAMESPACE IE:: | ||
218 | - DESTINATION ${IE_CPACK_IE_DIR}/share | ||
219 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
220 | COMPONENT core_dev) | ||
221 | |||
222 | set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph") | ||
223 | @@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers | ||
224 | install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" | ||
225 | "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" | ||
226 | "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake" | ||
227 | - DESTINATION ${IE_CPACK_IE_DIR}/share | ||
228 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
229 | COMPONENT core_dev) | ||
230 | diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt | ||
231 | index f9548339d1..2670a04b60 100644 | ||
232 | --- a/inference-engine/src/preprocessing/CMakeLists.txt | ||
233 | +++ b/inference-engine/src/preprocessing/CMakeLists.txt | ||
234 | @@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME}) | ||
235 | |||
236 | install(TARGETS ${TARGET_NAME} | ||
237 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
238 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
239 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
240 | diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
241 | index 6d2bd39f3c..0722702055 100644 | ||
242 | --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
243 | +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
244 | @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
245 | |||
246 | install(TARGETS ${TARGET_NAME} | ||
247 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
248 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
249 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
250 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
251 | index a3e0182ed9..1b0e241485 100644 | ||
252 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
253 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
254 | @@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL | ||
255 | # install | ||
256 | if (LINUX) | ||
257 | install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules | ||
258 | - DESTINATION ${IE_CPACK_IE_DIR}/external | ||
259 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | ||
260 | COMPONENT myriad) | ||
261 | endif() | ||
262 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
263 | index dfa8ce9d3f..88e7fbf67f 100644 | ||
264 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
265 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
266 | @@ -25,3 +25,5 @@ addIeTargetTest( | ||
267 | ie_faster_build(${TARGET_NAME} | ||
268 | UNITY | ||
269 | ) | ||
270 | + | ||
271 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
272 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
273 | index 5c38c77b9b..927f93484f 100644 | ||
274 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
275 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
276 | @@ -26,3 +26,5 @@ addIeTargetTest( | ||
277 | LABELS | ||
278 | IE | ||
279 | ) | ||
280 | + | ||
281 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
282 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
283 | index fcb9f567bb..d4ac1952b8 100644 | ||
284 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
285 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
286 | @@ -33,3 +33,5 @@ addIeTargetTest( | ||
287 | VPU | ||
288 | MYRIAD | ||
289 | ) | ||
290 | + | ||
291 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
292 | diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt | ||
293 | index 6e6f384289..a76ba55e64 100644 | ||
294 | --- a/inference-engine/tools/compile_tool/CMakeLists.txt | ||
295 | +++ b/inference-engine/tools/compile_tool/CMakeLists.txt | ||
296 | @@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
297 | ie_cpack_add_component(core_tools DEPENDS core) | ||
298 | |||
299 | install(TARGETS compile_tool | ||
300 | - RUNTIME DESTINATION deployment_tools/tools/compile_tool | ||
301 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
302 | COMPONENT core_tools) | ||
303 | |||
304 | install(FILES README.md | ||
305 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | ||
306 | index 830fb3eb36..3093596e4a 100644 | ||
307 | --- a/ngraph/CMakeLists.txt | ||
308 | +++ b/ngraph/CMakeLists.txt | ||
309 | @@ -183,10 +183,10 @@ endif() | ||
310 | message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}") | ||
311 | |||
312 | # Destinations | ||
313 | -set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}") | ||
314 | -set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}") | ||
315 | -set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}") | ||
316 | -set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}") | ||
317 | +set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") | ||
318 | +set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") | ||
319 | +set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") | ||
320 | +set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") | ||
321 | |||
322 | #----------------------------------------------------------------------------------------------- | ||
323 | # Compile Flags for nGraph... | ||
324 | -- | ||
325 | 2.32.0 | ||
326 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch deleted file mode 100644 index 6d0c6cbc..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Mon, 30 Aug 2021 17:54:17 +0800 | ||
4 | Subject: [PATCH] demos: use gflags from meta-oe | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
10 | --- | ||
11 | demos/CMakeLists.txt | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt | ||
15 | index 1df8f248d..d368d608c 100644 | ||
16 | --- a/demos/CMakeLists.txt | ||
17 | +++ b/demos/CMakeLists.txt | ||
18 | @@ -131,7 +131,7 @@ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs g | ||
19 | find_package(InferenceEngine REQUIRED) | ||
20 | find_package(ngraph REQUIRED) | ||
21 | |||
22 | -add_subdirectory(thirdparty/gflags) | ||
23 | +#add_subdirectory(thirdparty/gflags) | ||
24 | add_subdirectory(common/cpp) | ||
25 | add_subdirectory(multi_channel_common/cpp) | ||
26 | |||
27 | -- | ||
28 | 2.17.1 | ||
29 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.1.bb deleted file mode 100644 index 794033b0..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.1.bb +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository" | ||
2 | HOMEPAGE = "https://github.com/opencv/open_model_zoo" | ||
3 | DESCRIPTION = "This repository includes optimized deep learning \ | ||
4 | models and a set of demos to expedite development of high-performance \ | ||
5 | deep learning inference applications." | ||
6 | |||
7 | SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ | ||
8 | file://0001-use-oe-gflags.patch \ | ||
9 | " | ||
10 | |||
11 | SRCREV = "f97e6e262895182adc673da331ddb315fba6659d" | ||
12 | |||
13 | LICENSE = "Apache-2.0" | ||
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
15 | " | ||
16 | |||
17 | inherit cmake | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | OECMAKE_SOURCEPATH = "${S}/demos" | ||
21 | |||
22 | DEPENDS += "openvino-inference-engine opencv gflags" | ||
23 | |||
24 | RDEPENDS:${PN} += " \ | ||
25 | python3-decorator \ | ||
26 | python3-defusedxml \ | ||
27 | python3-networkx \ | ||
28 | python3-protobuf \ | ||
29 | python3-test-generator \ | ||
30 | python3-requests \ | ||
31 | python3-pyyaml \ | ||
32 | python3-numpy \ | ||
33 | bash \ | ||
34 | " | ||
35 | |||
36 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
37 | |||
38 | EXTRA_OECMAKE += " \ | ||
39 | -DIE_MAIN_SOURCE_DIR=${B} \ | ||
40 | -DENABLE_SAMPLES=ON \ | ||
41 | -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ | ||
42 | -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \ | ||
43 | -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \ | ||
44 | -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \ | ||
45 | -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \ | ||
46 | -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ | ||
47 | " | ||
48 | |||
49 | do_configure:prepend(){ | ||
50 | mkdir -p ${WORKDIR}/InferenceEngine/share | ||
51 | cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ | ||
52 | } | ||
53 | |||
54 | do_install(){ | ||
55 | install -d ${D}${libdir} | ||
56 | install -d ${D}${bindir} | ||
57 | install -d ${D}${datadir}/openvino/open-model-zoo/tools | ||
58 | install -d ${D}${datadir}/openvino/open-model-zoo/demos | ||
59 | cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir} | ||
60 | cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} | ||
61 | cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo | ||
62 | cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo | ||
63 | cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools | ||
64 | } | ||
65 | |||
66 | FILES:${PN} += "${datadir}/openvino" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.1.bb deleted file mode 100644 index 0d6b16fb..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.1.bb +++ /dev/null | |||
@@ -1,130 +0,0 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" | ||
2 | HOMEPAGE = "https://github.com/opencv/dldt" | ||
3 | DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | ||
4 | deep learning models through a high-level C++ Inference Engine API \ | ||
5 | integrated with application logic." | ||
6 | |||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/4;lfs=0 \ | ||
8 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1736.zip;name=usb_ma2x8x \ | ||
9 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1736.zip;name=pcie_ma2x8x \ | ||
10 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ | ||
11 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak \ | ||
12 | git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/ngraph/python/pybind11;name=pybind11 \ | ||
13 | file://0001-inference-engine-use-system-installed-packages.patch \ | ||
14 | file://0002-Disable-Werror.patch \ | ||
15 | file://0003-inference-engine-installation-fixes.patch \ | ||
16 | file://0001-dont-install-licenses-and-version-file.patch \ | ||
17 | " | ||
18 | |||
19 | SRCREV = "c2bfbf29fbc44f9a3c8403d77da5be7e45cbbb4f" | ||
20 | SRCREV_mkl = "e0381c369fc3bed487b0dcfef7e9fcb2e0aea575" | ||
21 | SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" | ||
22 | SRCREV_pybind11 = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" | ||
23 | |||
24 | SRC_URI[usb_ma2x8x.sha256sum] = "28ed086ac52b964d9a1f5a54c017237d2d03ea39013e7910df678b176b9ce0c3" | ||
25 | SRC_URI[pcie_ma2x8x.sha256sum] = "c2268e700eb597329376cbe830eeb6504203d765a1bde4da917242ca535a7ab3" | ||
26 | |||
27 | LICENSE = "Apache-2.0 & ISSL & MIT" | ||
28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
29 | file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \ | ||
30 | file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ | ||
31 | file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
32 | " | ||
33 | LICENSE:${PN}-vpu-firmware = "ISSL" | ||
34 | |||
35 | inherit cmake python3native | ||
36 | |||
37 | S = "${WORKDIR}/git" | ||
38 | |||
39 | EXTRA_OECMAKE += " \ | ||
40 | -DENABLE_OPENCV=0 \ | ||
41 | -DENABLE_PLUGIN_RPATH=0 \ | ||
42 | -DENABLE_GNA=0 \ | ||
43 | -DPYTHON_EXECUTABLE=${PYTHON} \ | ||
44 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
45 | -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \ | ||
46 | -DENABLE_SAMPLES=1 \ | ||
47 | -DIE_CPACK_IE_DIR=${prefix} \ | ||
48 | -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ | ||
49 | -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ | ||
50 | -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ | ||
51 | -DNGRAPH_JSON_ENABLE=FALSE \ | ||
52 | -DTREAT_WARNING_AS_ERROR=FALSE \ | ||
53 | -DENABLE_SPEECH_DEMO=FALSE \ | ||
54 | -DENABLE_DATA=FALSE \ | ||
55 | -DUSE_SYSTEM_PUGIXML=TRUE \ | ||
56 | " | ||
57 | |||
58 | DEPENDS += "libusb1 \ | ||
59 | ade \ | ||
60 | opencv \ | ||
61 | pugixml \ | ||
62 | protobuf-native \ | ||
63 | tbb \ | ||
64 | zlib \ | ||
65 | " | ||
66 | |||
67 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
68 | COMPATIBLE_HOST:libc-musl = "null" | ||
69 | |||
70 | #Disable opencl temporarily. intel-compute-runtime depends on | ||
71 | #intel-graphics-compiler and vc-intrinsics and these two recipes fail to | ||
72 | #compile with LLVM13. Enable it after upstream has fixed it. | ||
73 | #PACKAGECONFIG ?= "vpu opencl" | ||
74 | PACKAGECONFIG ?= "vpu" | ||
75 | PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, ocl-icd opencl-headers libva, intel-compute-runtime" | ||
76 | PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython" | ||
77 | PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" | ||
78 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | ||
79 | |||
80 | do_install:append() { | ||
81 | if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then | ||
82 | install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ | ||
83 | install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ | ||
84 | fi | ||
85 | |||
86 | if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then | ||
87 | install -d ${D}${datadir}/inference_engine | ||
88 | mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ | ||
89 | |||
90 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | ||
91 | mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
92 | mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ | ||
93 | mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ | ||
94 | |||
95 | rm -rf ${D}${prefix}/python | ||
96 | fi | ||
97 | |||
98 | rm -rf ${D}${prefix}/deployment_tools | ||
99 | |||
100 | # Remove the samples source directory. We install the built samples. | ||
101 | rm -rf ${D}/usr/samples | ||
102 | } | ||
103 | |||
104 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | ||
105 | # instead of RSS | ||
106 | SSTATE_SCAN_FILES:append = " *.cmake" | ||
107 | |||
108 | FILES:${PN}-dev = "${includedir} \ | ||
109 | ${libdir}/cmake \ | ||
110 | " | ||
111 | |||
112 | FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ | ||
113 | ${datadir}/openvino \ | ||
114 | ${libdir}/custom_kernels \ | ||
115 | ${libdir}/plugins.xml \ | ||
116 | ${libdir}/cache.json \ | ||
117 | " | ||
118 | |||
119 | # Move inference engine samples into a separate package | ||
120 | PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" | ||
121 | |||
122 | FILES:${PN}-samples = "${datadir}/inference_engine \ | ||
123 | ${bindir} \ | ||
124 | " | ||
125 | FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" | ||
126 | |||
127 | # Package for inference engine python API | ||
128 | PACKAGES =+ "${PN}-${PYTHON_PN}" | ||
129 | |||
130 | FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" | ||