From e97386254712047f27f5554da6470fe3fb65d07a Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Thu, 27 Jun 2024 12:14:27 +0530 Subject: openvino-inference-engine : Remove openvino related recipes and tests * Remove all openvino related recipes, tests and other data from meta-intel layer as a new layer (meta-oepnvino) specific to openvino has been created. * Update openvino documentation meta-openvino layer URL: https://github.com/intel/meta-openvino Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- ...octo-specific-tweaks-to-the-build-process.patch | 86 ---------------------- .../0002-cmake-Fix-overloaded-virtual-error.patch | 33 --------- ...-protobuf-allow-target-protoc-to-be-built.patch | 45 ----------- 3 files changed, 164 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch deleted file mode 100644 index 7f5b46c6..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch +++ /dev/null @@ -1,86 +0,0 @@ -From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Wed, 29 Nov 2023 12:42:57 +0530 -Subject: [PATCH] cmake: yocto specific tweaks to the build process - -* Dont try to detect glibc version as that doesn't work when cross compiling. -* Dont try to detect CXX11_ABI -* Install sample binaries as well. -* Dont try to write triggers for CPack. We package ourselves. -* Fix the installation path for Python modules when baselib = lib64. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal ---- - cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- - cmake/developer_package/target_flags.cmake | 4 ++-- - samples/cpp/CMakeLists.txt | 6 +++--- - src/bindings/python/CMakeLists.txt | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake -index 99f11730983..1a1f61fcd3d 100644 ---- a/cmake/developer_package/packaging/rpm/rpm.cmake -+++ b/cmake/developer_package/packaging/rpm/rpm.cmake -@@ -156,7 +156,7 @@ ov_rpm_specific_settings() - # needed to add triggers for packages with libraries - set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") - set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") --file(WRITE "${def_triggers}" "${triggers_content}") -+#file(WRITE "${def_triggers}" "${triggers_content}") - - # - # Functions helpful for packaging your modules with RPM cpack -diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake -index d047a1aebd9..4e8ca68c60f 100644 ---- a/cmake/developer_package/target_flags.cmake -+++ b/cmake/developer_package/target_flags.cmake -@@ -149,7 +149,7 @@ function(ov_glibc_version) - endif() - endfunction() - --ov_glibc_version() -+#ov_glibc_version() - - # - # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler -@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi) - endif() - endmacro() - --ov_get_glibcxx_use_cxx11_abi() -+#ov_get_glibcxx_use_cxx11_abi() -diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt -index 4d33bff944e..3e7f1458578 100644 ---- a/samples/cpp/CMakeLists.txt -+++ b/samples/cpp/CMakeLists.txt -@@ -206,9 +206,9 @@ macro(ov_add_sample) - target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES}) - - install(TARGETS ${SAMPLE_NAME} -- RUNTIME DESTINATION samples_bin/ -- COMPONENT samples_bin -- EXCLUDE_FROM_ALL) -+ DESTINATION ${CMAKE_INSTALL_BINDIR} -+ COMPONENT samples_bin) -+ - - # create global target with all samples / demo apps - if(NOT TARGET ov_samples) -diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt -index 6cf43ec3fed..d539b9d003f 100644 ---- a/src/bindings/python/CMakeLists.txt -+++ b/src/bindings/python/CMakeLists.txt -@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING) - # install OpenVINO Python API - - set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") -- set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") -+ set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") - set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") - set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO") - --- -2.34.1 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch deleted file mode 100644 index 8a1464d5..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Wed, 29 Nov 2023 12:49:35 +0530 -Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error - -* Remove -Werror for: -|git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] -| 129 | virtual JitDefinitions GetDefinitions() const = 0; -| | - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal ---- - src/plugins/intel_gpu/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt -index 2f3d9127dde..2fd4f5c1b3c 100644 ---- a/src/plugins/intel_gpu/CMakeLists.txt -+++ b/src/plugins/intel_gpu/CMakeLists.txt -@@ -47,7 +47,7 @@ add_subdirectory(thirdparty) - include(thirdparty/cmake/rapidjson.cmake) - - if(CMAKE_COMPILER_IS_GNUCXX) -- ov_add_compiler_flags(-Werror) -+ #ov_add_compiler_flags(-Werror) - endif() - - add_subdirectory(src/runtime) --- -2.34.1 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch deleted file mode 100644 index bbdeaa2a..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Wed, 29 Nov 2023 12:55:19 +0530 -Subject: [PATCH 3/3] protobuf: allow target protoc to be built - -We can run target binaries using a qemu wrapper so allow these to be -built and run. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal ---- - cmake/developer_package/frontends/frontends.cmake | 2 +- - thirdparty/protobuf/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake -index f3b5520d6d2..7579f638c5a 100644 ---- a/cmake/developer_package/frontends/frontends.cmake -+++ b/cmake/developer_package/frontends/frontends.cmake -@@ -163,7 +163,7 @@ macro(ov_add_frontend) - set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) - add_custom_command( - OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" -- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} -+ COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} - DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} - COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" - VERBATIM -diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt -index 15f32601f23..36853caf7dc 100644 ---- a/thirdparty/protobuf/CMakeLists.txt -+++ b/thirdparty/protobuf/CMakeLists.txt -@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE) - if(CMAKE_CROSSCOMPILING OR - (APPLE AND (HOST_X86_64 AND AARCH64)) OR - (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) -- set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE) -+ set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) - else() - set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) - endif() --- -2.34.1 - -- cgit v1.2.3-54-g00ecf