-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update armnn to version 22.11 / rev 1 via SR 1039050
https://build.opensuse.org/request/show/1039050 by user Guillaume_G + dimstar_suse Add armnn back to Factory
- Loading branch information
1 parent
562d841
commit ebd059b
Showing
16 changed files
with
2,100 additions
and
0 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <package name="armnn" project="openSUSE:Factory"> | ||
| <title>armnn</title> | ||
| <description>Arm NN SDK enables machine learning workloads on power-efficient devices</description> | ||
| <devel project="science:machinelearning" package="armnn"/> | ||
| </package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <revisionlist> | ||
| <revision rev="1" vrev="1"> | ||
| <srcmd5>2f33ade97bf6e601e5b1a7cad61d2d35</srcmd5> | ||
| <version>22.11</version> | ||
| <time>1669816812</time> | ||
| <user>dimstar_suse</user> | ||
| <comment>Add armnn back to Factory</comment> | ||
| <requestid>1039050</requestid> | ||
| </revision> | ||
| </revisionlist> |
76 changes: 76 additions & 0 deletions
76
packages/a/armnn/0003-add-more-test-command-line-arguments.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| From 964cb82f3b811aec6663255ab0aa589f0a3be0ee Mon Sep 17 00:00:00 2001 | ||
| From: Qin Su <qsu@ti.com> | ||
| Date: Fri, 22 Feb 2019 14:10:07 -0500 | ||
| Subject: [PATCH] add more test command line arguments | ||
|
|
||
| Updated by Guillaume_G to apply properly (s/BOOST_ASSERT/ARMNN_ASSERT/) | ||
|
|
||
| Upstream-Status: Inappropriate [TI only test code] | ||
| Signed-off-by: Qin Su <qsu@ti.com> | ||
| --- | ||
| tests/InferenceTest.inl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 49 insertions(+) | ||
|
|
||
| diff --git a/tests/InferenceTest.inl b/tests/InferenceTest.inl | ||
| index 538720b..6fd21b8 100644 | ||
| --- a/tests/InferenceTest.inl | ||
| +++ b/tests/InferenceTest.inl | ||
| @@ -326,6 +326,55 @@ int ClassifierInferenceTestMain(int argc, | ||
| ARMNN_ASSERT(modelFilename); | ||
| ARMNN_ASSERT(inputBindingName); | ||
| ARMNN_ASSERT(outputBindingName); | ||
| + int count; | ||
| + const char *p_input; | ||
| + char inmodelname[500]; | ||
| + char outtensorname[500]; | ||
| + | ||
| + /* parse command line */ | ||
| + for (count = 1; count < argc; count++) | ||
| + { | ||
| + if (*(argv[count]) == '+') | ||
| + { | ||
| + p_input = argv[count] + 1; | ||
| + switch (*(p_input)) | ||
| + { | ||
| + case 'i': | ||
| + case 'I': | ||
| + strcpy(inmodelname, p_input + 2); | ||
| + modelFilename = &inmodelname[0]; | ||
| + std::cout << "Input model = " << modelFilename << std::endl; | ||
| + break; | ||
| + case 'o': | ||
| + case 'O': | ||
| + strcpy(outtensorname, p_input + 2); | ||
| + outputBindingName = &outtensorname[0]; | ||
| + std::cout << "out tensor name = " << outputBindingName << std::endl; | ||
| + break; | ||
| + default: | ||
| + break; | ||
| + } | ||
| + } | ||
| + else if (*(argv[count]) == '-') | ||
| + { | ||
| + p_input = argv[count] + 1; | ||
| + switch (*(p_input)) | ||
| + { | ||
| + case '-': | ||
| + p_input = argv[count] + 2; | ||
| + case 'h': | ||
| + case 'H': | ||
| + std::cout <<"\nAdditional Options: " << std::endl; | ||
| + std::cout <<" +i Set user specified inference model name." << std::endl; | ||
| + std::cout <<" If not set, default name is used." << std::endl; | ||
| + std::cout <<" +o Set user specified output tensor name." << std::endl; | ||
| + std::cout <<" If not set, default name is used.\n" << std::endl; | ||
| + break; | ||
| + default: | ||
| + break; | ||
| + } | ||
| + } | ||
| + } | ||
|
|
||
| return InferenceTestMain(argc, argv, defaultTestCaseIds, | ||
| [=] | ||
| -- | ||
| 1.9.1 | ||
|
|
71 changes: 71 additions & 0 deletions
71
packages/a/armnn/0005-add-armnn-mobilenet-test-example.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| From 99a6c339f1828d3cd1b193cf702bada9011d900b Mon Sep 17 00:00:00 2001 | ||
| From: Djordje Senicic <x0157990@ti.com> | ||
| Date: Mon, 24 Jun 2019 14:29:19 -0400 | ||
| Subject: [PATCH] add armnn mobilenet test example | ||
|
|
||
| Upstream-Status: Inappropriate [TI only test code] | ||
| Signed-off-by: Qin Su <qsu@ti.com> | ||
| Signed-off-by: Djordje Senicic <x0157990@ti.com> | ||
| [Guillaume's update: Add boost_log dep] | ||
| [Guillaume's update: Update to apply on top of 20.08] | ||
| --- | ||
| tests/CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 41 insertions(+) | ||
|
|
||
| diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
| index dfcf4b48..5a78d3a6 100644 | ||
| --- a/tests/CMakeLists.txt | ||
| +++ b/tests/CMakeLists.txt | ||
| @@ -1,3 +1,6 @@ | ||
| +find_package( OpenCV REQUIRED ) | ||
| +include_directories( ${OpenCV_INCLUDE_DIRS} ) | ||
| + | ||
| # UnitTests | ||
| include(CheckIncludeFiles) | ||
|
|
||
| @@ -348,3 +351,42 @@ if(BUILD_ARMNN_QUANTIZER) | ||
| target_include_directories(ImageCSVFileGenerator PRIVATE ../src/armnnUtils) | ||
| ImageTensorExecutor(ImageCSVFileGenerator) | ||
| endif() | ||
| + | ||
| +if (BUILD_ARMNN_EXAMPLES) | ||
| + set(ArmnnExamples_sources | ||
| + ArmnnExamples/ArmnnExamples.cpp) | ||
| + | ||
| + add_executable_ex(ArmnnExamples ${ArmnnExamples_sources}) | ||
| + | ||
| + target_include_directories(ArmnnExamples PRIVATE ../src/armnnUtils) | ||
| + target_include_directories(ArmnnExamples PRIVATE ../src/armnn) | ||
| + target_include_directories(ArmnnExamples PRIVATE ../src/backends) | ||
| + | ||
| + if (BUILD_CAFFE_PARSER) | ||
| + target_link_libraries(ArmnnExamples armnnCaffeParser) | ||
| + endif() | ||
| + if (BUILD_TF_PARSER) | ||
| + target_link_libraries(ArmnnExamples armnnTfParser) | ||
| + endif() | ||
| + | ||
| + if (BUILD_TF_LITE_PARSER) | ||
| + target_link_libraries(ArmnnExamples armnnTfLiteParser) | ||
| + endif() | ||
| + if (BUILD_ONNX_PARSER) | ||
| + target_link_libraries(ArmnnExamples armnnOnnxParser) | ||
| + endif() | ||
| + | ||
| + target_link_libraries(ArmnnExamples armnn) | ||
| + target_link_libraries(ArmnnExamples ${CMAKE_THREAD_LIBS_INIT}) | ||
| + if(OPENCL_LIBRARIES) | ||
| + target_link_libraries(ArmnnExamples ${OPENCL_LIBRARIES}) | ||
| + endif() | ||
| + | ||
| + target_link_libraries(ArmnnExamples | ||
| + ${Boost_LOG_LIBRARY} | ||
| + ${Boost_SYSTEM_LIBRARY} | ||
| + ${Boost_FILESYSTEM_LIBRARY} | ||
| + ${Boost_PROGRAM_OPTIONS_LIBRARY} | ||
| + ${OpenCV_LIBS}) | ||
| + addDllCopyCommands(ArmnnExamples) | ||
| +endif() | ||
| -- | ||
| 2.17.1 | ||
|
|
Oops, something went wrong.