diff --git a/armnn-22.11.tar.gz b/armnn-22.11.tar.gz deleted file mode 100644 index 5eb06af..0000000 --- a/armnn-22.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d609381687ad63bcb6f9506e48d54ed9d7b134c95bcbad2a142d40c3a7f1290 -size 28448912 diff --git a/armnn-23.02.tar.gz b/armnn-23.02.tar.gz new file mode 100644 index 0000000..cf93519 --- /dev/null +++ b/armnn-23.02.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49ab1825e5e9772648a723323a8ffb5bfc2390d5fb8f7bae01df59396d894215 +size 28414369 diff --git a/armnn-281e97b.patch b/armnn-281e97b.patch deleted file mode 100644 index 9d3d91e..0000000 --- a/armnn-281e97b.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 281e97b415ec429b6878aec7635cb74b8ed7ebca Mon Sep 17 00:00:00 2001 -From: Francis Murtagh -Date: Tue, 13 Dec 2022 17:21:55 +0000 -Subject: [PATCH] Github #712: Use static libraries not object libraries for support library - - * .o files were being installed by cmake. - -Change-Id: Ie2056e09b4800fe208d784a90f3908d508b8cadf -Signed-off-by: Francis Murtagh ---- - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc4207b..51c4cf2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - # --# Copyright © 2022 Arm Ltd and Contributors. All rights reserved. -+# Copyright © 2018-2022 Arm Ltd and Contributors. All rights reserved. - # Copyright 2020 NXP - # SPDX-License-Identifier: MIT - # -@@ -109,7 +109,6 @@ - src/armnnUtils/Transpose.cpp - ) - --add_library(armnnUtilsObj OBJECT ${armnnUtils_sources}) - add_library_ex(armnnUtils STATIC ${armnnUtils_sources}) - - target_include_directories(armnnUtils PRIVATE src/backends) -@@ -839,7 +838,7 @@ - list(APPEND unittest_sources $) - endforeach() - -- add_executable(UnitTests ${unittest_sources} $) -+ add_executable(UnitTests ${unittest_sources}) - target_include_directories(UnitTests PRIVATE src/armnn) - target_include_directories(UnitTests PRIVATE src/armnnUtils) - target_include_directories(UnitTests PRIVATE src/armnnTestUtils) -@@ -1004,14 +1003,6 @@ - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - --install( -- TARGETS armnnUtilsObj -- EXPORT armnn-targets -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- OBJECTS DESTINATION ${CMAKE_INSTALL_LIBDIR} --) -- - #################################################### - ## Set export alias - set_target_properties(armnn -diff --git a/shim/sl/CMakeLists.txt b/shim/sl/CMakeLists.txt -index 6912640..e54101c 100644 ---- a/shim/sl/CMakeLists.txt -+++ b/shim/sl/CMakeLists.txt -@@ -489,9 +489,9 @@ - canonical/SystemPropertiesUtils.hpp - support_library_service.cpp) - --list(APPEND armnn_support_library_sources "$") --list(APPEND armnn_support_library_sources "$") - add_library(armnn_support_library SHARED ${armnn_support_library_sources}) -+target_link_libraries(armnn_support_library PUBLIC Armnn::armnnUtils) -+target_link_libraries(armnn_support_library PUBLIC Armnn::armnnSerializer-static) - - target_link_libraries(armnn_support_library PUBLIC Armnn::Armnn) - target_link_libraries(armnn_support_library PUBLIC profiling_library_headers) -diff --git a/src/armnnSerializer/CMakeLists.txt b/src/armnnSerializer/CMakeLists.txt -index b7e65ad..5e94f33 100755 ---- a/src/armnnSerializer/CMakeLists.txt -+++ b/src/armnnSerializer/CMakeLists.txt -@@ -1,5 +1,5 @@ - # --# Copyright © 2017 Arm Ltd. All rights reserved. -+# Copyright © 2017, 2018-2021, 2022 Arm Ltd and Contributors. All rights reserved. - # SPDX-License-Identifier: MIT - # - if(BUILD_ARMNN_SERIALIZER) -@@ -39,34 +39,33 @@ - if(BUILD_BARE_METAL) - add_library_ex(armnnSerializer STATIC ${armnn_serializer_sources}) - else() -- # We're going to export both an OBJECT library and a SHARED library here. -+ # We're going to export both a STATIC library and a SHARED library here. - # In some instances it's easier to include the serializer directly into - # the target executable or library rather than have yet another .so. -- add_library(armnnSerializerObj OBJECT ${armnn_serializer_sources}) -+ add_library(armnnSerializer-static STATIC ${armnn_serializer_sources}) - add_library_ex(armnnSerializer SHARED ${armnn_serializer_sources}) - endif() - - include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}") - - set_target_properties(armnnSerializer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) -- target_include_directories(armnnSerializerObj PRIVATE ../armnn) -- target_include_directories(armnnSerializerObj PRIVATE ../armnnUtils) - target_include_directories(armnnSerializer PRIVATE ../armnn) - target_include_directories(armnnSerializer PRIVATE ../armnnUtils) - target_include_directories(armnnSerializer PRIVATE ../../generated) -- target_include_directories(armnnSerializerObj PRIVATE ../../generated) -+ target_include_directories(armnnSerializer-static PRIVATE ../armnn) -+ target_include_directories(armnnSerializer-static PRIVATE ../armnnUtils) -+ target_include_directories(armnnSerializer-static PRIVATE ../../generated) - - list(APPEND armnn_serializer_sources - ArmnnSchema_generated.h - ) - - # System include to suppress warnings for flatbuffers generated files -- target_include_directories(armnnSerializerObj SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - target_include_directories(armnnSerializer SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - - target_link_libraries(armnnSerializer armnn ${FLATBUFFERS_LIBRARY}) - -- install(TARGETS armnnSerializerObj -+ install(TARGETS armnnSerializer-static - EXPORT armnn-targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/armnn-gh711.patch b/armnn-gh711.patch deleted file mode 100644 index be5a4b3..0000000 --- a/armnn-gh711.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- armnn-22.11/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp.orig 2022-11-29 15:20:31.148251027 +0100 -+++ armnn-22.11/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp 2022-11-29 15:20:52.820459889 +0100 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - - using namespace armnnTfLiteParser; diff --git a/armnn.changes b/armnn.changes index a18128b..83b2de8 100644 --- a/armnn.changes +++ b/armnn.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 15 09:03:42 UTC 2023 - Guillaume GARDET + +- Update to 23.02: + * Changelog: https://github.com/ARM-software/armnn/releases/tag/v23.02 +- Drop upstream patches: + * armnn-gh711.patch + * armnn-281e97b.patch + ------------------------------------------------------------------- Wed Dec 14 15:41:22 UTC 2022 - Guillaume GARDET diff --git a/armnn.spec b/armnn.spec index f1086af..1b76208 100644 --- a/armnn.spec +++ b/armnn.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -64,9 +64,9 @@ %else %bcond_with armnn_onnx %endif -%define version_major 22 -%define version_minor 11 -%define version_lib 31 +%define version_major 23 +%define version_minor 02 +%define version_lib 32 %define version_lib_testutils 2 %define version_lib_tfliteparser 24 %define version_lib_onnxparser 24 @@ -79,10 +79,6 @@ Group: Development/Libraries/Other URL: https://developer.arm.com/products/processors/machine-learning/arm-nn Source0: https://github.com/ARM-software/armnn/archive/v%{version}.tar.gz#/armnn-%{version}.tar.gz Source1: armnn-rpmlintrc -# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/711 -Patch1: armnn-gh711.patch -# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/712 -Patch2: armnn-281e97b.patch # PATCHES to add downstream ArmnnExamples binary - https://layers.openembedded.org/layerindex/recipe/87610/ Patch200: 0003-add-more-test-command-line-arguments.patch Patch201: 0005-add-armnn-mobilenet-test-example.patch @@ -376,8 +372,6 @@ This package contains the libarmnnOnnxParser library from armnn. %prep %setup -q -n armnn-%{version} -%patch1 -p1 -%patch2 -p1 %if %{with armnn_extra_tests} %patch200 -p1 %patch201 -p1