We are migrating ARM NN from v24.11 to the latest version v26.01 Key Changes: - Update SRCREV to the stable v26.01
Signed-off-by: Pratham Deshmukh <[email protected]> --- Change Logs: v2-> v3: - Removed patch 0001-Fix-type-casting-for-32bit-builds.patch - Link to v2: - https://patchwork.yoctoproject.org/project/arago/cover/[email protected]/ v1 -> v2: - No Changes - Link to v1: - https://patchwork.yoctoproject.org/project/arago/cover/[email protected]/ ...01-Fix-type-casting-for-32bit-builds.patch | 40 ------------------- .../armnn/{armnn_24.11.bb => armnn_26.01.bb} | 10 +++-- 2 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 meta-arago-extras/recipes-devtools/armnn/armnn/0001-Fix-type-casting-for-32bit-builds.patch rename meta-arago-extras/recipes-devtools/armnn/{armnn_24.11.bb => armnn_26.01.bb} (88%) diff --git a/meta-arago-extras/recipes-devtools/armnn/armnn/0001-Fix-type-casting-for-32bit-builds.patch b/meta-arago-extras/recipes-devtools/armnn/armnn/0001-Fix-type-casting-for-32bit-builds.patch deleted file mode 100644 index 9f59de9a..00000000 --- a/meta-arago-extras/recipes-devtools/armnn/armnn/0001-Fix-type-casting-for-32bit-builds.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 10953c25a77989709bcbd065489700314fe0c8c6 Mon Sep 17 00:00:00 2001 -From: Andrew Davis <[email protected]> -Date: Thu, 16 Jan 2025 11:11:28 -0600 -Subject: [PATCH] Fix type casting for 32bit builds - -Upstream-Status: Pending - -Signed-off-by: Andrew Davis <[email protected]> -Change-Id: Id68274e68e7832b827050a2e417053e88e7a6728 ---- - include/armnn/Numpy.hpp | 2 +- - tests/ExecuteNetwork/FileComparisonExecutor.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/armnn/Numpy.hpp b/include/armnn/Numpy.hpp -index a4154b434..f77b065ca 100644 ---- a/include/armnn/Numpy.hpp -+++ b/include/armnn/Numpy.hpp -@@ -209,7 +209,7 @@ namespace armnnNumpy - template<typename T> - inline void ReadData(std::ifstream& ifStream, T* tensor, const unsigned int& numElements) - { -- ifStream.read(reinterpret_cast<char *>(tensor), sizeof(T) * numElements); -+ ifStream.read(reinterpret_cast<char *>(tensor), static_cast<std::streamsize>(sizeof(T) * numElements)); - } - - -diff --git a/tests/ExecuteNetwork/FileComparisonExecutor.cpp b/tests/ExecuteNetwork/FileComparisonExecutor.cpp -index 903ed0362..4617ebe4a 100644 ---- a/tests/ExecuteNetwork/FileComparisonExecutor.cpp -+++ b/tests/ExecuteNetwork/FileComparisonExecutor.cpp -@@ -187,7 +187,7 @@ Tensor ReadTensorFromFile(const std::string fileName) - - // We'll read the entire file into one buffer. - std::ifstream file(fileName, std::ios::binary); -- std::vector<char> buffer(fileSize); -+ std::vector<char> buffer(static_cast<std::size_t>(fileSize)); - if (file.read(buffer.data(), static_cast<std::streamsize>(fileSize))) - { - std::string tensorName; diff --git a/meta-arago-extras/recipes-devtools/armnn/armnn_24.11.bb b/meta-arago-extras/recipes-devtools/armnn/armnn_26.01.bb similarity index 88% rename from meta-arago-extras/recipes-devtools/armnn/armnn_24.11.bb rename to meta-arago-extras/recipes-devtools/armnn/armnn_26.01.bb index af55fa4d..b1172ea0 100644 --- a/meta-arago-extras/recipes-devtools/armnn/armnn_24.11.bb +++ b/meta-arago-extras/recipes-devtools/armnn/armnn_26.01.bb @@ -3,12 +3,11 @@ DESCRIPTION = "Linux software and tools to enable machine learning workloads on LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3e14a924c16f7d828b8335a59da64074" -BRANCH = "branches/armnn_24_11" +BRANCH = "branches/armnn_26_01" SRC_URI = "git://github.com/ARM-software/armnn.git;branch=${BRANCH};protocol=https" -SRC_URI += "file://0001-Fix-type-casting-for-32bit-builds.patch" -# v24.11 -SRCREV = "3ed70c005559d409feff2c578a1a39cf8fec8804" +# v26.01 +SRCREV = "600c0004a2a7a2d600a3bce22ef83193de1dde57" # Only compatible with armv7a, armv7ve, and aarch64 COMPATIBLE_MACHINE = "(^$)" @@ -37,6 +36,9 @@ PACKAGECONFIG[ref] = "-DARMNNREF=1, -DARMNNREF=0" EXTRA_OECMAKE += " \ -DHALF_INCLUDE=${STAGING_DIR_TARGET} \ + -DARMCOMPUTE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libarm_compute.so \ + -DARMCOMPUTE_LIBRARY_DEBUG=${STAGING_LIBDIR}/libarm_compute.so \ + -DARMCOMPUTE_INCLUDE=${STAGING_INCDIR} \ " do_install:append() { -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17260): https://lists.yoctoproject.org/g/meta-arago/message/17260 Mute This Topic: https://lists.yoctoproject.org/mt/118158200/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
