diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer')
39 files changed, 1170 insertions, 1172 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2141.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb index c403ab66..bdf32576 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2141.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb @@ -10,11 +10,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' COMPATIBLE_HOST:libc-musl = "null" -inherit cmake systemd features_check +inherit cmake systemd features_check python3native -DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native" - -EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" +DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native" # Enable either connman or networkmanager or none but not both. PACKAGECONFIG ??= "connman" @@ -31,9 +29,10 @@ SYSTEMD_SERVICE:${PN} = "lms.service" SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ " -SRCREV = "8cb5489623025d80b56acd79d9c8ddadf9b29e97" +SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47" do_install:append() { + install -d ${D}${sysconfdir}/lms install -d ${D}${systemd_system_unitdir} install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/udev/rules.d @@ -42,5 +41,4 @@ do_install:append() { RDEPENDS:${PN} += "ace" -# This CVE is for Lan Management System software and not this lms. -CVE_CHECK_WHITELIST += "CVE-2018-1000535" +CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System." diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch new file mode 100644 index 00000000..ea86bc31 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch @@ -0,0 +1,35 @@ +From 1f6f4e29769adb9d49a3c4831dd2ba61f6ccbdce Mon Sep 17 00:00:00 2001 +From: Yogesh Tyagi <yogesh.tyagi@intel.com> +Date: Mon, 11 Mar 2024 13:13:32 +0800 +Subject: [PATCH] Makefile: Fix build Issue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In case build directory is different from source, make sure make is able to find the correct input files. + +Fixes: +| dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml +| glib-compile-resources --generate-source thermald-resource.gresource.xml +| Failed to open file “thermald-resource.gresource.xml”: No such file or directory + +Upstream-Status: Submitted +https://github.com/intel/thermal_daemon/pull/436 + +Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index dd2ef10..cb19e17 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -97,6 +97,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml + $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $< + + thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml +- $(AM_V_GEN) glib-compile-resources --generate-source thermald-resource.gresource.xml ++ $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $< + + CLEANFILES = $(BUILT_SOURCES) diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.6.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb index 813591fb..66765e56 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.6.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb @@ -7,13 +7,16 @@ compensation using available cooling methods." HOMEPAGE = "https://github.com/01org/thermal_daemon" DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev" -LICENSE = "GPLv2" +DEPENDS += "autoconf-archive-native" + +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ + file://0001-Makefile-Fix-build-Issue.patch \ " -SRCREV = "dddba484b23562d421cdaf1703dabc602e1968e7" +SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e" S = "${WORKDIR}/git" inherit pkgconfig autotools systemd gtk-doc @@ -28,7 +31,7 @@ EXTRA_OECONF = " \ --with-systemdsystemunitdir=${systemd_system_unitdir} \ " -FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" +FILES:${PN} += "${datadir}/dbus-1" SYSTEMD_SERVICE:${PN} = "thermald.service" diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch new file mode 100644 index 00000000..4d583657 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch @@ -0,0 +1,53 @@ +From deccc0c69c2c8759c52885be8bdda54d3cee481c Mon Sep 17 00:00:00 2001 +From: Yogesh Tyagi <yogesh.tyagi@intel.com> +Date: Sun, 11 Dec 2022 22:34:15 +0800 +Subject: [PATCH] Add print function to print test run status in ptest format + +Upstream-Status: Inappropriate [OE ptest specific] + +Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> +--- + run_tests.py | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/run_tests.py b/run_tests.py +index 1cd796dd..e3ffd1ab 100755 +--- a/run_tests.py ++++ b/run_tests.py +@@ -327,6 +327,9 @@ def run_test(testname, host, target): + else: + ispc_exe_rel = add_prefix(host.ispc_cmd, host, target) + ++ # to reslove the error '.rodata' can not be used when making a PIE object ++ ispc_exe_rel = ispc_exe_rel + " --pic" ++ + # is this a test to make sure an error is issued? + want_error = (filename.find("tests_errors") != -1) + if want_error == True: +@@ -795,6 +798,17 @@ def check_compiler_exists(compiler_exe): + return + error("missing the required compiler: %s \n" % compiler_exe, 1) + ++def print_test_run_status(results): ++ for fstatus in results: ++ if (fstatus[1] == Status.Success): ++ print( "%s: %s" % ("PASS", fstatus[0])) ++ elif (fstatus[1] == Status.Compfail): ++ print( "%s: %s" % ("FAIL", fstatus[0])) ++ elif (fstatus[1] == Status.Runfail): ++ print( "%s: %s" % ("FAIL", fstatus[0])) ++ elif (fstatus[1] == Status.Skip): ++ print( "%s: %s" % ("SKIP", fstatus[0])) ++ + def print_result(status, results, s, run_tests_log, csv): + title = StatusStr[status] + file_list = [fname for fname, fstatus in results if status == fstatus] +@@ -938,6 +952,8 @@ def run_tests(options1, args, print_version): + pass_rate = -1 + print_debug("PASSRATE (%d/%d) = %d%% \n\n" % (len(run_succeed_files), total_tests_executed, pass_rate), s, run_tests_log) + ++ print_test_run_status(results) ++ + for status in Status: + print_result(status, results, s, run_tests_log, options.csv) + fails = [status != Status.Compfail and status != Status.Runfail for _, status in results] diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch new file mode 100644 index 00000000..b0a76ff9 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch @@ -0,0 +1,36 @@ +From 7beff95c11071170eb27b6fa7d0cc77588caee8e Mon Sep 17 00:00:00 2001 +From: Yogesh Tyagi <yogesh.tyagi@intel.com> +Date: Tue, 26 Jul 2022 15:25:10 +0800 +Subject: [PATCH] Fix QA Issues + +Stop ispc from inserting host file path in generated headers which leads to reproducibility problems. + +Upstream-Status: Inappropriate [OE build specific] + +Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> +--- + src/module.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/module.cpp b/src/module.cpp +index e2084d2e..e2626865 100644 +--- a/src/module.cpp ++++ b/src/module.cpp +@@ -2555,7 +2555,7 @@ bool Module::writeHeader(const char *fn) { + perror("fopen"); + return false; + } +- fprintf(f, "//\n// %s\n// (Header automatically generated by the ispc compiler.)\n", fn); ++ fprintf(f, "//\n// \n// (Header automatically generated by the ispc compiler.)\n"); + fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n"); + + // Create a nice guard string from the filename, turning any +@@ -2677,7 +2677,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) { + FILE *f = DHI->file; + + if (DHI->EmitFrontMatter) { +- fprintf(f, "//\n// %s\n// (Header automatically generated by the ispc compiler.)\n", DHI->fn); ++ fprintf(f, "//\n// \n// (Header automatically generated by the ispc compiler.)\n"); + fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n"); + } + // Create a nice guard string from the filename, turning any diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch new file mode 100644 index 00000000..f452dc50 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch @@ -0,0 +1,52 @@ +From 16a2c22339287122d2c25d8bb33a5a51b4e6ee51 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Thu, 24 Feb 2022 20:01:11 +0530 +Subject: [PATCH] cmake: don't build for 32-bit targets + +Error log: +| tmp/work/corei7-64-poky-linux/ispc/1.16.0-r0/recipe-sysroot/usr/include/bits/long-double.h:23:10: fatal error: 'bits/long-double-32.h' file not found +| #include <bits/long-double-32.h> +| ^~~~~~~~~~~~~~~~~~~~~~~ +| 1 error generated. + +Remove SYSTEM include search path and set -isysroot dir path +for root dir for cross compilation. + +Upstream-Status: Inappropriate + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + cmake/GenerateBuiltins.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake +index f84494ed..d90cb1ec 100644 +--- a/cmake/GenerateBuiltins.cmake ++++ b/cmake/GenerateBuiltins.cmake +@@ -253,7 +253,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi + # In this case headers will be installed in /usr/arm-linux-gnueabihf/include and will not be picked up + # by clang by default. So the following line adds such path explicitly. If this path doesn't exist and + # the headers can be found in other locations, this should not be a problem. +- set(includePath -isystem/usr/${debian_triple}/include) ++ set(includePath -isysroot${SYSROOT_DIR}) + endif() + endif() + +@@ -339,7 +339,7 @@ function (generate_target_builtins resultList) + set(regular_targets ${ARGN}) + list(FILTER regular_targets EXCLUDE REGEX wasm) + foreach (ispc_target ${regular_targets}) +- foreach (bit 32 64) ++ foreach (bit 64) + foreach (os_name ${TARGET_OS_LIST_FOR_LL}) + target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit}) + list(APPEND tmpList ${output${os_name}${bit}}) +@@ -405,7 +405,7 @@ function (generate_common_builtins resultList) + endif() + + message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}") +- foreach (bit 32 64) ++ foreach (bit 64) + foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web") + foreach (arch "x86" "arm" "wasm") + builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch}) diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest new file mode 100644 index 00000000..77d13bb4 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +python3 run_tests.py diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb new file mode 100644 index 00000000..ed8df859 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb @@ -0,0 +1,64 @@ +SUMMARY = "Intel(R) Implicit SPMD Program Compiler" +DESCRIPTION = "ispc is a compiler for a variant of the C programming language, \ +with extensions for single program, multiple data programming." +HOMEPAGE = "https://github.com/ispc/ispc" + +LICENSE = "BSD-3-Clause & Apache-2.0-with-LLVM-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \ + file://third-party-programs.txt;md5=2061218c7be521556719c8b504bf9ddd" + +inherit cmake python3native ptest + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \ + file://0002-cmake-don-t-build-for-32-bit-targets.patch \ + file://0001-Fix-QA-Issues.patch \ + file://0001-Add-print-function-to-print-test-run-status-in-ptest.patch \ + file://run-ptest \ + " + +SRCREV = "bcb2cf896c00f9a802a11cbf291ef6e44b205416" + +COMPATIBLE_HOST = '(x86_64).*-linux' + +DEPENDS += " clang-native bison-native flex-native" +DEPENDS:append:class-target = " clang" +RDEPENDS:${PN}-ptest += " python3-multiprocessing" + +PACKAGECONFIG ??= "tbb" +PACKAGECONFIG[tbb] = "-DISPCRT_BUILD_TASK_MODEL=TBB, -DISPCRT_BUILD_TASK_MODEL=OpenMP, tbb" + +YFLAGS='-d -t -v -y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' + +do_configure:prepend() { + sed -i -e 's#\${BISON_EXECUTABLE}.*#\${BISON_EXECUTABLE} ${YFLAGS} #g' ${S}/CMakeLists.txt + sed -i -e 's#\${FLEX_EXECUTABLE}.*#\${FLEX_EXECUTABLE} \-L #g' ${S}/CMakeLists.txt +} + +do_install_ptest() { + cp -rf ${S}/run_tests.py ${D}${PTEST_PATH} + cp -rf ${S}/common.py ${D}${PTEST_PATH} + cp -rf ${S}/tests ${D}${PTEST_PATH} + cp -rf ${S}/test_static.isph ${D}${PTEST_PATH} + cp -rf ${S}/fail_db.txt ${D}${PTEST_PATH} + cp -rf ${S}/test_static.cpp ${D}${PTEST_PATH} +} + +EXTRA_OECMAKE += " \ + -DISPC_INCLUDE_TESTS=OFF \ + -DISPC_INCLUDE_EXAMPLES=OFF \ + -DARM_ENABLED=OFF \ + -DISPC_CROSS=ON \ + -DISPC_ANDROID_TARGET=OFF \ + -DISPC_FREEBSD_TARGET=OFF \ + -DISPC_WINDOWS_TARGET=OFF \ + -DISPC_IOS_TARGET=OFF \ + -DISPC_PS_TARGET=OFF \ + -DSYSROOT_DIR=${STAGING_DIR} \ + -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \ + -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \ + -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.6.2.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb index 5580f838..8bade9f4 100644 --- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.6.2.bb +++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb @@ -1,31 +1,10 @@ -# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. -# The following is the difference between the old and the new license text. -# Please update the LICENSE value if needed, and summarize the changes in -# the commit message via 'License-Update:' tag. -# (example: 'License-Update: copyright years updated.') -# -# The changes: -# -# --- LICENSE -# +++ LICENSE -# @@ -1,6 +1,6 @@ -# MIT License -# -# -Copyright (c) 2019 Intel Corporation -# +Copyright (C) 2019-2021 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# -# - SUMMARY = "oneAPI Level Zero Specification Headers and Loader" HOMEPAGE = "https://github.com/oneapi-src/level-zero" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc" SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master" -SRCREV = "7afa8a6dda56d4baef950c0a9d5ef8d8b0e14c4e" +SRCREV = "1685d01497428ca4d8b99200972b64685424d5c9" S = "${WORKDIR}/git" inherit cmake @@ -51,3 +30,4 @@ FILES:${PN}-loader = "${libdir}" INSANE_SKIP:${PN}-loader = "dev-so" INSANE_SKIP:${PN}-samples = "dev-so" ALLOW_EMPTY:${PN} = "1" +BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch new file mode 100644 index 00000000..2748d7ab --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch @@ -0,0 +1,99 @@ +From b57297c14d94dac9bdef7570b7b33d70b10171f3 Mon Sep 17 00:00:00 2001 +From: Jozef Wludzik <jozef.wludzik@intel.com> +Date: Tue, 26 Mar 2024 14:43:29 +0100 +Subject: [PATCH 1/2] Fix the compilation warning when using gcc-13 (#25) + +Added missing headers. Fixed compilation error about casting from +unsigned to signed int. + +Upstream-Status: Backport [https://github.com/intel/linux-npu-driver/commit/4bcbf2abe94eb4d9c083bd616b58e309a82d008a] + +Signed-off-by: Jozef Wludzik <jozef.wludzik@intel.com> +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp | 7 ++++--- + umd/vpu_driver/include/umd_common.hpp | 1 + + validation/umd-test/umd_prime_buffers.h | 9 +++++++-- + validation/umd-test/utilities/data_handle.h | 1 + + 4 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp +index f206ebe..682e5b4 100644 +--- a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp ++++ b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp +@@ -5,12 +5,13 @@ + * + */ + +-#include <dlfcn.h> +-#include <memory> +- + #include "vpux_driver_compiler.h" + #include "vpu_driver/source/utilities/log.hpp" + ++#include <array> ++#include <dlfcn.h> ++#include <memory> ++ + class Vcl { + public: + static Vcl &sym() { +diff --git a/umd/vpu_driver/include/umd_common.hpp b/umd/vpu_driver/include/umd_common.hpp +index 0c874a3..5ad9be2 100644 +--- a/umd/vpu_driver/include/umd_common.hpp ++++ b/umd/vpu_driver/include/umd_common.hpp +@@ -7,6 +7,7 @@ + + #pragma once + ++#include <cstdint> + #include <limits> + #include <linux/kernel.h> + #include <stdexcept> +diff --git a/validation/umd-test/umd_prime_buffers.h b/validation/umd-test/umd_prime_buffers.h +index 6f7c7de..ab4814c 100644 +--- a/validation/umd-test/umd_prime_buffers.h ++++ b/validation/umd-test/umd_prime_buffers.h +@@ -6,12 +6,17 @@ + */ + + #pragma once ++ ++#include "umd_test.h" ++ + #include <fcntl.h> +-#include <linux/kernel.h> + #include <linux/dma-buf.h> + #include <linux/dma-heap.h> ++#include <linux/kernel.h> ++#include <stdint.h> + #include <sys/ioctl.h> + #include <sys/mman.h> ++#include <unistd.h> + + #define ALLIGN_TO_PAGE(x) __ALIGN_KERNEL((x), (UmdTest::PAGE_SIZE)) + +@@ -60,7 +65,7 @@ class PrimeBufferHelper { + return false; + + bufferFd = heapAlloc.fd; +- buffers.insert({heapAlloc.fd, {size, nullptr}}); ++ buffers.insert({static_cast<int>(heapAlloc.fd), {size, nullptr}}); + return true; + } + +diff --git a/validation/umd-test/utilities/data_handle.h b/validation/umd-test/utilities/data_handle.h +index d6e0ec0..5d937b2 100644 +--- a/validation/umd-test/utilities/data_handle.h ++++ b/validation/umd-test/utilities/data_handle.h +@@ -6,6 +6,7 @@ + */ + + #include <linux/kernel.h> ++#include <stdint.h> + #include <string> + #include <vector> + +-- +2.43.0 + diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch new file mode 100644 index 00000000..9fb97354 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch @@ -0,0 +1,110 @@ +From a9f51fd88effb7d324609e692ca7da576d6dad2e Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Tue, 28 May 2024 10:23:42 +0800 +Subject: [PATCH 2/2] Fix compilation failure with GCC-14 + +umd/level_zero_driver/core/source/event/event.cpp:65:31: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'? +| 65 | associatedJobs.erase(std::remove_if(associatedJobs.begin(), +| | ^~~~~~~~~ +| | remove_cv + +| umd/vpu_driver/source/command/vpu_command.cpp: In member function 'void VPU::VPUCommand::appendAssociateBufferObject(VPU::VPUBufferObject*)': +| umd/vpu_driver/source/command/vpu_command.cpp:126:20: error: 'find' is not a member of 'std'; did you mean 'bind'? +| 126 | auto it = std::find(bufferObjects.begin(), bufferObjects.end(), bo); +| | ^~~~ +| | bind + +| umd/vpu_driver/source/command/vpu_command_buffer.cpp: In member function 'bool VPU::VPUCommandBuffer::addCommand(VPU::VPUCommand*, uint64_t&, uint64_t&)': +| umd/vpu_driver/source/command/vpu_command_buffer.cpp:185:24: error: 'find' is not a member of 'std'; did you mean 'bind'? +| 185 | auto it = std::find(bufferHandles.begin(), bufferHandles.end(), bo->getHandle()); +| | ^~~~ +| | bind + +| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:301:32: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'? +| 301 | std::max_element(stride_begin + TENSOR_5D_STRIDE_C, stride_end)); +| | ^~~~~~~~~~~ +| | tuple_element +| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:315:37: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'? +| 315 | auto max_stride_val = *std::max_element(stride_begin + TENSOR_4D_STRIDE_C, stride_end); +| | ^~~~~~~~~~~ + +| umd/level_zero_driver/tools/source/metrics/metric.cpp: In member function 'void L0::MetricContext::deactivateMetricGroups(int)': +| umd/level_zero_driver/tools/source/metrics/metric.cpp:275:38: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'? +| 275 | activatedMetricGroups.erase(std::remove_if(activatedMetricGroups.begin(), +| | ^~~~~~~~~ +| | remove_cv + +Upstream-Status: Submitted [https://github.com/intel/linux-npu-driver/pull/30] + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + umd/level_zero_driver/core/source/event/event.cpp | 1 + + umd/level_zero_driver/ext/source/graph/elf_parser.cpp | 1 + + umd/level_zero_driver/tools/source/metrics/metric.cpp | 1 + + umd/vpu_driver/source/command/vpu_command.cpp | 1 + + umd/vpu_driver/source/command/vpu_command_buffer.cpp | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/umd/level_zero_driver/core/source/event/event.cpp b/umd/level_zero_driver/core/source/event/event.cpp +index a92248f..196d176 100644 +--- a/umd/level_zero_driver/core/source/event/event.cpp ++++ b/umd/level_zero_driver/core/source/event/event.cpp +@@ -14,6 +14,7 @@ + + #include <level_zero/ze_api.h> + #include <thread> ++#include <algorithm> + + namespace L0 { + +diff --git a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp +index a1c8e14..dfbd61d 100644 +--- a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp ++++ b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp +@@ -21,6 +21,7 @@ + #include <vpux_headers/metadata.hpp> + #include <vpux_elf/types/vpu_extensions.hpp> + #include <vpux_elf/utils/error.hpp> ++#include <algorithm> + + namespace L0 { + +diff --git a/umd/level_zero_driver/tools/source/metrics/metric.cpp b/umd/level_zero_driver/tools/source/metrics/metric.cpp +index b67750f..9497311 100644 +--- a/umd/level_zero_driver/tools/source/metrics/metric.cpp ++++ b/umd/level_zero_driver/tools/source/metrics/metric.cpp +@@ -7,6 +7,7 @@ + + #include "level_zero_driver/tools/source/metrics/metric.hpp" + #include "vpu_driver/source/utilities/log.hpp" ++#include <algorithm> + + namespace L0 { + +diff --git a/umd/vpu_driver/source/command/vpu_command.cpp b/umd/vpu_driver/source/command/vpu_command.cpp +index f4ca23f..75331d9 100644 +--- a/umd/vpu_driver/source/command/vpu_command.cpp ++++ b/umd/vpu_driver/source/command/vpu_command.cpp +@@ -14,6 +14,7 @@ + #include <cstdint> + #include <vector> + #include <map> ++#include <algorithm> + + namespace VPU { + +diff --git a/umd/vpu_driver/source/command/vpu_command_buffer.cpp b/umd/vpu_driver/source/command/vpu_command_buffer.cpp +index c4ad052..bbb80ec 100644 +--- a/umd/vpu_driver/source/command/vpu_command_buffer.cpp ++++ b/umd/vpu_driver/source/command/vpu_command_buffer.cpp +@@ -11,6 +11,7 @@ + #include "vpu_driver/source/command/vpu_command_buffer.hpp" + #include "vpu_driver/source/command/vpu_copy_command.hpp" + #include "vpu_driver/source/utilities/log.hpp" ++#include <algorithm> + + namespace VPU { + +-- +2.43.0 + diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb new file mode 100644 index 00000000..03e409af --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "User Mode Driver for Intel® NPU device" +HOMEPAGE = "https://github.com/intel/linux-npu-driver" +LICENSE = "MIT & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=37acda99f3f9c108e62d970fe0e08027 \ + file://third-party-programs.txt;md5=dbf0d7a91947cccc5410e9760d9acae5 \ + file://third_party/vpux_elf/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI = "git://github.com/intel/linux-npu-driver.git;protocol=https;name=linux-npu-driver;branch=main;lfs=1 \ + git://github.com/openvinotoolkit/npu_plugin_elf.git;protocol=https;destsuffix=git/third_party/vpux_elf;name=vpux-elf;nobranch=1 \ + git://github.com/jbeder/yaml-cpp.git;protocol=https;destsuffix=git/third_party/yaml-cpp;name=yaml-cpp;nobranch=1 \ + git://github.com/intel/level-zero-npu-extensions.git;protocol=https;destsuffix=git/third_party/level-zero-vpu-extensions;name=lzvext;nobranch=1 \ + git://github.com/google/googletest.git;protocol=https;destsuffix=git/third_party/googletest;name=googletest;nobranch=1 \ + file://0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch \ + file://0002-Fix-compilation-failure-with-GCC-14.patch \ + " + +SRCREV_linux-npu-driver = "9d1dd3daa01ebd97a4ac2e8279ddd6e2cb109244" +SRCREV_vpux-elf = "03878c115d13aa1ce6af5329c5759fc1cc94a3fb" +SRCREV_yaml-cpp = "0579ae3d976091d7d664aa9d2527e0d0cff25763" +SRCREV_lzvext = "0e1c471356a724ef6d176ba027a68e210d90939e" +SRCREV_googletest = "b796f7d44681514f58a683a3a71ff17c94edb0c1" +SRCREV_FORMAT = "linux-npu-driver_vpux-elf_yaml-cpp_lzvext_googletest" + +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS = "level-zero" + +PACKAGES =+ "${PN}-firmware ${PN}-tests" + +FILES:${PN}-firmware = "${libdir}/firmware/updates/intel/vpu/*" +FILES:${PN}-tests = "${bindir}" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2021.4.0-3561.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2021.4.0-3561.bb deleted file mode 100644 index a1080dbd..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2021.4.0-3561.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Intel® oneAPI DPC++/C++ Compiler & Intel® C++ Compiler Classic runtime common files" -DESCRIPTION = "Intel® C++ Compiler Classic generates applications\ - that can run on Intel® 64 architecture and the IA-32 architecture.\ - Intel® oneAPI Data Parallel C++ (DPC++) is an open alternative \ - to single-architecture proprietary languages. It allows developers to reuse \ - code across hardware targets (CPUs and accelerators such as GPUs and FPGAs) \ - and also perform custom tuning for a specific accelerator." -HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/introducing-the-intel-c-compiler-classic.html" - -LICENSE="EULA" - -LIC_FILES_CHKSUM = " \ - file://opt/intel/oneapi/lib/licensing/compiler/Intel%20Developer%20Tools%20EULA;md5=504ce70b21e83ed3eadf647715fe8693 \ - file://opt/intel/oneapi/lib/licensing/compiler/openmp/third-party-programs.txt;md5=da72b17a4a1efef54faf14df4a703282 \ - file://opt/intel/oneapi/lib/licensing/compiler/c/third-party-programs.txt;md5=e68c504274cfdae7628970517223a823 \ - " - -SRC_URI = " \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-${PV}_amd64.deb;subdir=${BPN};name=runtime-compilers \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-common-${PV}_all.deb;subdir=${BPN};name=common-compilers \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-${PV}_amd64.deb;subdir=${BPN};name=runtime-dpcpp-cpp \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-common-${PV}_all.deb;subdir=${BPN};name=common-dpcpp-cpp \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-${PV}_amd64.deb;subdir=${BPN};name=runtime-openmp \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-common-${PV}_all.deb;subdir=${BPN};name=common-openmp \ - " - -SRC_URI[runtime-compilers.sha256sum] = "37ee9277b8b7b5486ec2a44cb66575b94dcc2b927f1825f88cdf2c1de54de656" -SRC_URI[common-compilers.sha256sum] = "9d446a793e2a3b5749c949b8985c6cc05125df107458cd9640e39e32650f9365" -SRC_URI[runtime-dpcpp-cpp.sha256sum] = "894c9d0efe069a2a2757338ce6b005f560e34319d3f6321f794733937f85718b" -SRC_URI[common-dpcpp-cpp.sha256sum] = "ff8303b4b4da9f03302cef00fb275c875a3876f34c242813707d461ad4c9628d" -SRC_URI[runtime-openmp.sha256sum] = "65dca00697b93a31df401de73ad38e2e65d8bcc662b2d2a8ad561551fbde0620" -SRC_URI[common-openmp.sha256sum] = "53a59a72051760bcf04186beaa17656082eacec2ecaee86bfde7f6e7560457bf" - -S = "${WORKDIR}/${BPN}" - -inherit bin_package update-alternatives - -ALTERNATIVE:${PN} = "Intel_FPGA_SSG_Emulator.icd" -ALTERNATIVE_LINK_NAME[Intel_FPGA_SSG_Emulator.icd] = "/etc/OpenCL/vendors/intel64-fpgaemu.icd" -ALTERNATIVE_TARGET[Intel_FPGA_SSG_Emulator.icd] = "/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd" -ALTERNATIVE_PRIORITY[Intel_FPGA_SSG_Emulator.icd] = "328736233" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -RDEPENDS:${PN} += "perl elfutils opencl-icd-loader level-zero-loader zlib tbb libelf setup-intel-oneapi-env" -INSANE_SKIP:${PN} += "textrel dev-so" - -# The libomptarget.rtl.x86_64.so library is not supported on Yocto 3.1+ due to using obsolete libffi.so.6 -do_install:append () { - rm -f ${D}/opt/intel/oneapi/lib/libomptarget.rtl.x86_64.so - echo "/opt/intel/oneapi/lib/emu/libintelocl_emu.so" > ${D}/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd -} diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb new file mode 100644 index 00000000..cedbae1e --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb @@ -0,0 +1,54 @@ +SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files" +DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \ +that help your applications run faster on Intel® 64 architectures with support \ +for the latest C, C++, and SYCL language standards. This compiler produces \ +optimized code that can run significantly faster by taking advantage of the \ +ever-increasing core count and vector register width in Intel® Xeon® processors \ +and compatible processors." + +HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html" + +LICENSE="EULA" + +COMPILERMAINVER = "2024.0" + +LIC_FILES_CHKSUM = " \ + file://opt/intel/oneapi/licensing/${COMPILERMAINVER}/licensing/${COMPILERMAINVER}/license.htm;md5=5ff64c6ff3ef98089ed69360e7a84c39 \ + " +COMPILERDOTVER = "2024.0.0-49406" +DEVUTILITVERSION = "2024.0-2024.0.0-49320" +SRC_URI = " \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=common-vars \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=openmp \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=openmp-common \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-${COMPILERMAINVER}-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=license \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dev-utilities-${DEVUTILITVERSION}_amd64.deb;subdir=${BPN};name=dev-utils \ + " + +SRC_URI[dpcpp-runtime.sha256sum] = "e24f0ba69daf3f66ceaf23d5e632f183cdb90bac69f65407fdb4407fc9034f33" +SRC_URI[dpcpp-common.sha256sum] = "f5a3db6a725598224edf1099260955aee3e36beadcaed2af5b8b453e873a82fa" +SRC_URI[compiler-shared-runtime.sha256sum] = "bce010cbe076259ddd3feb8e69792869e22fccd5b4e2c9af9e815826f2c1a394" +SRC_URI[common-vars.sha256sum] = "368553c99db1b52060b8225355336778be0b00e5991d0f769c42f891c6328750" +SRC_URI[openmp.sha256sum] = "154ff1e81adfdc872ba1d47bd860de70d62188417c7128422435dfd0ceca62fe" +SRC_URI[openmp-common.sha256sum] = "8217001d78311cbef97dd139e684c6767932b532309c3843ba57d7894d15c07d" +SRC_URI[license.sha256sum] = "9f9c8a12fc0bc82ab5b71e118e66745eff23f42224eba304068225b366cd74b6" +SRC_URI[dev-utils.sha256sum] = "c675d960a5abca361cead9217d6e74adee499ee0a095c4e44092bd710b304d50" + +S = "${WORKDIR}/${BPN}" + +inherit bin_package + +RDEPENDS:${PN} += "virtual-opencl-icd zlib tbb level-zero-loader bash tcsh" +SKIP_FILEDEPS:${PN} = '1' + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +# doesn't have GNU_HASH (didn't pass LDFLAGS?) +INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths file-rdeps" + +FILES_SOLIBSDEV = "" +BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb new file mode 100644 index 00000000..90ada087 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb @@ -0,0 +1,45 @@ +SUMMARY = "Intel® oneAPI DPC++/C++ Compiler" +DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \ +that help your applications run faster on Intel® 64 architectures with support \ +for the latest C, C++, and SYCL language standards. This compiler produces \ +optimized code that can run significantly faster by taking advantage of the \ +ever-increasing core count and vector register width in Intel® Xeon® processors \ +and compatible processors." + +HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html" + +LICENSE="EULA" + +COMPILERMAINVER = "2024.0" + +LIC_FILES_CHKSUM = " \ + file://opt/intel/oneapi/compiler/${COMPILERMAINVER}/share/doc/compiler/credist.txt;md5=b41f55af9f479b9570fc35b955d5ba1a \ + " + +SRC_URI = " \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=shared-common \ + " + +SRC_URI[icx-compiler.sha256sum] = "0dcbac766d5a1519d4cf393f5a85e71d19024fef65f77638f3f849796b62cd82" +SRC_URI[compiler-linker.sha256sum] = "e00faea6d797934d62143e4aa70b727ce30f80fdf30769d22122b3051140c236" +SRC_URI[shared-common.sha256sum] = "cf490a4a790f349da79e618359598d3b32312ca3b2639e5d4c84e1cfa2745558" + +S = "${WORKDIR}/${BPN}" + +inherit bin_package + +RDEPENDS:${PN} += "intel-oneapi-dpcpp-cpp-runtime" +SKIP_FILEDEPS:${PN} = '1' + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +# doesn't have GNU_HASH (didn't pass LDFLAGS?) +INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped file-rdeps staticdev rpaths arch useless-rpaths" + +FILES_SOLIBSDEV = "" + +EXCLUDE_FROM_SHLIBS = "1" +BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.2.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb index 42acbeb8..fb341b01 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.2.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb @@ -6,25 +6,25 @@ HOMEPAGE = "https://github.com/embree/embree" LICENSE = "Apache-2.0 & syrah" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://third-party-programs.txt;md5=86f6028ba2138fe41ac5c121d0a3518e \ + file://third-party-programs.txt;md5=f989f5b74cfff0d45d3ccf0e1366cbdc \ file://common/math/transcendental.h;beginline=6;endline=8;md5=73380bb2ab6613b30b8464f114bd0ca8" inherit pkgconfig cmake S = "${WORKDIR}/git" -SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master \ - " -SRCREV = "d7157470e089098b9c7323f608835ed50453e606" +SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master" +SRCREV = "daa8de0e714e18ad5e5c9841b67c1950d9c91c51" COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" DEPENDS = "tbb jpeg libpng glfw ispc-native" EXTRA_OECMAKE += " \ - -DEMBREE_ISPC_SUPPORT=OFF \ -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF \ -DEMBREE_MAX_ISA=DEFAULT \ -DEMBREE_TUTORIALS=OFF \ -DEMBREE_ISPC_SUPPORT=ON \ + -DEMBREE_ZIP_MODE=OFF \ " diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb new file mode 100644 index 00000000..1841253e --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \ + building blocks for cross-platform performance. Develop high-performance vision, \ + signal, security, and storage applications with this multithreaded software library." +HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html" + +LICENSE = "ISSL" + +MAXVER = "2021.10" + +LIC_FILES_CHKSUM = " \ + file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/license.txt;md5=d7cdc92ed6c4de1263da879599ddc3e2 \ + file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/third-party-programs.txt;md5=22bd13987911dcf790907041b43081f3 \ + " +SRC_URI = " \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-${MAXVER}-${PV}_amd64.deb;subdir=${BPN};name=ipp \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-devel-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=headers \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=env \ + " + +SRC_URI[ipp.sha256sum] = "b51e45c6e691aa46c7136b0ab61f5abe346388433e017a30cf53fd23e92bea07" +SRC_URI[headers.sha256sum] = "342f37ab2f82bc9f4498435f848ee660591c2488b44d988bf6ee96b2a71fd005" +SRC_URI[env.sha256sum] = "731e8c28a3b8b757730cd874d0941de2eb744856128f24ade59d36c12b415bf6" + +S = "${WORKDIR}/${BPN}" + +COMPATIBLE_HOST:libc-musl = "null" + +inherit bin_package + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_DEFAULT_DEPS = "" + +RDEPENDS:${PN} += "tbb setup-intel-oneapi-env" +INSANE_SKIP:${PN} += "ldflags dev-so" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.4.0-459.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.4.0-459.bb deleted file mode 100644 index db2684e1..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.4.0-459.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \ - building blocks for cross-platform performance. Develop high-performance vision, \ - signal, security, and storage applications with this multithreaded software library." -HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html" - -LICENSE = "ISSL" - -LIC_FILES_CHKSUM = " \ - file://opt/intel/oneapi/lib/licensing/ipp/license.txt;md5=4867389dfbeb11811d66cdcbcc8712a6 \ - file://opt/intel/oneapi/lib/licensing/ipp/third-party-programs.txt;md5=6cd9ad51f3b5cdfd4a355fa5599a6c03 \ - " - -SRC_URI = " \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-${PV}_amd64.deb;subdir=${BPN};name=runtime \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-common-${PV}_all.deb;subdir=${BPN};name=common \ - " - -SRC_URI[runtime.sha256sum] = "f983271c26792ea0cecdb294aebdb4619e630496643af32086597be782df85a3" -SRC_URI[common.sha256sum] = "46808f3e3eb2bb9d9b4169cd00be319b246f0ab2ba590925e776ef45d37d617f" - -S = "${WORKDIR}/${BPN}" - -COMPATIBLE_HOST:libc-musl = "null" - -inherit bin_package - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -RDEPENDS:${PN} += "tbb setup-intel-oneapi-env" -INSANE_SKIP:${PN} += "ldflags dev-so" - -# Some libraries are linking against the unversioned lib and there's no soname entry. -# Workaround errors like: -# Problem: conflicting requests -# - nothing provides libippcore_tl_omp.so()(64bit) needed by intel-oneapi-ipp-2021.3.0+333-r0.skylake_64 -do_install:append () { - install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so.10.3 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so - install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so.10.3 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so - install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so.10.3 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so - install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so.10.3 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so -} diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2021.4.0-640.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2021.4.0-640.bb deleted file mode 100644 index add4c806..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2021.4.0-640.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)" -DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \ - math library of highly optimized and extensively parallelized routines \ - for applications that require maximum performance. oneMKL contains \ - the high-performance optimizations from the full Intel® Math Kernel Library \ - for CPU architectures (with C/Fortran programming language interfaces)\ - and adds to them a set of DPC++ programming language interfaces for \ - achieving performance on various CPU architectures \ - and Intel Graphics Technology for certain key functionalities." -HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html" - -LICENSE = "ISSL" - -LIC_FILES_CHKSUM = " \ - file://opt/intel/oneapi/lib/licensing/mkl/license.txt;md5=4867389dfbeb11811d66cdcbcc8712a6 \ - file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \ - file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \ - file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \ - file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \ - file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs.txt;md5=980965cf1f086d40998ca4981968b6a4 \ - " - -SRC_URI = " \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-${PV}_amd64.deb;subdir=${BPN};name=runtime \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-common-${PV}_all.deb;subdir=${BPN};name=common \ - " - -SRC_URI[runtime.sha256sum] = "0ff97d07e6db5d55edf9a744b0b0ee0ea75866e80ab5510f596c57d5535c20d4" -SRC_URI[common.sha256sum] = "70ecfe07b2f888f66938a0e207aa8cb0637eb8d4deb659f6f6d924b8ee70a76e" - -S = "${WORKDIR}/${BPN}" - -inherit bin_package - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -RDEPENDS:${PN} += "tbb intel-oneapi-compiler setup-intel-oneapi-env" -INSANE_SKIP:${PN} = "ldflags textrel dev-so" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb new file mode 100644 index 00000000..e3e93028 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb @@ -0,0 +1,74 @@ +SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)" +DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \ + math library of highly optimized and extensively parallelized routines \ + for applications that require maximum performance. oneMKL contains \ + the high-performance optimizations from the full Intel® Math Kernel Library \ + for CPU architectures (with C/Fortran programming language interfaces)\ + and adds to them a set of DPC++ programming language interfaces for \ + achieving performance on various CPU architectures \ + and Intel Graphics Technology for certain key functionalities." +HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html" + +LICENSE = "ISSL" + +MKLMAINVER = "2024.0" + +LIC_FILES_CHKSUM = " \ + file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/license.txt;md5=8510d21bf355a76e378c3216c3929ccd \ + file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \ + file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \ + file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \ + file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \ + file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs.txt;md5=27de873e4084d62530fe828406b33ca9 \ + " + +SRC_URI = " \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=runtime \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-devel \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-devel-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=devel \ + https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-vars \ + " + +SRC_URI[runtime.sha256sum] = "10a86e24051d6ef4a80fd839c570e629190638a3c0ac9bcca99ab855f534b959" +SRC_URI[common-devel.sha256sum] = "adbf0ea946f63946d29b7f9c750c38a42ea7a65d8c81655b268aa2c7bb908192" +SRC_URI[devel.sha256sum] = "fab2a6f15e18bfd9b4d425f2703e4e98928c57f52c4feebc9ed886f097062e84" +SRC_URI[common-vars.sha256sum] = "ec2b67813739fa4a2895f63479a41acba2174afe2d0cb8a0c1c9119d1317d8ef" + +S = "${WORKDIR}/${BPN}" + +inherit bin_package + +do_install:append () { + install -d ${D}${bindir} + (cd ${D}${bindir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/bin/* .) + install -d ${D}${libdir} + (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.so* .) + (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.a* .) + install -d ${D}${libdir}/pkgconfig + (cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .) + install -d ${D}${libdir}/cmake + (cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .) + + install -d ${D}${includedir} + find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read srcdir; do + install -d ${D}${includedir}/$srcdir + (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcdir/* ./$srcdir/) + done + + find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type f -printf '%f\n' | while read srcfile; do + (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcfile .) + done +} + +AUTO_LIBNAME_PKGS = "" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +RDEPENDS:${PN} += "bash tbb intel-oneapi-dpcpp-cpp-runtime setup-intel-oneapi-env virtual-opencl-icd" +INSANE_SKIP:${PN} = "ldflags textrel dev-so staticdev arch already-stripped" + +FILES:${PN}-staticdev += "/opt/intel/oneapi/mkl/${MKLMAINVER}/lib/*.a*" + +SKIP_FILEDEPS:${PN} = '1' + +SYSROOT_DIRS += "/opt" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.1.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb index 24ead8c6..4ea6ffbe 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb @@ -7,13 +7,14 @@ HOMEPAGE = "https://www.openimagedenoise.org/" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://mkl-dnn/LICENSE;md5=3c6ff4426dbd618bcfd552ac4a7c1c56 \ - file://mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ - file://mkl-dnn/src/cpu/x64/jit_utils/jitprofiling/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ + file://external/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ + file://external/mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ + file://external/mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ file://weights/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz" -SRC_URI[sha256sum] = "9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f" +SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz\ + " +SRC_URI[sha256sum] = "ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6" inherit cmake diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.1.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb index 30ae4f48..a2d709a1 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.1.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb @@ -20,15 +20,22 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \ " -SRCREV = "b2cfd8ab94420489e2ed9a25fb0d512c2577e5de" +SRCREV = "8c6ba526813b871a624cb9d73d4cbb689ac7f4ce" COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" -DEPENDS = "ispc-native rkcommon embree" +DEPENDS = "ispc ispc-native rkcommon embree" EXTRA_OECMAKE += " \ -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ " +EXTRA_OECMAKE:intel-corei7-64 += " \ + -DOPENVKL_ISA_AVX=OFF \ + -DOPENVKL_ISA_AVX2=OFF \ + -DOPENVKL_ISA_AVX512SKX=OFF \ + " + PACKAGES =+ "${PN}-examples" FILES:${PN}-examples = "\ ${bindir} \ diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.8.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb index b6b789c2..3e03dcc2 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.8.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb @@ -6,7 +6,8 @@ HOMEPAGE = "https://www.ospray.org/" LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2 \ - file://third-party-programs.txt;md5=d0b3d9b55b2ccd6a3bffc374cf2d5563" + file://third-party-programs.txt;md5=e37b77e3bd997abccc359c710fb1f1db \ + " inherit pkgconfig cmake @@ -14,16 +15,18 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \ " -SRCREV = "fe4b3806f8626b22defbeda172609aa7c8c74a2e" +SRCREV = "f2a61c2eb58ccd666e34abfdb0fd7049ea073194" COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" -DEPENDS = "rkcommon ispc-native openvkl embree" +DEPENDS = "rkcommon ispc ispc-native openvkl embree" EXTRA_OECMAKE += " \ -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ - -DOSPRAY_APPS_BENCHMARK=OFF \ - -DOSPRAY_APPS_TESTING=OFF \ + -DOSPRAY_ENABLE_APPS_BENCHMARK=OFF \ + -DOSPRAY_ENABLE_APPS_TESTING=OFF \ + -DOSPRAY_ENABLE_APPS_EXAMPLES=OFF \ " PACKAGES =+ "${PN}-apps" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.8.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb index 3c15527c..fe6b23ea 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.8.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \ " -SRCREV = "27a18810ab7a8832a75bb136ade3ea9c32583e16" +SRCREV = "7ebfa0765ea590767202b328e7da38102c2f5a15" DEPENDS = "tbb" 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 @@ +From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Wed, 18 May 2022 12:24:03 +0800 +Subject: [PATCH] CMakeLists: disable Werror + +gcc12 highlights minor warnings that cause the build to fail. Ignore +those until they aren't fixed upstream. + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 418483f7..c019fea0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ else() + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2") + if(LNX_BUILD) + #A few warnings yet to resolve under esx +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") ++ #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror") + endif() + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") +@@ -791,4 +791,4 @@ if(ESX_BUILD) + include(CMake/esx.cmake) + endif() + +-add_subdirectory(src/os/nvm_api_sample) +\ No newline at end of file ++add_subdirectory(src/os/nvm_api_sample) +-- +2.35.3 + 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..11305e83 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,48 +1,50 @@ - +Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut + builds Upstream-Status: Backport -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> - +Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com> +--- MdePkg/Include/Base.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h -index 2da08b0c78..072eefdb94 100644 +index d209e6de28..6e61b8f3d3 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h -@@ -318,7 +318,11 @@ struct _LIST_ENTRY { - /// - /// NULL pointer (VOID *) - /// +@@ -316,8 +316,12 @@ struct _LIST_ENTRY { + #define NULL __null + #endif + #else +#ifndef OS_BUILD +#ifndef UNIT_TEST_UEFI_BUILD #define NULL ((VOID *) 0) + #endif +#endif +#endif - + // // Null character -@@ -810,6 +814,8 @@ typedef UINTN *BASE_LIST; +@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST; // Section 2.3.1 of the UEFI 2.3 Specification. // - + +#ifndef OS_BUILD +#ifndef UNIT_TEST_UEFI_BUILD STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); -@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi +@@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); +#endif +#endif - + // // The following three enum types are used to verify that the compiler -@@ -843,9 +851,13 @@ typedef enum { +@@ -812,9 +820,13 @@ typedef enum { __VerifyUint32EnumValue = 0xffffffff } __VERIFY_UINT32_ENUM_SIZE; - + +#ifndef OS_BUILD +#ifndef UNIT_TEST_UEFI_BUILD STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); @@ -50,8 +52,8 @@ index 2da08b0c78..072eefdb94 100644 STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); +#endif +#endif - + /** Macro that returns a pointer to the data structure that contains a specified field of --- -2.31.0.windows.1 +-- +2.37.3 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.0485.bb index 0ab2f231..c4743d1c 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.0485.bb @@ -15,14 +15,16 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" -SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ +SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master;name=ipmctl; \ git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \ file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ + file://0001-CMakeLists-disable-Werror.patch \ " -SRCREV_ipmctl = "3cbc9f7f231f6f03895e0ff8ab797d22075e09b7" -#tag: edk2-stable202108 -SRCREV_edk2 = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5" +SRCREV_ipmctl = "c75bd840ea7820c8f93a5488fcff75d08beedd51" +#tag edk2-stable202302 +SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3" +SRCREV_FORMAT = "ipmctl_edk2" S = "${WORKDIR}/git" 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 new file mode 100644 index 00000000..7f5b46c6 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch @@ -0,0 +1,86 @@ +From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +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 <anuj.mittal@intel.com> +--- + 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/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 @@ -From 419070322898381885b0ffa286905a3b08a23aa6 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Tue, 9 Jun 2020 11:35:59 +0800 -Subject: [PATCH] don't install licenses and version - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - ngraph/CMakeLists.txt | 8 ++------ - ngraph/test/runtime/CMakeLists.txt | 2 ++ - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index a05ca3b15c..9bc507b4c7 100644 ---- a/ngraph/CMakeLists.txt -+++ b/ngraph/CMakeLists.txt -@@ -272,7 +272,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) - install(EXPORT ngraphTargets - FILE ngraphTargets.cmake - NAMESPACE ngraph:: -- DESTINATION "deployment_tools/ngraph/cmake" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph - COMPONENT ngraph_dev) - endif() - -@@ -286,7 +286,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake -- DESTINATION "deployment_tools/ngraph/cmake" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph - COMPONENT ngraph_dev) - endif() - -@@ -337,7 +337,3 @@ add_subdirectory(test) - if (NGRAPH_PYTHON_BUILD_ENABLE) - add_subdirectory(python) - endif() -- --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION -- DESTINATION "deployment_tools/ngraph" -- COMPONENT ngraph) -diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt -index be84499ee0..f65357b751 100644 ---- a/ngraph/test/runtime/CMakeLists.txt -+++ b/ngraph/test/runtime/CMakeLists.txt -@@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - - add_subdirectory(interpreter) - add_subdirectory(ie) -+ -+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) --- -2.32.0 - 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 @@ -From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Thu, 8 Apr 2021 14:19:51 +0800 -Subject: [PATCH] inference-engine: use system installed packages - -Use installed versions of ade, protobuf, zlib and tbb. - -Don't fetch pybind11 at runtime and use the one that we have fetched while -running do_fetch. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - cmake/dependencies.cmake | 19 -------- - inference-engine/CMakeLists.txt | 6 +-- - inference-engine/cmake/dependencies.cmake | 45 ------------------- - inference-engine/cmake/ie_parallel.cmake | 2 +- - .../templates/InferenceEngineConfig.cmake.in | 10 ----- - inference-engine/samples/CMakeLists.txt | 3 +- - .../src/inference_engine/CMakeLists.txt | 4 +- - .../common_test_utils/CMakeLists.txt | 4 +- - .../unit_test_utils/CMakeLists.txt | 3 +- - inference-engine/thirdparty/CMakeLists.txt | 5 +-- - ngraph/python/CMakeLists.txt | 12 +---- - tests/fuzz/src/CMakeLists.txt | 1 - - thirdparty/CMakeLists.txt | 1 - - thirdparty/cnpy/CMakeLists.txt | 4 +- - 14 files changed, 14 insertions(+), 105 deletions(-) - -diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake -index 6cb15a077e..74d4ac4124 100644 ---- a/cmake/dependencies.cmake -+++ b/cmake/dependencies.cmake -@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") - if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") - set(protoc_version "3.7.1") - -- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT -- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" -- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" -- SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8" -- ) -- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) -- -- reset_deps_cache(SYSTEM_PROTOC) -- -- find_program( -- SYSTEM_PROTOC -- NAMES protoc -- PATHS "${SYSTEM_PROTOC_ROOT}/bin" -- NO_DEFAULT_PATH) -- if(NOT SYSTEM_PROTOC) -- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") -- endif() -- -- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") - endif() -diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt -index 1ac7fd8bf6..0615873110 100644 ---- a/inference-engine/CMakeLists.txt -+++ b/inference-engine/CMakeLists.txt -@@ -18,7 +18,7 @@ function(ie_developer_export_targets) - endfunction() - - function(ie_developer_export) -- set(all_dev_targets gflags ie_libraries) -+ set(all_dev_targets ie_libraries) - foreach(component IN LISTS openvino_export_components) - export(TARGETS ${${component}} NAMESPACE IE:: - APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") -@@ -142,7 +142,7 @@ endif() - # Developer package - # - --openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils) -+openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) - - # for Template plugin - if(NGRAPH_INTERPRETER_ENABLE) -@@ -158,7 +158,7 @@ function(ie_generate_dev_package_config) - configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" - "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" - INSTALL_DESTINATION share # not used -- PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR" -+ PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR" - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" -diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake -index b270c46f2d..5f85197a85 100644 ---- a/inference-engine/cmake/dependencies.cmake -+++ b/inference-engine/cmake/dependencies.cmake -@@ -81,51 +81,6 @@ endif () - if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") - reset_deps_cache(TBBROOT TBB_DIR) - -- if (WIN32 AND X86_64) -- #TODO: add target_path to be platform specific as well, to avoid following if -- RESOLVE_DEPENDENCY(TBB -- ARCHIVE_WIN "tbb2020_20200415_win.zip" -- TARGET_PATH "${TEMP}/tbb" -- ENVIRONMENT "TBBROOT" -- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") -- RESOLVE_DEPENDENCY(TBBBIND_2_4 -- ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" -- TARGET_PATH "${TEMP}/tbbbind_2_4" -- ENVIRONMENT "TBBBIND_2_4_ROOT" -- SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") -- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well -- RESOLVE_DEPENDENCY(TBB -- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" -- TARGET_PATH "${TEMP}/tbb" -- ENVIRONMENT "TBBROOT" -- SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce") -- elseif(LINUX AND X86_64) -- RESOLVE_DEPENDENCY(TBB -- ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" -- TARGET_PATH "${TEMP}/tbb" -- ENVIRONMENT "TBBROOT" -- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") -- RESOLVE_DEPENDENCY(TBBBIND_2_4 -- ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" -- TARGET_PATH "${TEMP}/tbbbind_2_4" -- ENVIRONMENT "TBBBIND_2_4_ROOT" -- SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") -- elseif(LINUX AND AARCH64) -- RESOLVE_DEPENDENCY(TBB -- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" -- TARGET_PATH "${TEMP}/tbb_yocto" -- ENVIRONMENT "TBBROOT" -- SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b") -- elseif(APPLE AND X86_64) -- RESOLVE_DEPENDENCY(TBB -- ARCHIVE_MAC "tbb2020_20200404_mac.tgz" -- TARGET_PATH "${TEMP}/tbb" -- ENVIRONMENT "TBBROOT" -- SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6") -- else() -- message(FATAL_ERROR "TBB is not available on current platform") -- endif() -- - update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") - update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") - -diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake -index edf3d2f2b2..6579d0f7ea 100644 ---- a/inference-engine/cmake/ie_parallel.cmake -+++ b/inference-engine/cmake/ie_parallel.cmake -@@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) - find_dependency(TBB COMPONENTS tbb tbbmalloc) - endif() - set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) -- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) -+ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) - set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) - if (NOT TBB_FOUND) - ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ -diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -index 261edbf3d7..bf217a789a 100644 ---- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -+++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -@@ -86,16 +86,6 @@ endfunction() - set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}") - - set(THREADING "@THREADING@") --if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) -- set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") -- _ie_find_dependency(TBB -- COMPONENTS tbb tbbmalloc -- CONFIG -- PATHS ${TBBROOT}/cmake -- ${_tbb_dir} -- NO_CMAKE_FIND_ROOT_PATH -- NO_DEFAULT_PATH) --endif() - - set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") - _ie_find_dependency(ngraph -diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 7924c56779..ae93857944 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") - add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) - set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) - endfunction() -- add_gflags() -+ #add_gflags() - endif() - - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") -- add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) - endif() - - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") -diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index e8ed1a5c4c..2fcb0bed4a 100644 ---- a/inference-engine/src/inference_engine/CMakeLists.txt -+++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf - INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" - PATH_VARS ${PATH_VARS}) - --set(IE_INCLUDE_DIR "include") --set(IE_NGRAPH_DIR "../ngraph/cmake") -+set(IE_INCLUDE_DIR "../../include") -+set(IE_NGRAPH_DIR "ngraph") - set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") - set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") - -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 -index 5e8643dc5d..031557efc3 100644 ---- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt -+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt -@@ -43,7 +43,7 @@ function(add_gtest_libraries) - PROPERTIES FOLDER thirdparty) - endfunction() - --add_gtest_libraries() -+#add_gtest_libraries() - - if (MSVC) - set(PUGI pugixml_mt) -@@ -52,8 +52,6 @@ else () - endif () - - list(APPEND EXPORT_DEPENDENCIES -- gtest -- gtest_main - ) - - set(TARGET_NAME commonTestUtils) -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 -index 7c1d89eabf..2fbd8fc324 100644 ---- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt -+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt -@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) - - list(APPEND EXPORT_DEPENDENCIES - commonTestUtils_s -- inference_engine_s -- gmock) -+ inference_engine_s) - - addIeTarget( - NAME ${TARGET_NAME} -diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt -index f028ebdd8a..9c5bd53466 100644 ---- a/inference-engine/thirdparty/CMakeLists.txt -+++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -62,14 +62,13 @@ else() - target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") - endif() - --add_subdirectory(ade EXCLUDE_FROM_ALL) - add_subdirectory(fluid/modules/gapi) - --set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) -+set_target_properties(fluid PROPERTIES FOLDER thirdparty) - - # developer package - --openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) -+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) - - if (NOT USE_SYSTEM_PUGIXML) - set_target_properties(pugixml PROPERTIES FOLDER thirdparty) -diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt -index 501bfffb4b..b45612c19c 100644 ---- a/ngraph/python/CMakeLists.txt -+++ b/ngraph/python/CMakeLists.txt -@@ -17,17 +17,7 @@ endif() - - include(FetchContent) - --FetchContent_Declare( -- pybind11 -- GIT_REPOSITORY "https://github.com/pybind/pybind11.git" -- GIT_TAG "v2.5.0" --) -- --FetchContent_GetProperties(pybind11) --if(NOT pybind11_POPULATED) -- FetchContent_Populate(pybind11) -- add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) --endif() -+add_subdirectory(pybind11) - - # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 - set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) -diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt -index b9400d9e7e..669938526c 100644 ---- a/tests/fuzz/src/CMakeLists.txt -+++ b/tests/fuzz/src/CMakeLists.txt -@@ -10,7 +10,6 @@ add_custom_target(fuzz) - FILE(GLOB tests "*-fuzzer.cc") - - add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) --add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) - - foreach(test_source ${tests}) - get_filename_component(test_name ${test_source} NAME_WE) -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 2c6b656408..4e86bd21ef 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -5,6 +5,5 @@ - add_subdirectory(ittapi) - add_subdirectory(itt_collector) - add_subdirectory(xbyak EXCLUDE_FROM_ALL) --add_subdirectory(zlib EXCLUDE_FROM_ALL) - add_subdirectory(cnpy EXCLUDE_FROM_ALL) - openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak) -diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt -index 5571cd5f78..e30604927a 100644 ---- a/thirdparty/cnpy/CMakeLists.txt -+++ b/thirdparty/cnpy/CMakeLists.txt -@@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") - target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) - endif() - --target_link_libraries(${TARGET_NAME} PUBLIC zlib) -+target_link_libraries(${TARGET_NAME} PUBLIC z) - target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/..") - --set_target_properties(cnpy PROPERTIES FOLDER thirdparty) -\ No newline at end of file -+set_target_properties(cnpy PROPERTIES FOLDER thirdparty) --- -2.32.0 - 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 @@ -From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Wed, 10 Jun 2020 09:45:48 +0800 -Subject: [PATCH] Disable Werror - -Don't treat warnings as errors. This just leads to failures every time -we upgrade the compiler. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - - ngraph/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt -index d14da47860..08ed695c0d 100644 ---- a/inference-engine/thirdparty/clDNN/CMakeLists.txt -+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt -@@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") - MultiProcessorCompilation - DeadCodeEliminate - ExtensionsEnabled -- TreatWarnAsErrorEnabled - WarnLevel4 - NoFastMath - StackProtector -diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index a05ca3b15c..ae888c4cb2 100644 ---- a/ngraph/CMakeLists.txt -+++ b/ngraph/CMakeLists.txt -@@ -197,7 +197,6 @@ if (WIN32) - endif() - - if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") - endif() - - if(WIN32) --- -2.32.0 - 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 new file mode 100644 index 00000000..8a1464d5 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch @@ -0,0 +1,33 @@ +From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +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 <anuj.mittal@intel.com> +--- + 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-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 @@ -From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Thu, 11 Jun 2020 14:24:04 +0800 -Subject: [PATCH] cmake installation fixes - -Make sure that libraries/samples/binaries are installed correctly. - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - CMakeLists.txt | 15 -------- - .../IEDevScriptsConfig.cmake | 2 +- - cmake/developer_package/packaging.cmake | 8 +++-- - cmake/developer_package/plugins/plugins.cmake | 2 +- - .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++ - inference-engine/samples/CMakeLists.txt | 4 ++- - .../common/format_reader/CMakeLists.txt | 4 ++- - .../src/inference_engine/CMakeLists.txt | 35 ++----------------- - .../src/preprocessing/CMakeLists.txt | 2 +- - .../src/readers/ir_reader/CMakeLists.txt | 2 +- - .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- - .../tests/unit/cpu/CMakeLists.txt | 2 ++ - .../unit/inference_engine/CMakeLists.txt | 2 ++ - .../tests/unit/vpu/CMakeLists.txt | 2 ++ - .../tools/compile_tool/CMakeLists.txt | 2 +- - ngraph/CMakeLists.txt | 8 ++--- - 16 files changed, 32 insertions(+), 62 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e0706a72e8..7920de9a42 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" - - # install setupvars - --ie_cpack_add_component(setupvars REQUIRED) -- - if(UNIX) -- install(PROGRAMS scripts/setupvars/setupvars.sh -- DESTINATION bin -- COMPONENT setupvars) - elseif(WIN32) - install(PROGRAMS scripts/setupvars/setupvars.bat - DESTINATION bin -@@ -195,22 +190,12 @@ endif() - # install install_dependencies - - if(UNIX) -- ie_cpack_add_component(install_dependencies REQUIRED) -- install(DIRECTORY scripts/install_dependencies/ -- DESTINATION install_dependencies -- COMPONENT install_dependencies) - endif() - - # install files for demo - --ie_cpack_add_component(demo_scripts DEPENDS core) - - if(UNIX) -- install(DIRECTORY scripts/demo/ -- DESTINATION deployment_tools/demo -- COMPONENT demo_scripts -- USE_SOURCE_PERMISSIONS -- PATTERN *.bat EXCLUDE) - elseif(WIN32) - install(DIRECTORY scripts/demo/ - DESTINATION deployment_tools/demo -diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake -index 0e1fe76db2..97867a24f8 100644 ---- a/cmake/developer_package/IEDevScriptsConfig.cmake -+++ b/cmake/developer_package/IEDevScriptsConfig.cmake -@@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT) - if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) - message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") - endif() -- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) -+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) - endif() - - # Enable postfixes for Debug/Release builds -diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake -index 2b5e945b17..adc4bef0bc 100644 ---- a/cmake/developer_package/packaging.cmake -+++ b/cmake/developer_package/packaging.cmake -@@ -5,7 +5,9 @@ - include(CPackComponent) - unset(IE_CPACK_COMPONENTS_ALL CACHE) - --set(IE_CPACK_IE_DIR deployment_tools/inference_engine) -+if (NOT DEFINED IE_CPACK_IE_DIR) -+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine) -+endif() - - # - # ie_cpack_set_library_dir() -@@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir) - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) - else() -- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) -- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) -+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) -+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) - endif() - endfunction() -diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake -index aae1dbb7fb..e6dac2a478 100644 ---- a/cmake/developer_package/plugins/plugins.cmake -+++ b/cmake/developer_package/plugins/plugins.cmake -@@ -124,7 +124,7 @@ function(ie_add_plugin) - - install(TARGETS ${IE_PLUGIN_NAME} - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component}) - endif() - endfunction() - -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 -index 45b2b3e9ed..55f7dfd214 100644 ---- 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 -@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) - if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) - endif() -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index ae93857944..fba24c6fed 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -33,7 +33,7 @@ endif() - - if(IE_MAIN_SOURCE_DIR) - # in case if samples are built from IE repo -- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) -+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) - # hint for find_package(InferenceEngine in the samples folder) - set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") - # hint for find_package(ngraph in the samples folder) -@@ -256,6 +256,8 @@ macro(ie_add_sample) - if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) - add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) - endif() -+ -+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) - endmacro() - - # collect all samples subdirectories -diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt -index d75061e56c..a2f8bd6397 100644 ---- a/inference-engine/samples/common/format_reader/CMakeLists.txt -+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt -@@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} - - if(COMMAND add_clang_format_target) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) --endif() -\ No newline at end of file -+endif() -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index 5d044e097c..103c187913 100644 ---- a/inference-engine/src/inference_engine/CMakeLists.txt -+++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -227,35 +227,6 @@ list(APPEND core_components ngraph) - list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR" - "IE_PARALLEL_CMAKE") - --if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) -- ie_cpack_add_component(tbb REQUIRED) -- list(APPEND core_components tbb) -- -- install(DIRECTORY "${TBB}/include" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- install(DIRECTORY "${TBB}/lib" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- if(EXISTS "${TBB}/bin") -- install(DIRECTORY "${TBB}/bin" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- endif() -- install(FILES "${TBB}/LICENSE" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- -- set(IE_TBB_DIR_INSTALL "external/tbb/cmake") -- set(IE_TBB_DIR "${TBB_DIR}") -- list(APPEND PATH_VARS "IE_TBB_DIR") -- -- install(FILES "${TBB}/cmake/TBBConfig.cmake" -- "${TBB}/cmake/TBBConfigVersion.cmake" -- DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL} -- COMPONENT tbb) --endif() -- - # Install Inference Engine - - ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) -@@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) - - install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml -- DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT core) - - # Install cmake scripts -@@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml - install(EXPORT InferenceEngineTargets - FILE InferenceEngineTargets.cmake - NAMESPACE IE:: -- DESTINATION ${IE_CPACK_IE_DIR}/share -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine - COMPONENT core_dev) - - set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph") -@@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers - install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" - "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" - "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake" -- DESTINATION ${IE_CPACK_IE_DIR}/share -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine - COMPONENT core_dev) -diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt -index f9548339d1..2670a04b60 100644 ---- a/inference-engine/src/preprocessing/CMakeLists.txt -+++ b/inference-engine/src/preprocessing/CMakeLists.txt -@@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME}) - - install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) -diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt -index 6d2bd39f3c..0722702055 100644 ---- a/inference-engine/src/readers/ir_reader/CMakeLists.txt -+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt -@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) - - install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) -diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -index a3e0182ed9..1b0e241485 100644 ---- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL - # install - if (LINUX) - install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules -- DESTINATION ${IE_CPACK_IE_DIR}/external -+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d - COMPONENT myriad) - endif() -diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt -index dfa8ce9d3f..88e7fbf67f 100644 ---- a/inference-engine/tests/unit/cpu/CMakeLists.txt -+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt -@@ -25,3 +25,5 @@ addIeTargetTest( - ie_faster_build(${TARGET_NAME} - UNITY - ) -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt -index 5c38c77b9b..927f93484f 100644 ---- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt -+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt -@@ -26,3 +26,5 @@ addIeTargetTest( - LABELS - IE - ) -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt -index fcb9f567bb..d4ac1952b8 100644 ---- a/inference-engine/tests/unit/vpu/CMakeLists.txt -+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt -@@ -33,3 +33,5 @@ addIeTargetTest( - VPU - MYRIAD - ) -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt -index 6e6f384289..a76ba55e64 100644 ---- a/inference-engine/tools/compile_tool/CMakeLists.txt -+++ b/inference-engine/tools/compile_tool/CMakeLists.txt -@@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) - ie_cpack_add_component(core_tools DEPENDS core) - - install(TARGETS compile_tool -- RUNTIME DESTINATION deployment_tools/tools/compile_tool -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT core_tools) - - install(FILES README.md -diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index 830fb3eb36..3093596e4a 100644 ---- a/ngraph/CMakeLists.txt -+++ b/ngraph/CMakeLists.txt -@@ -183,10 +183,10 @@ endif() - message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}") - - # Destinations --set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}") --set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}") --set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}") --set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}") -+set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") -+set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") -+set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") -+set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") - - #----------------------------------------------------------------------------------------------- - # Compile Flags for nGraph... --- -2.32.0 - 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 new file mode 100644 index 00000000..bbdeaa2a --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch @@ -0,0 +1,45 @@ +From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +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 <anuj.mittal@intel.com> +--- + 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 + 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 index 6d0c6cbc..816a98a3 100644 --- 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 @@ -1,29 +1,27 @@ -From 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001 +From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001 From: Naveen Saini <naveen.kumar.saini@intel.com> -Date: Mon, 30 Aug 2021 17:54:17 +0800 +Date: Fri, 21 Oct 2022 11:38:23 +0800 Subject: [PATCH] demos: use gflags from meta-oe Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> + --- demos/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index 1df8f248d..d368d608c 100644 +index 51767051c..fb7e3d22f 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -131,7 +131,7 @@ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs g - find_package(InferenceEngine REQUIRED) - find_package(ngraph REQUIRED) +@@ -141,7 +141,7 @@ endmacro() + find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) + find_package(OpenVINO REQUIRED COMPONENTS Runtime) -add_subdirectory(thirdparty/gflags) +#add_subdirectory(thirdparty/gflags) add_subdirectory(common/cpp) - add_subdirectory(multi_channel_common/cpp) --- -2.17.1 - + find_package(OpenCV QUIET COMPONENTS gapi) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb deleted file mode 100644 index 6afb0fca..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository" -HOMEPAGE = "https://github.com/opencv/open_model_zoo" -DESCRIPTION = "This repository includes optimized deep learning \ -models and a set of demos to expedite development of high-performance \ -deep learning inference applications." - -SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \ - file://0001-use-oe-gflags.patch \ - " - -SRCREV = "0d7aeac5eacdd343fdf9b375a23b7ec9a3846002" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -" - -inherit cmake - -S = "${WORKDIR}/git" -OECMAKE_SOURCEPATH = "${S}/demos" - -DEPENDS += "openvino-inference-engine opencv gflags" - -RDEPENDS:${PN} += " \ - python3-decorator \ - python3-defusedxml \ - python3-networkx \ - python3-protobuf \ - python3-test-generator \ - python3-requests \ - python3-pyyaml \ - python3-numpy \ - bash \ -" - -COMPATIBLE_HOST = '(x86_64).*-linux' - -EXTRA_OECMAKE += " \ - -DIE_MAIN_SOURCE_DIR=${B} \ - -DENABLE_SAMPLES=ON \ - -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ - -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \ - -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \ - -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \ - -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \ - -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ -" - -do_configure:prepend(){ - mkdir -p ${WORKDIR}/InferenceEngine/share - cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ -} - -do_install(){ - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${datadir}/openvino/open-model-zoo/tools - install -d ${D}${datadir}/openvino/open-model-zoo/demos - cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir} - cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} - cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo - cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo - cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools -} - -FILES:${PN} += "${datadir}/openvino" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb new file mode 100644 index 00000000..a9422e70 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb @@ -0,0 +1,54 @@ +SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository" +HOMEPAGE = "https://github.com/opencv/open_model_zoo" +DESCRIPTION = "This repository includes optimized deep learning \ +models and a set of demos to expedite development of high-performance \ +deep learning inference applications." + +SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \ + file://0001-use-oe-gflags.patch \ + " + +SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ +" + +inherit cmake + +S = "${WORKDIR}/git" +OECMAKE_SOURCEPATH = "${S}/demos" + +DEPENDS += "openvino-inference-engine opencv gflags" + +RDEPENDS:${PN} += " \ + python3-decorator \ + python3-defusedxml \ + python3-networkx \ + python3-protobuf \ + python3-requests \ + python3-pyyaml \ + python3-numpy \ + bash \ +" + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" + +EXTRA_OECMAKE += " \ + -DENABLE_SAMPLES=ON \ + " + +do_install(){ + install -d ${D}${libdir} + install -d ${D}${bindir} + install -d ${D}${datadir}/openvino/open-model-zoo/tools + install -d ${D}${datadir}/openvino/open-model-zoo/demos + cp -rf ${B}/intel64/Release/*.a ${D}${libdir} + cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir} + cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo + cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo + cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools +} + +FILES:${PN} += "${datadir}/openvino" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb deleted file mode 100644 index 14a3c8ee..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb +++ /dev/null @@ -1,132 +0,0 @@ -SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" -HOMEPAGE = "https://github.com/opencv/dldt" -DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ -deep learning models through a high-level C++ Inference Engine API \ -integrated with application logic." - -SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2021/4;lfs=0 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \ - git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ - git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ - git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/ngraph/python/pybind11;name=pybind11;branch=master \ - file://0001-inference-engine-use-system-installed-packages.patch \ - file://0002-Disable-Werror.patch \ - file://0003-inference-engine-installation-fixes.patch \ - file://0001-dont-install-licenses-and-version-file.patch \ - " - -SRCREV = "6c4462759e8974c0ce5b36ad22972a1c6ded76a8" -SRCREV_mkl = "60f41b3a9988ce7b1bc85c4f1ce7f9443bc91c9d" -SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" -SRCREV_pybind11 = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" - -SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf" -SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5" - -LICENSE = "Apache-2.0 & ISSL & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \ - file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ - file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ -" -LICENSE:${PN}-vpu-firmware = "ISSL" - -inherit cmake python3native - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE += " \ - -DENABLE_OPENCV=0 \ - -DENABLE_PLUGIN_RPATH=0 \ - -DENABLE_GNA=0 \ - -DPYTHON_EXECUTABLE=${PYTHON} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \ - -DENABLE_SAMPLES=1 \ - -DIE_CPACK_IE_DIR=${prefix} \ - -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ - -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ - -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ - -DNGRAPH_JSON_ENABLE=FALSE \ - -DTREAT_WARNING_AS_ERROR=FALSE \ - -DENABLE_SPEECH_DEMO=FALSE \ - -DENABLE_DATA=FALSE \ - -DUSE_SYSTEM_PUGIXML=TRUE \ - " - -DEPENDS += "libusb1 \ - ade \ - opencv \ - pugixml \ - protobuf-native \ - tbb \ - zlib \ - " - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST:libc-musl = "null" - -#Disable opencl temporarily. intel-compute-runtime depends on -#intel-graphics-compiler and vc-intrinsics and these two recipes fail to -#compile with LLVM13. Enable it after upstream has fixed it. -#PACKAGECONFIG ?= "vpu opencl" -PACKAGECONFIG ?= "vpu" -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" -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" -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" -PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" - -do_install:append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then - install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ - install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ - fi - - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - install -d ${D}${datadir}/inference_engine - mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ - - install -d ${D}${PYTHON_SITEPACKAGES_DIR} - mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ - mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ - mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ - - rm -rf ${D}${prefix}/python - fi - - rm -rf ${D}${prefix}/deployment_tools - - # Remove the samples source directory. We install the built samples. - rm -rf ${D}/usr/samples -} - -# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR -# instead of RSS -SSTATE_SCAN_FILES:append = " *.cmake" - -FILES:${PN}-dev = "${includedir} \ - ${libdir}/cmake \ - " - -FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ - ${datadir}/openvino \ - ${libdir}/custom_kernels \ - ${libdir}/plugins.xml \ - ${libdir}/cache.json \ - " - -# Move inference engine samples into a separate package -PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" - -FILES:${PN}-samples = "${datadir}/inference_engine \ - ${bindir} \ - " -FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" - -# Package for inference engine python API -PACKAGES =+ "${PN}-${PYTHON_PN}" - -FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb new file mode 100644 index 00000000..675d9920 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb @@ -0,0 +1,146 @@ +SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" +HOMEPAGE = "https://github.com/opencv/dldt" +DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ +deep learning models through a high-level C++ Inference Engine API \ +integrated with application logic." + +SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/1;lfs=0 \ + git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ + git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ + git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ + git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \ + git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \ + git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ + git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \ + git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \ + git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \ + git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \ + git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \ + git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \ + file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \ + file://0002-cmake-Fix-overloaded-virtual-error.patch \ + file://0003-protobuf-allow-target-protoc-to-be-built.patch \ + " + +SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78" +SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3" +SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c" +SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" +SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" +SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e" +SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" +SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" +SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851" +SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94" +SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488" +SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d" +SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b" +SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry" + +LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \ + file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ + file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \ + file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \ + file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \ + file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ + file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ + file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \ + file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \ + file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ +" + +inherit cmake python3native pkgconfig qemu + +S = "${WORKDIR}/git" +EXTRA_OECMAKE += " \ + -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ + -DENABLE_OPENCV=OFF \ + -DENABLE_INTEL_GNA=OFF \ + -DENABLE_SYSTEM_TBB=ON \ + -DPYTHON_EXECUTABLE=${PYTHON} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ + -DTREAT_WARNING_AS_ERROR=FALSE \ + -DENABLE_DATA=FALSE \ + -DENABLE_SYSTEM_PUGIXML=TRUE \ + -DENABLE_OV_ONNX_FRONTEND=FALSE \ + -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ + -DENABLE_FUZZING=OFF \ + -DENABLE_TBBBIND_2_5=OFF \ + -DCPACK_GENERATOR=RPM \ + -DENABLE_SYSTEM_FLATBUFFERS=ON \ + -DENABLE_SYSTEM_SNAPPY=ON \ + -DFETCHCONTENT_BASE_DIR="${S}" \ + -DENABLE_INTEL_NPU=OFF \ + " + +DEPENDS += "\ + flatbuffers-native \ + pugixml \ + python3-pybind11 \ + python3-pybind11-native \ + qemu-native \ + snappy \ + tbb \ + " + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" + +PACKAGECONFIG ?= "opencl samples" +PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp," +PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress" +PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv" +PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" + +do_configure:prepend() { + # Dont set PROJECT_ROOT_DIR + sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt + + # qemu wrapper that can be used by cmake to run target binaries. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +do_install:append() { + rm -rf ${D}${prefix}/install_dependencies + rm -rf ${D}${prefix}/setupvars.sh + + find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} + +} + +# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR +# instead of RSS +SSTATE_SCAN_FILES:append = " *.cmake" + +FILES:${PN} += "\ + ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \ + ${libdir}/openvino-${PV}/plugins.xml \ + ${libdir}/openvino-${PV}/cache.json \ + " + +# Move inference engine samples into a separate package +PACKAGES =+ "${PN}-samples" + +FILES:${PN}-samples = "${datadir}/openvino \ + ${bindir} \ + ${libdir}/libformat_reader.a \ + ${libdir}/libopencv_c_wrapper.a \ + " + +RDEPENDS:${PN}-samples += "python3-core" + +# Package for inference engine python API +PACKAGES =+ "${PN}-python3" + +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$" |