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