aboutsummaryrefslogtreecommitdiff
path: root/cmake
AgeCommit message (Collapse)Author
2021-02-15IVGCVSW-5679 Failure to run the build instructions to build ArmNN using ↵Nikhil Raj
android ndk * Provide FLATBUFFERS_INCLUDE_PATH in GlobalConfig.cmake if ARMCOMPUTECL is enabled Signed-off-by: Nikhil Raj <nikhil.raj@arm.com> Change-Id: Iabd5bb9b8a63970df9b7f485d07f8c1ee1a78560
2021-02-08IVGCVSW-4901 Add semantic versioning to Parsers and TfLite DelegateMatthew Sloyan
* Added Version.hpp to all Parsers * Added Version.hpp to TfLite Delegate * Updated CMakeLists to use new versions * Added GetVersion method to parsers and TfLite Delegate Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com> Change-Id: If29e1e6d9e615f9095ec1c01ad47acfff40b1dd5
2020-11-23IVGCVSW-5569 Fix Unittest failure while building using EthosNAcc backendNarumol Prangnawarat
* Correct the id when EthosN is enable Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Change-Id: I5203e615f809e56c7597ffeeec56b5ad38d4ff17
2020-11-17IVGCVSW-5377 Add ArmNN TfLite delegate to ExecuteNetworkSadik Armagan
* Added package manger to turn internal calls to find_package into a no-op * Changed delegate cmake so it can now be built within armnn Change-Id: I2a7ecb9a3c1ca05474cd1dccd91498f6f6c0b32e Signed-off-by: Finn Williams <Finn.Williams@arm.com> Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
2020-11-13Wrap FindBoost in if(BUILD_UNIT_TESTS) so that it can be excluded entirelyMatthew Bentham
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com> Change-Id: Iabe1b10e53d393a19e681156c001d6a2e9eb835e
2020-11-08COMPMID-3639: (3RDPARTY_UPDATE) Move CL kernels to srcFrancis Murtagh
* Change file Armnn GlobalConfig.cmake uses to find ARMCOMPUTE_INCLUDE * Original file has been moved and no longer visible Signed-off-by: Francis Murtagh <francis.murtagh@arm.com> Change-Id: I91c1376124dad2b2db764f83c421a1cc110e5dd1
2020-10-29IVGCVSW-5265 Remove boost from core ArmNN CMakeColm Donelan
* Remove all but Boost_UNIT_TEST_FRAMEWORK_LIBRARY from ArmNN Cmake files. * Remove references to boost::fpc from old test applications. Signed-off-by: Colm Donelan <Colm.Donelan@arm.com> Change-Id: Ibb1261dee4b971d1788d2805528aa800a8b883ce
2020-09-09fix cxxopts and ghc cross compilation issueVincent ABRIOU
While cross compiling using openembedded yocto environment, CXXOPTS_INCLUDE and GHC_INCLUDE variables remains empty because the search path point to the openembedded sysroot instead of the current directory. To avoid this situation, NO_CMAKE_FIND_ROOT_PATH must be added to the find_path call. Signed-off-by: Vincent ABRIOU <vincent.abriou@st.com> Change-Id: I3ba17a300d5ca7fbc58b6ec5c4eb15267dcee228
2020-08-27Export Armnn cmakeDerek Lamberti
Change-Id: I3c317e835aba5feafda240393ca26b6aebe8d655 Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
2020-08-17Fix Windows buildRob Hughes
Change-Id: I145d220c73313e31c184b6a75ab7f4823df99919 Signed-off-by: Robert Hughes <robert.hughes@arm.com>
2020-07-29IVGCVSW-5166 Pull out the common and server side code into standalone librariesJim Flynn
Change-Id: I180f84c493a9b2be4b93b25d312ebdd9e71b1735 Signed-off-by: Jim Flynn <jim.flynn@arm.com>
2020-07-16IVGCVSW-5104 Fix OS-X GetCurrentThreadId build errorJim Flynn
Change-Id: Ic54b8d387d8507209e8777d25dcd2c4bc1641bf4 Signed-off-by: Jim Flynn <jim.flynn@arm.com>
2020-07-08IVGCVSW-4487 Remove boot/dll.hpp from dynamic backends test.Colm Donelan
* Replace the call to boost::dll::program_location() with a cmake variable set at runtime. PROJECT_BINARY_DIR appears to fit the bill. * Fall back to a boost custom CLI to allow it to be user specified. * Add a FAQ entry describing potential problems. * Adding flexibility to GetSharedObjectsTestImpl to cope with sym links in file systems. Signed-off-by: Colm Donelan <Colm.Donelan@arm.com> Change-Id: Iccf3f1b0f2911101e1f61bffd73cefba271bbfe2
2020-06-30IVGCVSW-4487 Remove boost::filesystemFrancis Murtagh
* Replace filesystem::path * Replace filesystem::exists * Replace filesystem::is_directory * Replace filesystem::directory_iterator * Replace filesystem::filesystem_error exception * Replace filesystem::temp_directory_path * Replace filesystem::unique path * Replace filesystem::ofstream with std::ofstream * Replace filesystem::remove * Replace filesystem::is_regular_file * Replace boost::optional with armnn::Optional in touched files * Remove some superfluous includes * Update build guides, GlobalConfig.cmake and CMakeLists.txt * Remove redundant armnnUtils::Filesystem::Remove function. * Remove redundant armnnUtils::Filesystem::GetFileSize function. Temporarily adding back Boost::filesystem to enable Boost::dll. Signed-off-by: Francis Murtagh <francis.murtagh@arm.com> Signed-off-by: Colm Donelan <Colm.Donelan@arm.com> Change-Id: Ifa46d4a0097d2612ddacd8e9736c0b36e365fb11
2020-06-24IVGCVSW-4487 Adds ghc::filesystem to third-partyJan Eilers
* as replacement for boost::filesystem * added to cmake * added to TPIP in readme.md Signed-off-by: Jan Eilers <jan.eilers@arm.com> Change-Id: I0098e490e8597a9bae4781cacba8e19f8a50d1f0
2020-06-19IVGCVSW-4488 Adding cxxopts to third-partyJan Eilers
* as alternative for boost::program_options * added to cmake * added to TPIP list in readme.md Signed-off-by: Jan Eilers <jan.eilers@arm.com> Change-Id: Id8c6a12c988196cdac55650bc4761c08a39b3abb
2020-06-03IVGCVSW-4915 Improving messages around SAMPLE_DYNAMIC_BACKEND_ENABLEDColm Donelan
* If SAMPLE_DYNAMIC_BACKEND_ENABLED is enabled but DYNAMIC_BACKEND_PATHS is not set then the user gets failing tests cases with no clear idea what has gone wrong. Explicitly failing when DYNAMIC_BACKEND_PATHS has not been set. * Adding an FAQ entry describing how the user can get confused by our documented usage of CMake. Signed-off-by: Colm Donelan <Colm.Donelan@arm.com> Change-Id: Ic11e14a971f53a6454962354ff728365ccc9de6d
2020-06-02Tidy up uses of Windows.h by adding WindowsWrapper.hppRob Hughes
This header brings in the Win32 API header, with some small modifications applied to prevent clashes with our code. This means those modifications don't need to be made in each place that we bring in Windows.h Change-Id: Ie817c7a167eccbe1ac6a49d3fc940eef8b2f534d Signed-off-by: Robert Hughes <robert.hughes@arm.com>
2020-05-22Find default build location for Compute Library binaries.Matthew Bentham
In common cases this reduces the cmake arguments needed for Compute Library from: "cmake -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMCOMPUTE_ROOT=../ComputeLibrary -DARMCOMPUTE_BUILD_DIR=ARMCOMPUTE_BUILD_DIR=../ComputeLibrary/build -DSHARED_BOOST=1 ../armnn/" to: "cmake -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMCOMPUTE_ROOT=../ComputeLibrary -DSHARED_BOOST=1 ../armnn/" Signed-off-by: Matthew Bentham <matthew.bentham@arm.com> Change-Id: I992f4ef428f10dc92ca9457fe8981ae3af93f538
2020-05-21Integration of PyArmNN into CMakePavel Macenauer
Change-Id: Ice37e693f4598a6b3c38bd38d89f1d35cdaa8a18 Signed-off-by: Pavel Macenauer <pavel.macenauer@nxp.com>
2020-04-27IVGCVSW-4594 Refactor the GatordMockService and GatordMockMain to extract a ↵Finn Williams
BasePipeServer Signed-off-by: Finn Williams <Finn.Williams@arm.com> Change-Id: I03c1b46104dadc491dba6075865e486f78aa60fa
2020-03-10Github #326 Allow linking against shared Compute LibraryMatthew Bentham
As a last resort, check for shared Compute Library in standard paths. This will work for Linux distribution builds where no static Compute Library has been installed. Change-Id: I1ea11d184ef9dcf4480ae0687a4ba81b402c5b2d Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
2020-03-09IVGCVSW-4540 Fix master build failure to link UnitTests on AndroidSadik Armagan
Change-Id: I22148a0bf243eabfd045475644510f30096d96e3 Signed-off-by: Jim Flynn <jim.flynn@arm.com> Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
2020-03-04IVGCVSW-4163 Enhance the error handling in the ReadPacket functionSadik Armagan
* Introduced armnn::SocketConnectionException with fields error no and socket info. Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: Ideb85b00771864e332226635aeff3096fbea8e5f
2020-02-10Suppress warnings from OpenCL include folder.Matthew Bentham
Fixes an odd compiler warning with half.hpp when included from ComputeLibrary/include directory. Signed-off-by: Matthew Bentham <matthew.bentham@arm.com> Change-Id: I17d251bb68384c357ffb93ea8e63333564aba659
2020-02-03IVGCVSW-4399 Create Sample Dynamic backendNarumol Prangnawarat
* Move IWorkload and WorkloadInfo to include/armnn/backends * Add simple sample dynamic backend with addition workload * Add sample example to run dynamic backend * Unit tests Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Change-Id: I0753ce35b8e8a6223a1471388b49246d82438a44
2020-01-07IVGCVSW-4246 Enable -Wextra by defaultDerek Lamberti
!referencetests:218340 Change-Id: If24a604310d0363b1f09b406e4d53ebfeb106aad Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
2019-12-31Replace Schema.s with generated .cpp fileRob Hughes
This removes the dependency on an assembler (which must support .incbin). Instead we use xxd as a custom build command to generate a .cpp file which is included in the build. This makes it possible to build on Windows, for which you need cp.exe (from GNU Core Utils) and xxd.exe (from Vim). Change-Id: I3a929640b1fdbfc27e2c38abd05bf3a298245ba5 Signed-off-by: Robert Hughes <robert.hughes@arm.com>
2019-12-31Some build fixes for MSVCRob Hughes
Change-Id: I749430918b1268786690c3c8dc9fa2a9542d5d1d Signed-off-by: Robert Hughes <robert.hughes@arm.com>
2019-12-19IVGCVSW-4237 Solve build dependencies to allow isolated build on sbuildFrancis Murtagh
* Remove FindBoost search for libboost-log which caused unnecessary dependency. Signed-off-by: Francis Murtagh <francis.murtagh@arm.com> Change-Id: I58e30ca8ca76106ef08ddc782c462e96ddb211cf
2019-12-10IVGCVSW-4212 Example of standalone dynamic reference backendNarumol Prangnawarat
* Add example to build dynamic reference backend * Add functions to clear dynamic backends * Fix the error when dynamic backend is not deregistered * Add DYARMNN_DYNAMIC_BACKEND_ENABLED to check disable empty dynamic backend when dynamic backend is enabled Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Change-Id: I1ef3a3f10ed6ca5ec18d0af04b007fc3bc71a3cb
2019-11-15Print CMake messages on stdout rather than stderrRob Hughes
The default version of message("...") print to stderr, which is inappropriate for informational messages such as the ones we are printing in these cases. Using message(STATUS "...") makes these messages appear on stdout instead which is more appropriate. Change-Id: I02f41e6b4948e6938566f06d7164444bd5b8199e Signed-off-by: Robert Hughes <robert.hughes@arm.com>
2019-10-31Github #277 Add option to use shared boost librariesMatthew Bentham
Pass -DSHARED_BOOST=ON to cmake to link dynamically to boost. This makes it possible to use standard package-installed boost libraries in a native build. Change-Id: I6cbd72fae8b0cf8ae07f4382ab0510854c1623fd Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
2019-10-18Github #275 Generate versionned librariesMatteo Martincigh
* Improved parsing of the ArmNN's version at compile time * Reading the version directly from the Version.hpp file, to make sure not to break any build made with a different build system than CMake (or Ninja) * The version macro is set in the Version.hpp just like before, so setting it from the command line is no longer necessary !android-nn-driver:2126 Signed-off-by: Guillaume Gardet <guillaume.gardet@arm.com> Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com> Change-Id: I0820094607734d283ded030e4ded0ae6f5889c86
2019-10-17Move version definition to its own fileGuillaume Gardet
* Move the ArmNN version to a separate ArmnnVersion.txt file * Updated makefiles accordingly !referencetests:206978 !android-nn-driver:2110 Signed-off-by: Guillaume Gardet <guillaume.gardet@arm.com> Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com> Change-Id: Ib1a34d38b5f4c7490108ea91d930cf5417d1ca94
2019-10-11IVGCVSW-3721 Add support for startup sequence (Mock Gatord service).Colm Donelan
* Receive and process the stream metadata from the client. * Send the connection ack packet. * Wait in a receiving thread and print the packets. * GatordMockTest and Impl for PeriodicCounterCapture CommandHandler * CaptureData class to retain packet data * MockUtils * Update SocketProfilingConnection to fix non blocking receipt of packets. * Restructure directory layout following review comments. * Extract the mock service into a static library in the cmake files. Signed-off-by: Colm Donelan <Colm.Donelan@arm.com> Signed-off-by: Keith Davis <keith.davis@arm.com> Signed-off-by: Mike Kelly <mike.kelly@arm.com> Signed-off-by: Finn Williams <Finn.Williams@arm.com> Signed-off-by: Kevin May <kevin.may@arm.com> Change-Id: I33c1c9f93976708c9315f71290d42cff53b8c075
2019-09-06IVGCVSW-3719 Create test program executable.Colm Donelan
Introduce a new test utility that simulates the Gatord service. This will be used to test the external profiling features. Change-Id: Ib7c75c1302650e140945cd66d272c23af3aac760 Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
2019-08-28IVGCVSW-3656 Build the reference backend by defaultMatteo Martincigh
* Changed the default value of the new ARMNNREF option to ON in the global makefile, so to always build the reference backend by default, thus keeping the same behaviour as of the previous releases Change-Id: Id4941522ac7987c797ac8331ea421edb2a54287f Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
2019-08-27IVGCVSW-3656 Rename ARMCOMPUTEREF to ARMNNREFMatteo Martincigh
* Renamed ARMCOMPUTEREF to ARMNNREF (and relative symbols) as the previous name was misleading !android-nn-driver:1819 Change-Id: I912e9f521750b91539e48f8a2fb4de73fb6f7425 Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
2019-08-22IVGCVSW-3656 Make the reference backend optionalMatteo Martincigh
* Made the build of the reference backend depend on a new ARMCOMPUTEREF macro * Made the relevant targets dependent on the ref backend * Moved Cl and Neon static registry initializers to separate files * Wrapped some of the unit tests into proper ifdefs where necessary Change-Id: I7f2c42699682630233a4c4b6aed2f005083de189 Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
2019-08-05IVGCVSW-3541 Get the paths where to load the dynamic backends fromMatteo Martincigh
* Adds GetBackendPaths and IsPathValid to DynamicBackendUtils * Adds related unit tests Change-Id: I94e377d92a88a4b5d48026f6ad5b4d5387d20c21 Signed-off-by: Jan Eilers <jan.eilers@arm.com> Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
2019-07-23Add DLL copy commands for armnnTfLiteParser.dllRob Hughes
Change-Id: Ibf4448bc898d2265ddba1be038d8ebc757bcdc2e
2019-07-15Github #226 Use correct paths returned by FindBoost.cmakeMatthew Bentham
According to the documentation in FindBoost.cmake these are the correct output variables. Change-Id: If56874aaafe1577888f73719f0a493088d1ac531 Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
2019-06-26Don't override compiler options specified on command lineMatthew Bentham
Change-Id: Id004415afe70c1b4c97ede2da2613edbb9b4e064 Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
2019-05-09IVGCVSW-2900 Adding the missing option to build the Accuracy ToolÉanna Ó Catháin
to the GlobalConfig.cmake Change-Id: I7f7e3e36fa66c5cd5b2248cab6f2b9b90d65d1a4 Signed-off-by: Éanna Ó Catháin <eanna.ocathain@arm.com>
2019-03-13IVGCVSW-2735 Failure to find flatbuffers is not a fatal build errorRuomei Yan
!referencetests:176231 Change-Id: Ic8a641507c6af2f38e535b0208eb406e74a334a1 Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>
2019-02-25Rename ArmNN schema file to ArmnnSchema.fbsMatthew Bentham
This makes the header file change to ArmnnSchema_generated.h, which is then unambiguous with respect to other generated schema files. Change-Id: Id7785ed74cced4dcd4d6bcbab81e53c6aeba973c Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
2019-02-22IVGCVSW-2735 Fail build if TfLite parser or armnnSerializer can't be builtMatthew Bentham
Change-Id: I39a2fee99218a0a31d8ce6c46d7cc1c0ca5b75d2 Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
2019-02-21IVGCVSW-2610 Add Quantization Tool ExecutableJim Flynn
* Also added TensorInfos to the output slots in the SerializerTests to create valid ArmNN networks for serialization Change-Id: I092b1ac889dd5e05cb1c10c9dfb573acaf1970d9 Signed-off-by: Jim Flynn <jim.flynn@arm.com>
2019-02-11IVGCVSW-2581 Create DeserializerKevin May
* Add deserialize parser for input, output and add layers * Add Unit Tests for simple network Change-Id: Ia0e2a234896bbe401ed0da5f18c065cb5df51bfb Signed-off-by: Kevin May <kevin.may@arm.com> Signed-off-by: Saoirse Stewart <saoirse.stewart@arm.com>