[meta-arago][master][PATCH v2 2/2] onnxruntime:upgrade 1.20.1 to 1.23.2
Pratham Deshmukh <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arago |
|---|---|
| Message-ID | <[email protected]> |
We are migrating ONNXRuntime from v1.20.1 to the latest
stable version v1.23.2.
Removed Patches (Fixed Upstream):
• 0001-Remove-executable-permission-bit-from-source-files.patch
- Commit Link: https://github.com/microsoft/onnxruntime/commit/392961ffaef52f5a51c230e26df8c16492580160
• 0002-cmake-Fix-typo-in-option-text-s-buildings-bindings.patch
- Commit Link: https://github.com/microsoft/onnxruntime/commit/fd22509e3645a23e62c51680b534201c324d3342
• 0003-ACL-Do-not-add-LD_LIBRARY_PATH-to-search-path-when-n.patch
- Commit Link: https://github.com/microsoft/onnxruntime/commit/49e94da68244fa51c28396d0642707121eacc527
• 0004-Do-not-include-CMAKE_CXX_FLAGS-in-build-information-.patch
- Commit Link: https://github.com/microsoft/onnxruntime/commit/3fb2dc73f53b84b3df81639eb6340c1bb5ec774d
• 0005-cmake-Print-out-result-of-find_package.patch
- With the updated helper_functions.cmake this patch is no longer needed.
Added Patches (New Requirements):
• 0001-Added-the-missing-header-to-fix-uint32_t-compilation.patch
- Fixes missing stdint.h include causing uint32_t compilation errors
Signed-off-by: Pratham Deshmukh <[email protected]>
---
...g-header-to-fix-uint32_t-compilation.patch | 27 +++++++
...ble-permission-bit-from-source-files.patch | 72 -------------------
...-in-option-text-s-buildings-bindings.patch | 25 -------
...D_LIBRARY_PATH-to-search-path-when-n.patch | 32 ---------
...MAKE_CXX_FLAGS-in-build-information-.patch | 30 --------
...ake-Print-out-result-of-find_package.patch | 37 ----------
...untime_1.20.1.bb => onnxruntime_1.23.2.bb} | 68 ++++++++++--------
7 files changed, 64 insertions(+), 227 deletions(-)
create mode 100644 meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Added-the-missing-header-to-fix-uint32_t-compilation.patch
delete mode 100644 meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Remove-executable-permission-bit-from-source-files.patch
delete mode 100644 meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0002-cmake-Fix-typo-in-option-text-s-buildings-bindings.patch
delete mode 100644 meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0003-ACL-Do-not-add-LD_LIBRARY_PATH-to-search-path-when-n.patch
delete mode 100644 meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0004-Do-not-include-CMAKE_CXX_FLAGS-in-build-information-.patch
delete mode 100644 meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0005-cmake-Print-out-result-of-find_package.patch
rename meta-arago-extras/recipes-framework/onnxruntime/{onnxruntime_1.20.1.bb => onnxruntime_1.23.2.bb} (46%)
diff --git a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Added-the-missing-header-to-fix-uint32_t-compilation.patch b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Added-the-missing-header-to-fix-uint32_t-compilation.patch
new file mode 100644
index 00000000..21e0a301
--- /dev/null
+++ b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Added-the-missing-header-to-fix-uint32_t-compilation.patch
@@ -0,0 +1,27 @@
+From cb67823df8cfa19cf1c0c0ddd1b9aa29ee7773ba Mon Sep 17 00:00:00 2001
+From: Pratham Deshmukh <[email protected]>
+Date: Thu, 12 Feb 2026 16:02:40 +0530
+Subject: [PATCH] Added the missing header to fix uint32_t compilation error.
+
+Upstream-Status: Backport [https://github.com/microsoft/onnxruntime/commit/d6e712c]
+
+Signed-off-by: Pratham Deshmukh <[email protected]>
+---
+ onnxruntime/core/common/semver.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/onnxruntime/core/common/semver.h b/onnxruntime/core/common/semver.h
+index a07c24f016..98bb6a2cef 100644
+--- a/onnxruntime/core/common/semver.h
++++ b/onnxruntime/core/common/semver.h
+@@ -3,6 +3,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <optional>
+ #include <string_view>
+
+--
+2.34.1
+
diff --git a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Remove-executable-permission-bit-from-source-files.patch b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Remove-executable-permission-bit-from-source-files.patch
deleted file mode 100644
index b64e32ca..00000000
--- a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0001-Remove-executable-permission-bit-from-source-files.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 626066499c34c524924302342fc071f32442caae Mon Sep 17 00:00:00 2001
-From: Andrew Davis <[email protected]>
-Date: Sun, 12 Jan 2025 12:48:49 -0600
-Subject: [PATCH] Remove executable permission bit from source files
-
-These are source files, not executables, do not set the executable
-permission bit on these files.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrew Davis <[email protected]>
----
- onnxruntime/contrib_ops/cpu/utils/console_dumper.h | 1 +
- onnxruntime/core/optimizer/bias_softmax_fusion.cc | 0
- onnxruntime/core/providers/acl/acl_execution_provider.h | 0
- onnxruntime/core/providers/acl/acl_fwd.h | 0
- onnxruntime/core/providers/acl/acl_provider_factory.cc | 0
- onnxruntime/core/providers/acl/math/gemm.cc | 0
- onnxruntime/core/providers/acl/nn/batch_norm.cc | 0
- onnxruntime/core/providers/acl/nn/batch_norm.h | 0
- onnxruntime/test/optimizer/graph_transform_test.cc | 0
- onnxruntime/test/optimizer/graph_transform_test_layernorm.cc | 0
- 10 files changed, 1 insertion(+)
- mode change 100755 => 100644 onnxruntime/core/optimizer/bias_softmax_fusion.cc
- mode change 100755 => 100644 onnxruntime/core/providers/acl/acl_execution_provider.h
- mode change 100755 => 100644 onnxruntime/core/providers/acl/acl_fwd.h
- mode change 100755 => 100644 onnxruntime/core/providers/acl/acl_provider_factory.cc
- mode change 100755 => 100644 onnxruntime/core/providers/acl/math/gemm.cc
- mode change 100755 => 100644 onnxruntime/core/providers/acl/nn/batch_norm.cc
- mode change 100755 => 100644 onnxruntime/core/providers/acl/nn/batch_norm.h
- mode change 100755 => 100644 onnxruntime/test/optimizer/graph_transform_test.cc
- mode change 100755 => 100644 onnxruntime/test/optimizer/graph_transform_test_layernorm.cc
-
-diff --git a/onnxruntime/contrib_ops/cpu/utils/console_dumper.h b/onnxruntime/contrib_ops/cpu/utils/console_dumper.h
-index 9ebc44f441..64bd2b7b18 100644
---- a/onnxruntime/contrib_ops/cpu/utils/console_dumper.h
-+++ b/onnxruntime/contrib_ops/cpu/utils/console_dumper.h
-@@ -3,6 +3,7 @@
-
- #pragma once
- #include <string>
-+#include <iostream>
- #include "core/framework/ort_value.h"
- #include "core/framework/float16.h"
- #include "contrib_ops/cpu/utils/debug_macros.h"
-diff --git a/onnxruntime/core/optimizer/bias_softmax_fusion.cc b/onnxruntime/core/optimizer/bias_softmax_fusion.cc
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/core/providers/acl/acl_execution_provider.h b/onnxruntime/core/providers/acl/acl_execution_provider.h
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/core/providers/acl/acl_fwd.h b/onnxruntime/core/providers/acl/acl_fwd.h
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/core/providers/acl/acl_provider_factory.cc b/onnxruntime/core/providers/acl/acl_provider_factory.cc
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/core/providers/acl/math/gemm.cc b/onnxruntime/core/providers/acl/math/gemm.cc
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/core/providers/acl/nn/batch_norm.cc b/onnxruntime/core/providers/acl/nn/batch_norm.cc
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/core/providers/acl/nn/batch_norm.h b/onnxruntime/core/providers/acl/nn/batch_norm.h
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/test/optimizer/graph_transform_test.cc b/onnxruntime/test/optimizer/graph_transform_test.cc
-old mode 100755
-new mode 100644
-diff --git a/onnxruntime/test/optimizer/graph_transform_test_layernorm.cc b/onnxruntime/test/optimizer/graph_transform_test_layernorm.cc
-old mode 100755
-new mode 100644
diff --git a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0002-cmake-Fix-typo-in-option-text-s-buildings-bindings.patch b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0002-cmake-Fix-typo-in-option-text-s-buildings-bindings.patch
deleted file mode 100644
index 88423190..00000000
--- a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0002-cmake-Fix-typo-in-option-text-s-buildings-bindings.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From be67663e9a44d146033aeb97804145a60b4032db Mon Sep 17 00:00:00 2001
-From: Andrew Davis <[email protected]>
-Date: Thu, 16 Jan 2025 12:35:03 -0600
-Subject: [PATCH] [cmake] Fix typo in option text s/buildings/bindings
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrew Davis <[email protected]>
----
- cmake/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index d90a2a3550..e0cde678db 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -77,7 +77,7 @@ option(onnxruntime_GENERATE_TEST_REPORTS "Enable test report generation" OFF)
- option(onnxruntime_ENABLE_STATIC_ANALYSIS "Enable static analysis" OFF)
- option(onnxruntime_USE_CUSTOM_STATIC_ANALYSIS_RULES "Use a custom SDL Rule. It is mainly for our CI build" OFF)
- option(onnxruntime_REDIRECT_STATIC_ANALYSIS_OUTPUTS_TO_FILE "Use a custom SDL Rule. It is mainly for our CI build" OFF)
--option(onnxruntime_ENABLE_PYTHON "Enable python buildings" OFF)
-+option(onnxruntime_ENABLE_PYTHON "Enable python bindings" OFF)
- # Enable it may cause LNK1169 error
- option(onnxruntime_ENABLE_MEMLEAK_CHECKER "Experimental: Enable memory leak checker in Windows debug build" OFF)
- option(onnxruntime_USE_CUDA "Build with CUDA support" OFF)
diff --git a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0003-ACL-Do-not-add-LD_LIBRARY_PATH-to-search-path-when-n.patch b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0003-ACL-Do-not-add-LD_LIBRARY_PATH-to-search-path-when-n.patch
deleted file mode 100644
index 75cb9b18..00000000
--- a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0003-ACL-Do-not-add-LD_LIBRARY_PATH-to-search-path-when-n.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b1689f3f963f4c07d3329a838569ac4c2fa2bd5f Mon Sep 17 00:00:00 2001
-From: Andrew Davis <[email protected]>
-Date: Thu, 16 Jan 2025 12:38:13 -0600
-Subject: [PATCH] [ACL] Do not add LD_LIBRARY_PATH to search path when not
- defined
-
-If LD_LIBRARY_PATH is not defined a blank "-L" is added to the
-link command. This causes the next object to be linked to get
-treated as if it was a search path and causes link failure.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrew Davis <[email protected]>
----
- cmake/onnxruntime_providers_acl.cmake | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/onnxruntime_providers_acl.cmake b/cmake/onnxruntime_providers_acl.cmake
-index e23d289271..19d41dc73f 100644
---- a/cmake/onnxruntime_providers_acl.cmake
-+++ b/cmake/onnxruntime_providers_acl.cmake
-@@ -13,7 +13,9 @@
- onnxruntime_common onnxruntime_framework onnx onnx_proto ${PROTOBUF_LIB} flatbuffers::flatbuffers Boost::mp11 safeint_interface
- )
-
-- target_link_libraries(onnxruntime_providers_acl -L$ENV{LD_LIBRARY_PATH})
-+ if (DEFINED ENV{LD_LIBRARY_PATH})
-+ target_link_libraries(onnxruntime_providers_acl -L$ENV{LD_LIBRARY_PATH})
-+ endif()
- add_dependencies(onnxruntime_providers_acl ${onnxruntime_EXTERNAL_DEPENDENCIES})
- set_target_properties(onnxruntime_providers_acl PROPERTIES FOLDER "ONNXRuntime")
- target_include_directories(onnxruntime_providers_acl
diff --git a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0004-Do-not-include-CMAKE_CXX_FLAGS-in-build-information-.patch b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0004-Do-not-include-CMAKE_CXX_FLAGS-in-build-information-.patch
deleted file mode 100644
index e8f086a8..00000000
--- a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0004-Do-not-include-CMAKE_CXX_FLAGS-in-build-information-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7ea6e35d3630f8c19080a0cb5a4a4c55c242a36b Mon Sep 17 00:00:00 2001
-From: Andrew Davis <[email protected]>
-Date: Thu, 16 Jan 2025 12:40:57 -0600
-Subject: [PATCH] Do not include CMAKE_CXX_FLAGS in build information string
-
-While this information can be useful, it often includes information
-that may be specific to the build machine (like include paths with
-usernames, e.g. -I /home/myname/externalproject/fakeroot/inlcude).
-
-This causes issues for reproducible builds (resulting binaries will
-be different between different build machines).
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrew Davis <[email protected]>
----
- cmake/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index e0cde678db..e0d8fd0a17 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -1439,7 +1439,6 @@ if (Git_FOUND)
- string(APPEND ORT_BUILD_INFO "git-branch=${ORT_GIT_BRANCH}, git-commit-id=${ORT_GIT_COMMIT}, ")
- endif()
- string(APPEND ORT_BUILD_INFO "build type=${CMAKE_BUILD_TYPE}")
--string(APPEND ORT_BUILD_INFO ", cmake cxx flags: ${CMAKE_CXX_FLAGS}")
- configure_file(onnxruntime_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/onnxruntime_config.h)
- get_property(onnxruntime_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
diff --git a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0005-cmake-Print-out-result-of-find_package.patch b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0005-cmake-Print-out-result-of-find_package.patch
deleted file mode 100644
index 249aadee..00000000
--- a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime/0005-cmake-Print-out-result-of-find_package.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a73d9b9f4dba6d164e128d6c768d1b0a04e969ab Mon Sep 17 00:00:00 2001
-From: Andrew Davis <[email protected]>
-Date: Thu, 16 Jan 2025 12:47:27 -0600
-Subject: [PATCH] [cmake] Print out result of find_package
-
-A verbose only message is already printed that states the CMake will
-attempt to find a package using find_package():
-
-> Trying find_package(...) before FetchContent
-
-But it never prints if the package was found this way or not.
-Add this result message.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrew Davis <[email protected]>
----
- cmake/external/helper_functions.cmake | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/cmake/external/helper_functions.cmake b/cmake/external/helper_functions.cmake
-index e3f2211f96..9ca6a967da 100644
---- a/cmake/external/helper_functions.cmake
-+++ b/cmake/external/helper_functions.cmake
-@@ -138,9 +138,12 @@ macro(onnxruntime_fetchcontent_makeavailable)
- unset(__cmake_fpArgs)
-
- if(${__cmake_contentName}_FOUND)
-+ message(VERBOSE "Found ${__cmake_contentName} with find_package()")
- FetchContent_SetPopulated(${__cmake_contentName})
- FetchContent_GetProperties(${__cmake_contentName})
- continue()
-+ else()
-+ message(VERBOSE "Could not find ${__cmake_contentName} with find_package()")
- endif()
- endif()
- else()
diff --git a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime_1.20.1.bb b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime_1.23.2.bb
similarity index 46%
rename from meta-arago-extras/recipes-framework/onnxruntime/onnxruntime_1.20.1.bb
rename to meta-arago-extras/recipes-framework/onnxruntime/onnxruntime_1.23.2.bb
index a5026484..f47523ca 100644
--- a/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime_1.20.1.bb
+++ b/meta-arago-extras/recipes-framework/onnxruntime/onnxruntime_1.23.2.bb
@@ -4,33 +4,37 @@ HOMEPAGE = "https://www.onnxruntime.ai/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=0f7e3b1308cb5c00b372a6e78835732d"
-SRC_URI = "\
- git://github.com/microsoft/onnxruntime.git;protocol=https;branch=rel-1.20.1 \
- git://github.com/HowardHinnant/date.git;protocol=https;branch=master;name=date;destsuffix=${S}/cmake/external/date \
- git://github.com/pytorch/cpuinfo.git;protocol=https;branch=main;name=cpuinfo;destsuffix=${S}/cmake/external/cpuinfo \
- git://github.com/google/flatbuffers.git;protocol=https;branch=master;name=flatbuffers;destsuffix=${S}/cmake/external/flatbuffers \
- git://github.com/dcleblanc/SafeInt.git;protocol=https;branch=master;name=safeint;destsuffix=${S}/cmake/external/safeint \
- git://gitlab.com/libeigen/eigen.git;protocol=https;branch=3.4;name=eigen;destsuffix=${S}/cmake/external/eigen \
- git://github.com/google/nsync.git;protocol=https;branch=master;name=nsync;destsuffix=${S}/cmake/external/nsync \
-"
+SRC_URI = "\
+ git://github.com/microsoft/onnxruntime.git;protocol=https;branch=rel-1.23.2 \
+ git://github.com/HowardHinnant/date.git;protocol=https;branch=master;name=date;destsuffix=${S}/_deps/date-src \
+ git://github.com/pytorch/cpuinfo.git;protocol=https;branch=main;name=cpuinfo;destsuffix=${S}/_deps/pytorch_cpuinfo-src \
+ git://github.com/google/flatbuffers.git;protocol=https;branch=master;name=flatbuffers;destsuffix=${S}/_deps/flatbuffers-src \
+ git://github.com/dcleblanc/SafeInt.git;protocol=https;branch=master;name=safeint;destsuffix=${S}/_deps/safeint-src \
+ git://github.com/eigen-mirror/eigen.git;protocol=https;branch=master;name=eigen;destsuffix=${S}/_deps/eigen3-src \
+ git://github.com/google/nsync.git;protocol=https;branch=master;name=nsync;destsuffix=${S}/_deps/google_nsync-src \
+ git://github.com/boostorg/mp11.git;protocol=https;branch=master;name=mp11;destsuffix=${S}/_deps/mp11-src \
+ git://github.com/dmlc/dlpack.git;protocol=https;branch=main;name=dlpack;destsuffix=${S}/_deps/dlpack-src \
+ git://github.com/abseil/abseil-cpp.git;protocol=https;branch=lts_2025_05_12;name=abseil-cpp;destsuffix=${S}/_deps/abseil_cpp-src \
+ git://github.com/google/re2.git;protocol=https;branch=main;name=re2;destsuffix=${S}/_deps/re2-src \
+"
SRC_URI += "\
- file://0002-cmake-Fix-typo-in-option-text-s-buildings-bindings.patch \
- file://0003-ACL-Do-not-add-LD_LIBRARY_PATH-to-search-path-when-n.patch \
- file://0004-Do-not-include-CMAKE_CXX_FLAGS-in-build-information-.patch \
- file://0005-cmake-Print-out-result-of-find_package.patch \
- file://0001-Remove-executable-permission-bit-from-source-files.patch \
+ file://0001-Added-the-missing-header-to-fix-uint32_t-compilation.patch \
"
SRCREV_FORMAT = "default"
-SRCREV = "5c1b7ccbff7e5141c1da7a9d963d660e5741c319"
+SRCREV = "a83fc4d58cb48eb68890dd689f94f28288cf2278"
SRCREV_date = "6e921e1b1d21e84a5c82416ba7ecd98e33a436d0"
-SRCREV_cpuinfo = "ca678952a9a8eaa6de112d154e8e104b22f9ab3f"
+SRCREV_cpuinfo = "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6"
SRCREV_flatbuffers = "0100f6a5779831fa7a651e4b67ef389a8752bd9b"
SRCREV_safeint = "4cafc9196c4da9c817992b20f5253ef967685bf8"
-SRCREV_eigen = "e7248b26a1ed53fa030c5c459f7ea095dfd276ac"
+SRCREV_eigen = "1d8b82b0740839c0de7f1242a3585e3390ff5f33"
SRCREV_nsync = "13de152c2a1cd73ff4df97bd2c406b6d15d34af3"
+SRCREV_mp11 = "0a0b5fb001ce0233ae3a6f99d849c0649e5a7361"
+SRCREV_dlpack = "5c210da409e7f1e51ddf445134a4376fdbd70d7d"
+SRCREV_abseil-cpp = "bc257a88f7c1939f24e0379f14a3589e926c950c"
+SRCREV_re2 = "6dcd83d60f7944926bfd308cc13979fc53dd69ca"
-# Only compatible with armv7a, armv7ve, and aarch64
+#Only compatible with armv7a, armv7ve, and aarch64
COMPATIBLE_MACHINE = "(^$)"
COMPATIBLE_MACHINE:aarch64 = "(.*)"
COMPATIBLE_MACHINE:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}"
@@ -38,11 +42,9 @@ COMPATIBLE_MACHINE:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)"
DEPENDS += "\
onnx \
- abseil-cpp \
protobuf \
protobuf-native \
boost \
- re2 \
nlohmann-json \
microsoft-gsl \
"
@@ -78,22 +80,26 @@ PACKAGECONFIG[armnn] = "-Donnxruntime_USE_ARMNN=ON, -Donnxruntime_USE_ARMNN=OFF,
PACKAGECONFIG[armnn-relu] = "-Donnxruntime_ARMNN_RELU_USE_CPU=ON, -Donnxruntime_ARMNN_RELU_USE_CPU=OFF"
PACKAGECONFIG[armnn-bn] = "-Donnxruntime_ARMNN_BN_USE_CPU=ON, -Donnxruntime_ARMNN_BN_USE_CPU=OFF"
-EXTRA_OECMAKE:append = " \
- -DFETCHCONTENT_FULLY_DISCONNECTED=ON \
- -DFETCHCONTENT_SOURCE_DIR_DATE=${S}/cmake/external/date \
- -DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${S}/cmake/external/cpuinfo \
- -DFETCHCONTENT_SOURCE_DIR_PYTORCH_CLOG=${S}/cmake/external/cpuinfo \
- -DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${S}/cmake/external/flatbuffers \
- -DFETCHCONTENT_SOURCE_DIR_SAFEINT=${S}/cmake/external/safeint \
- -DFETCHCONTENT_SOURCE_DIR_EIGEN=${S}/cmake/external/eigen \
- -DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${S}/cmake/external/nsync \
-"
+EXTRA_OECMAKE:append = " \
+ -DFETCHCONTENT_FULLY_DISCONNECTED=ON \
+ -DFETCHCONTENT_SOURCE_DIR_DATE=${S}/_deps/date-src \
+ -DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${S}/_deps/pytorch_cpuinfo-src \
+ -DFETCHCONTENT_SOURCE_DIR_PYTORCH_CLOG=${S}/_deps/pytorch_cpuinfo-src \
+ -DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${S}/_deps/flatbuffers-src \
+ -DFETCHCONTENT_SOURCE_DIR_SAFEINT=${S}/_deps/safeint-src \
+ -DFETCHCONTENT_SOURCE_DIR_EIGEN3=${S}/_deps/eigen3-src \
+ -DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${S}/_deps/google_nsync-src \
+ -DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${S}/_deps/abseil_cpp-src \
+ -DFETCHCONTENT_SOURCE_DIR_MP11=${S}/_deps/mp11-src \
+ -DFETCHCONTENT_SOURCE_DIR_DLPACK=${S}/_deps/dlpack-src \
+ -DFETCHCONTENT_SOURCE_DIR_RE2=${S}/_deps/re2-src \
+"
EXTRA_OECMAKE:append = " \
-DONNX_CUSTOM_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \
-Donnx_SOURCE_DIR=${RECIPE_SYSROOT}${PYTHON_SITEPACKAGES_DIR} \
-DPython_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
- --compile-no-warning-as-error \
+ --compile-no-warning-as-error \
--log-level=VERBOSE \
"
--
2.34.1