#
-# Copyright © 2017 Arm Ltd. All rights reserved.
+# Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+# Copyright 2020 NXP
# SPDX-License-Identifier: MIT
#
cmake_minimum_required (VERSION 3.0.2) # 3.0.2 required for return() statement used in AddDllCopyCommands.cmake
set(additional_cmake_files)
list(APPEND additional_cmake_files
cmake/ArmnnVersion.cmake
+ cmake/DelegateVersion.cmake
+ cmake/ParserVersion.cmake
cmake/Utils.cmake
cmake/GlobalConfig.cmake
cmake/AddDllCopyCommands.cmake)
include(${cmake_file})
endforeach()
+cmake_policy(SET CMP0057 NEW)
+
+set(as_subproject Armnn)
+
+macro(find_package)
+ if(NOT ${ARGV0} IN_LIST as_subproject)
+ _find_package(${ARGV})
+ endif()
+endmacro()
+
if (DYNAMIC_BACKEND_PATHS)
# It's expected to have the format: DYNAMIC_BACKEND_PATHS="PATH_1:PATH_2...:PATH_N"
add_definitions('-DDYNAMIC_BACKEND_PATHS="${DYNAMIC_BACKEND_PATHS}"')
add_subdirectory(samples)
add_subdirectory(src/armnnTfLiteParser)
add_subdirectory(src/armnnSerializer)
+add_subdirectory(src/armnnDeserializer)
+
+
+if (BUILD_ARMNN_TFLITE_DELEGATE)
+ set(ARMNN_SUB_PROJECT ON)
+ add_subdirectory(delegate)
+ add_definitions(-DARMNN_TF_LITE_DELEGATE)
+endif()
if (BUILD_TESTS)
add_subdirectory(tests)
list(APPEND armnnUtils_sources
include/armnnUtils/DataLayoutIndexed.hpp
include/armnnUtils/Permute.hpp
+ include/armnnUtils/FloatingPointComparison.hpp
include/armnnUtils/FloatingPointConverter.hpp
include/armnnUtils/TensorUtils.hpp
+ include/armnnUtils/Transpose.hpp
+ src/armnnUtils/BFloat16.hpp
src/armnnUtils/Filesystem.hpp
src/armnnUtils/Filesystem.cpp
- src/armnnUtils/Processes.hpp
- src/armnnUtils/Processes.cpp
src/armnnUtils/GraphTopologicalSort.hpp
src/armnnUtils/Half.hpp
src/armnnUtils/Permute.cpp
src/armnnUtils/LeakChecking.hpp
src/armnnUtils/ModelAccuracyChecker.cpp
src/armnnUtils/ModelAccuracyChecker.hpp
- src/armnnUtils/CsvReader.cpp
- src/armnnUtils/CsvReader.hpp
src/armnnUtils/FloatingPointConverter.cpp
src/armnnUtils/VerificationHelpers.hpp
src/armnnUtils/VerificationHelpers.cpp
src/armnnUtils/ParserHelper.hpp
src/armnnUtils/ParserHelper.cpp
src/armnnUtils/ParserPrototxtFixture.hpp
+ src/armnnUtils/Processes.hpp
+ src/armnnUtils/Processes.cpp
src/armnnUtils/PrototxtConversions.hpp
src/armnnUtils/PrototxtConversions.cpp
src/armnnUtils/QuantizeHelper.hpp
src/armnnUtils/TensorIOUtils.hpp
src/armnnUtils/TensorUtils.cpp
- src/armnnUtils/NetworkSockets.hpp
- src/armnnUtils/NetworkSockets.cpp
+ src/armnnUtils/Threads.hpp
+ src/armnnUtils/Threads.cpp
+ src/armnnUtils/Transpose.cpp
)
add_library_ex(armnnUtils STATIC ${armnnUtils_sources})
set(armnn_caffe_parser_sources)
list(APPEND armnn_caffe_parser_sources
include/armnnCaffeParser/ICaffeParser.hpp
+ include/armnnCaffeParser/Version.hpp
src/armnnCaffeParser/RecordByRecordCaffeParser.hpp
src/armnnCaffeParser/RecordByRecordCaffeParser.cpp
src/armnnCaffeParser/CaffeParser.hpp
target_include_directories(armnnCaffeParser PRIVATE src/armnnUtils)
- target_link_libraries(armnnCaffeParser ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY})
-
target_link_libraries(armnnCaffeParser armnn)
target_link_libraries(armnnCaffeParser ${PROTOBUF_LIBRARIES})
- set_target_properties(armnnCaffeParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ set_target_properties(armnnCaffeParser PROPERTIES VERSION ${CAFFE_PARSER_LIB_VERSION} SOVERSION ${CAFFE_PARSER_LIB_SOVERSION})
endif()
set(armnn_onnx_parser_sources)
list(APPEND armnn_onnx_parser_sources
include/armnnOnnxParser/IOnnxParser.hpp
+ include/armnnOnnxParser/Version.hpp
src/armnnOnnxParser/OnnxParser.hpp
src/armnnOnnxParser/OnnxParser.cpp
${ONNX_GENERATED_SOURCES}/onnx/onnx.pb.cc
# Protobuf
target_link_libraries(armnnOnnxParser ${PROTOBUF_LIBRARIES})
- set_target_properties(armnnOnnxParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ set_target_properties(armnnOnnxParser PROPERTIES VERSION ${ONNX_PARSER_LIB_VERSION} SOVERSION ${ONNX_PARSER_LIB_SOVERSION})
endif()
if(BUILD_TF_PARSER)
set(armnn_tf_parser_sources)
list(APPEND armnn_tf_parser_sources
include/armnnTfParser/ITfParser.hpp
+ include/armnnTfParser/Version.hpp
src/armnnTfParser/TfParser.hpp
src/armnnTfParser/TfParser.cpp
${TF_PROTOBUFS}
)
# The generated tensorflow protobuf .cc files are not warning clean and we can't fix them.
if(COMPILER_IS_GNU_LIKE)
- set_source_files_properties(${TF_PROTOBUFS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion")
+ set_source_files_properties(${TF_PROTOBUFS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion -Wno-error=deprecated-declarations")
endif()
add_library_ex(armnnTfParser SHARED ${armnn_tf_parser_sources})
# Protobuf (use the specific version tensorflow wants)
target_link_libraries(armnnTfParser ${PROTOBUF_LIBRARIES})
- set_target_properties(armnnTfParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ set_target_properties(armnnTfParser PROPERTIES VERSION ${TF_PARSER_LIB_VERSION} SOVERSION ${TF_PARSER_LIB_SOVERSION})
endif()
if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
target_include_directories(armnnQuantizer PRIVATE include/armnnDeserializer)
target_include_directories(armnnQuantizer PRIVATE src/armnnUtils)
target_include_directories(armnnQuantizer PRIVATE src/armnn)
+ target_include_directories(armnnQuantizer PRIVATE third-party)
include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}")
set_target_properties(armnnQuantizer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
- target_link_libraries(armnnQuantizer
- armnn
- ${Boost_SYSTEM_LIBRARY}
- ${Boost_PROGRAM_OPTIONS_LIBRARY}
- ${Boost_FILESYSTEM_LIBRARY}
- ${Boost_THREAD_LIBRARY} )
+ target_link_libraries(armnnQuantizer armnn)
- add_executable_ex(ArmnnQuantizer
+ add_executable_ex(ArmnnQuantizerMain
src/armnnQuantizer/ArmNNQuantizerMain.cpp)
- target_include_directories(ArmnnQuantizer PRIVATE include/armnnDeserializer)
- target_include_directories(ArmnnQuantizer PRIVATE src/armnn)
+ # cmake does not allow same executable and library name
+ # workaround that by rename that using set_target_properties
+ set_target_properties(ArmnnQuantizerMain
+ PROPERTIES OUTPUT_NAME ArmnnQuantizer)
- target_link_libraries(ArmnnQuantizer
- ${Boost_SYSTEM_LIBRARY}
- ${Boost_PROGRAM_OPTIONS_LIBRARY}
- ${Boost_FILESYSTEM_LIBRARY}
- ${Boost_THREAD_LIBRARY} )
+ target_include_directories(ArmnnQuantizerMain PRIVATE include/armnnDeserializer)
+ target_include_directories(ArmnnQuantizerMain PRIVATE src/armnn)
- target_link_libraries(ArmnnQuantizer
+ target_link_libraries(ArmnnQuantizerMain
armnnQuantizer
armnnSerializer
armnn
${FLATBUFFERS_LIBRARY})
if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
- target_link_libraries(ArmnnQuantizer pthread)
+ target_link_libraries(ArmnnQuantizerMain pthread)
endif()
set_target_properties(armnnQuantizer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
include/armnn/INetwork.hpp
include/armnn/IProfiler.hpp
include/armnn/IRuntime.hpp
+ include/armnn/IStrategy.hpp
include/armnn/LayerSupport.hpp
include/armnn/LayerVisitorBase.hpp
include/armnn/Logging.hpp
include/armnn/Version.hpp
include/armnn/profiling/IProfilingGuidGenerator.hpp
include/armnn/profiling/ISendTimelinePacket.hpp
+ include/armnn/utility/Assert.hpp
+ include/armnn/utility/IgnoreUnused.hpp
+ include/armnn/utility/NumericCast.hpp
+ include/armnn/utility/PolymorphicDowncast.hpp
+ include/armnn/utility/StringUtils.hpp
+ include/armnn/utility/TransformIterator.hpp
src/armnn/layers/LayerCloneBase.hpp
src/armnn/layers/LayerWithParameters.hpp
src/armnn/layers/ActivationLayer.hpp
src/armnn/layers/ConstantLayer.cpp
src/armnn/layers/Convolution2dLayer.hpp
src/armnn/layers/Convolution2dLayer.cpp
+ src/armnn/layers/ConvertBf16ToFp32Layer.cpp
+ src/armnn/layers/ConvertBf16ToFp32Layer.hpp
src/armnn/layers/ConvertFp16ToFp32Layer.hpp
src/armnn/layers/ConvertFp16ToFp32Layer.cpp
+ src/armnn/layers/ConvertFp32ToBf16Layer.hpp
+ src/armnn/layers/ConvertFp32ToBf16Layer.cpp
src/armnn/layers/ConvertFp32ToFp16Layer.hpp
src/armnn/layers/ConvertFp32ToFp16Layer.cpp
src/armnn/layers/DebugLayer.hpp
src/armnn/layers/ElementwiseUnaryLayer.cpp
src/armnn/layers/FakeQuantizationLayer.hpp
src/armnn/layers/FakeQuantizationLayer.cpp
+ src/armnn/layers/FillLayer.hpp
+ src/armnn/layers/FillLayer.cpp
src/armnn/layers/FloorLayer.hpp
src/armnn/layers/FloorLayer.cpp
src/armnn/layers/FullyConnectedLayer.hpp
src/armnn/layers/InstanceNormalizationLayer.cpp
src/armnn/layers/L2NormalizationLayer.hpp
src/armnn/layers/L2NormalizationLayer.cpp
+ src/armnn/layers/LogicalBinaryLayer.hpp
+ src/armnn/layers/LogicalBinaryLayer.cpp
src/armnn/layers/LogSoftmaxLayer.hpp
src/armnn/layers/LogSoftmaxLayer.cpp
src/armnn/layers/LstmLayer.cpp
src/armnn/layers/LstmLayer.hpp
+ src/armnn/layers/MapLayer.cpp
+ src/armnn/layers/MapLayer.hpp
src/armnn/layers/MaximumLayer.cpp
src/armnn/layers/MaximumLayer.hpp
src/armnn/layers/MeanLayer.hpp
src/armnn/layers/Pooling2dLayer.cpp
src/armnn/layers/QuantizeLayer.cpp
src/armnn/layers/QuantizeLayer.hpp
+ src/armnn/layers/QLstmLayer.hpp
+ src/armnn/layers/QLstmLayer.cpp
src/armnn/layers/QuantizedLstmLayer.hpp
src/armnn/layers/QuantizedLstmLayer.cpp
src/armnn/layers/DivisionLayer.cpp
src/armnn/layers/PreCompiledLayer.cpp
src/armnn/layers/PreluLayer.hpp
src/armnn/layers/PreluLayer.cpp
+ src/armnn/layers/RankLayer.hpp
+ src/armnn/layers/RankLayer.cpp
+ src/armnn/layers/ReduceLayer.hpp
+ src/armnn/layers/ReduceLayer.cpp
src/armnn/layers/ReshapeLayer.hpp
src/armnn/layers/ReshapeLayer.cpp
src/armnn/layers/ResizeLayer.hpp
src/armnn/layers/SwitchLayer.hpp
src/armnn/layers/TransposeConvolution2dLayer.cpp
src/armnn/layers/TransposeConvolution2dLayer.hpp
+ src/armnn/layers/TransposeLayer.hpp
+ src/armnn/layers/TransposeLayer.cpp
+ src/armnn/layers/UnmapLayer.cpp
+ src/armnn/layers/UnmapLayer.hpp
src/armnn/BackendRegistry.cpp
src/armnn/BackendSettings.hpp
src/armnn/BackendHelper.cpp
src/armnn/Descriptors.cpp
src/armnn/DeviceSpec.hpp
src/armnn/DllExport.hpp
- src/armnn/DynamicQuantizationVisitor.cpp
- src/armnn/DynamicQuantizationVisitor.hpp
+ src/armnn/DynamicQuantizationStrategy.cpp
+ src/armnn/DynamicQuantizationStrategy.hpp
src/armnn/Exceptions.cpp
src/armnn/ExecutionFrame.cpp
src/armnn/ExecutionFrame.hpp
src/armnn/ProfilingEvent.cpp
src/armnn/ProfilingEvent.hpp
src/armnn/Profiling.hpp
- src/armnn/QuantizerVisitor.cpp
- src/armnn/QuantizerVisitor.hpp
+ src/armnn/QuantizerStrategy.hpp
+ src/armnn/QuantizerStrategy.cpp
src/armnn/Runtime.cpp
src/armnn/Runtime.hpp
src/armnn/RangeTracker.cpp
src/armnn/ResolveType.hpp
src/armnn/SerializeLayerParameters.cpp
src/armnn/SerializeLayerParameters.hpp
- src/armnn/StaticRangeVisitor.cpp
- src/armnn/StaticRangeVisitor.hpp
+ src/armnn/StaticRangeStrategy.cpp
+ src/armnn/StaticRangeStrategy.hpp
src/armnn/SubgraphView.cpp
src/armnn/SubgraphView.hpp
src/armnn/SubgraphViewSelector.cpp
src/armnn/Utils.cpp
src/armnn/WallClockTimer.cpp
src/armnn/WallClockTimer.hpp
+ src/armnn/optimizations/AddBroadcastReshapeLayer.hpp
src/armnn/optimizations/AddDebug.hpp
src/armnn/optimizations/All.hpp
src/armnn/optimizations/ConvertConstants.hpp
+ src/armnn/optimizations/ConvertFp32NetworkToBf16.hpp
src/armnn/optimizations/ConvertFp32NetworkToFp16.hpp
src/armnn/optimizations/FoldPadIntoConvolution2d.hpp
src/armnn/optimizations/MovePermuteUp.hpp
+ src/armnn/optimizations/MoveTransposeUp.hpp
src/armnn/optimizations/Optimization.hpp
src/armnn/optimizations/OptimizeConsecutiveReshapes.hpp
src/armnn/optimizations/OptimizeInverseConversions.hpp
src/armnn/optimizations/OptimizeInversePermutes.hpp
src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp
- src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.cpp
src/armnn/optimizations/PermuteAsReshape.hpp
src/armnn/optimizations/SquashEqualSiblings.hpp
+ src/profiling/ActivateTimelineReportingCommandHandler.cpp
+ src/profiling/ActivateTimelineReportingCommandHandler.hpp
src/profiling/BufferManager.cpp
src/profiling/BufferManager.hpp
src/profiling/CommandHandler.cpp
src/profiling/CommandHandler.hpp
- src/profiling/CommandHandlerFunctor.cpp
- src/profiling/CommandHandlerFunctor.hpp
- src/profiling/CommandHandlerKey.cpp
- src/profiling/CommandHandlerKey.hpp
- src/profiling/CommandHandlerRegistry.cpp
- src/profiling/CommandHandlerRegistry.hpp
src/profiling/ConnectionAcknowledgedCommandHandler.cpp
src/profiling/ConnectionAcknowledgedCommandHandler.hpp
src/profiling/CounterDirectory.cpp
src/profiling/CounterDirectory.hpp
src/profiling/CounterIdMap.cpp
src/profiling/CounterIdMap.hpp
+ src/profiling/DeactivateTimelineReportingCommandHandler.cpp
+ src/profiling/DeactivateTimelineReportingCommandHandler.hpp
src/profiling/DirectoryCaptureCommandHandler.cpp
src/profiling/DirectoryCaptureCommandHandler.hpp
- src/profiling/EncodeVersion.hpp
src/profiling/FileOnlyProfilingConnection.cpp
src/profiling/FileOnlyProfilingConnection.hpp
src/profiling/Holder.cpp
src/profiling/Holder.hpp
src/profiling/IBufferManager.hpp
+ src/profiling/IConsumer.hpp
src/profiling/ICounterDirectory.hpp
src/profiling/ICounterRegistry.hpp
src/profiling/ICounterValues.hpp
+ src/profiling/INotifyBackends.hpp
+ src/profiling/IReportStructure.hpp
src/profiling/ISendCounterPacket.hpp
+ src/profiling/ISendThread.hpp
src/profiling/IPacketBuffer.hpp
src/profiling/IPeriodicCounterCapture.hpp
src/profiling/IProfilingConnection.hpp
src/profiling/IProfilingConnectionFactory.hpp
src/profiling/LabelsAndEventClasses.cpp
src/profiling/LabelsAndEventClasses.hpp
- src/profiling/Packet.hpp
+ src/profiling/NullProfilingConnection.hpp
src/profiling/PacketBuffer.cpp
src/profiling/PacketBuffer.hpp
- src/profiling/PacketVersionResolver.cpp
- src/profiling/PacketVersionResolver.hpp
src/profiling/PeriodicCounterCapture.hpp
src/profiling/PeriodicCounterCapture.cpp
src/profiling/PeriodicCounterSelectionCommandHandler.cpp
src/profiling/RequestCounterDirectoryCommandHandler.hpp
src/profiling/SendCounterPacket.cpp
src/profiling/SendCounterPacket.hpp
+ src/profiling/SendThread.cpp
+ src/profiling/SendThread.hpp
src/profiling/SendTimelinePacket.cpp
src/profiling/SendTimelinePacket.hpp
src/profiling/SocketProfilingConnection.cpp
src/profiling/TimelineUtilityMethods.hpp
src/profiling/backends/BackendProfiling.cpp
src/profiling/backends/BackendProfiling.hpp
+ third-party/cxxopts/cxxopts.hpp
+ third-party/ghc/filesystem.hpp
third-party/half/half.hpp
+ third-party/mapbox/optional.hpp
+ third-party/mapbox/recursive_wrapper.hpp
+ third-party/mapbox/variant.hpp
+ third-party/mapbox/variant_cast.hpp
+ third-party/mapbox/variant_io.hpp
+ third-party/mapbox/variant_visitor.hpp
)
# Files used for Streamline-based profiling backend
${GATOR_ROOT}/annotate/streamline_annotate.c)
endif()
+set_source_files_properties(${armnn_sources} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-parameter -Wno-conversion -Wno-sign-conversion -Wno-error=deprecated-copy")
+
# the backends under src/backends extend the list of
# object libs armnn to include in the build
include(src/backends/backends.cmake)
target_compile_definitions(armnn PRIVATE "ARMNN_COMPILING_DLL")
-target_include_directories(armnn PRIVATE src/armnn)
-target_include_directories(armnn PRIVATE src/armnnUtils)
-target_include_directories(armnn PRIVATE src/backends)
-target_include_directories(armnn PRIVATE src/profiling)
+target_include_directories(armnn
+ PUBLIC
+ $<INSTALL_INTERFACE:include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ PRIVATE
+ src/armnn
+ src/armnnUtils
+ src/backends
+ src/profiling
+ profiling/common/include
+)
target_link_libraries(armnn armnnUtils)
+# only link pipeCommon if it has been built
+if(BUILD_TIMELINE_DECODER)
+ target_link_libraries(armnn pipeCommon)
+endif()
target_link_libraries(armnn ${CMAKE_DL_LIBS})
-if ("${CMAKE_SYSTEM_NAME}" STREQUAL Windows)
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL Windows)
target_link_libraries(armnn Ws2_32.lib)
endif()
-install(TARGETS armnn
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+# Link fmt third-party library
+add_subdirectory(third-party/fmt)
+target_link_libraries(armnn fmt)
+
if(BUILD_CAFFE_PARSER)
install(TARGETS armnnCaffeParser
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-target_link_libraries(armnn ${Boost_THREAD_LIBRARY}
- ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
-
if(ARMCOMPUTENEON OR ARMCOMPUTECL)
target_link_libraries(armnn ${ARMCOMPUTE_LIBRARIES})
endif()
src/armnn/test/ConstTensorLayerVisitor.hpp
src/armnn/test/ConstTensorLayerVisitor.cpp
src/armnn/test/CreateWorkload.hpp
- src/armnn/test/CsvReaderTest.cpp
src/armnn/test/EndToEndTest.cpp
src/armnn/test/ExecutionFrameTest.cpp
src/armnn/test/FloatingPointConverterTest.cpp
src/armnn/test/NetworkTests.cpp
src/armnn/test/ObservableTest.cpp
src/armnn/test/OptimizerTests.cpp
+ src/armnn/test/optimizations/AddBroadcastReshapeLayerTests.cpp
+ src/armnn/test/optimizations/ConvertConstantsBFloatTests.cpp
src/armnn/test/optimizations/ConvertConstantsFloatToHalfTests.cpp
src/armnn/test/optimizations/ConvertConstantsHalfToFloatTests.cpp
+ src/armnn/test/optimizations/Fp32NetworkToBf16ConverterTests.cpp
src/armnn/test/optimizations/Fp32NetworkToFp16ConverterTests.cpp
+ src/armnn/test/optimizations/FuseActivationTests.cpp
+ src/armnn/test/optimizations/FuseBatchNormTests.cpp
src/armnn/test/optimizations/InsertDebugLayerTests.cpp
src/armnn/test/optimizations/MovePermuteUpTests.cpp
+ src/armnn/test/optimizations/MoveTransposeUpTests.cpp
src/armnn/test/optimizations/OptimizeConsecutiveReshapesTests.cpp
src/armnn/test/optimizations/OptimizeInverseConversionsTests.cpp
src/armnn/test/optimizations/OptimizeInversePermutesTests.cpp
src/armnn/test/optimizations/PermuteAndBatchToSpaceAsDepthToSpaceTests.cpp
src/armnn/test/optimizations/PermuteAsReshapeTests.cpp
src/armnn/test/optimizations/SquashEqualSiblingsTests.cpp
+ src/armnn/test/optimizations/TransposeAsReshapeTests.cpp
src/armnn/test/OptionalTest.cpp
src/armnn/test/ProfilerTests.cpp
src/armnn/test/ProfilingEventTest.cpp
+ src/armnn/test/ShapeInferenceTests.cpp
src/armnn/test/SubgraphViewTests.cpp
src/armnn/test/TensorHandleStrategyTest.cpp
src/armnn/test/TensorHelpers.hpp
src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp
src/armnn/test/TestUtils.cpp
src/armnn/test/TestUtils.hpp
+ src/armnn/test/UtilityTests.cpp
src/armnn/test/UnitTests.cpp
src/armnn/test/UnitTests.hpp
src/armnn/test/UtilsTests.cpp
- src/armnnUtils/test/QuantizeHelperTest.cpp
- src/armnnUtils/test/PrototxtConversionsTest.cpp
+ src/armnnUtils/test/FloatingPointComparisonTest.cpp
src/armnnUtils/test/ParserHelperTest.cpp
+ src/armnnUtils/test/PrototxtConversionsTest.cpp
+ src/armnnUtils/test/QuantizeHelperTest.cpp
src/armnnUtils/test/TensorUtilsTest.cpp
+ src/armnnUtils/test/TransformIteratorTest.cpp
src/profiling/test/BufferTests.cpp
src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
+ src/profiling/test/PrintPacketHeaderHandler.cpp
+ src/profiling/test/PrintPacketHeaderHandler.hpp
src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
src/profiling/test/ProfilingGuidTest.cpp
+ src/profiling/test/ProfilingMocks.hpp
src/profiling/test/ProfilingTests.cpp
src/profiling/test/ProfilingTests.hpp
src/profiling/test/ProfilingTestUtils.cpp
src/profiling/test/ProfilingTestUtils.hpp
+ src/profiling/test/RequestCountersPacketHandler.cpp
+ src/profiling/test/RequestCountersPacketHandler.hpp
src/profiling/test/SendCounterPacketTests.cpp
src/profiling/test/SendCounterPacketTests.hpp
+ src/profiling/test/TestTimelinePacketHandler.cpp
+ src/profiling/test/TestTimelinePacketHandler.hpp
+ src/profiling/test/TimelineModel.cpp
+ src/profiling/test/TimelineModel.hpp
src/profiling/test/SendTimelinePacketTests.cpp
src/profiling/test/TimelinePacketTests.cpp
src/profiling/test/TimelineUtilityMethodsTests.cpp
src/armnnTfParser/test/TestMultiInputsOutputs.cpp
src/armnnTfParser/test/Split.cpp
src/armnnTfParser/test/Squeeze.cpp
+ src/armnnTfParser/test/Stack.cpp
src/armnnTfParser/test/Sub.cpp
+ src/armnnTfParser/test/StridedSlice.cpp
+ src/armnnTfParser/test/Transpose.cpp
)
endif()
src/armnnTfLiteParser/test/Constant.cpp
src/armnnTfLiteParser/test/Conv2D.cpp
src/armnnTfLiteParser/test/DepthwiseConvolution2D.cpp
+ src/armnnTfLiteParser/test/DepthToSpace.cpp
src/armnnTfLiteParser/test/Dequantize.cpp
src/armnnTfLiteParser/test/DetectionPostProcess.cpp
+ src/armnnTfLiteParser/test/Div.cpp
+ src/armnnTfLiteParser/test/Exp.cpp
src/armnnTfLiteParser/test/FullyConnected.cpp
+ src/armnnTfLiteParser/test/Gather.cpp
src/armnnTfLiteParser/test/L2Normalization.cpp
+ src/armnnTfLiteParser/test/LeakyRelu.cpp
+ src/armnnTfLiteParser/test/LoadScopeDynamicTensor.cpp
src/armnnTfLiteParser/test/Maximum.cpp
src/armnnTfLiteParser/test/MaxPool2D.cpp
src/armnnTfLiteParser/test/Mean.cpp
src/armnnTfLiteParser/test/Minimum.cpp
src/armnnTfLiteParser/test/Multiplication.cpp
+ src/armnnTfLiteParser/test/Neg.cpp
src/armnnTfLiteParser/test/Pack.cpp
src/armnnTfLiteParser/test/Pad.cpp
+ src/armnnTfLiteParser/test/Reduce.cpp
src/armnnTfLiteParser/test/Reshape.cpp
src/armnnTfLiteParser/test/ResizeBilinear.cpp
src/armnnTfLiteParser/test/ResizeNearestNeighbor.cpp
src/armnnTfLiteParser/test/SpaceToBatchND.cpp
src/armnnTfLiteParser/test/Slice.cpp
src/armnnTfLiteParser/test/Split.cpp
+ src/armnnTfLiteParser/test/SplitV.cpp
src/armnnTfLiteParser/test/Squeeze.cpp
src/armnnTfLiteParser/test/StridedSlice.cpp
src/armnnTfLiteParser/test/Sub.cpp
+ src/armnnTfLiteParser/test/Sum.cpp
src/armnnTfLiteParser/test/TransposeConv.cpp
src/armnnTfLiteParser/test/Transpose.cpp
src/armnnTfLiteParser/test/Unpack.cpp
src/armnnTfLiteParser/test/GetTensorIds.cpp
src/armnnTfLiteParser/test/GetSubgraphInputsOutputs.cpp
src/armnnTfLiteParser/test/GetInputsOutputs.cpp
+ src/armnnTfLiteParser/test/TfLiteParser.cpp
)
# Generate SchemaText.cpp file which contains the TfLite schema text as a
# static C-array of bytes. This is needed at runtime for TfLite parser tests.
add_custom_command(
OUTPUT SchemaText.cpp
- COMMAND cp ${TF_LITE_SCHEMA_INCLUDE_PATH}/schema.fbs g_TfLiteSchemaText
+ COMMAND cp ${TF_LITE_SCHEMA_PATH}/schema.fbs g_TfLiteSchemaText
COMMAND xxd -i g_TfLiteSchemaText SchemaText.cpp
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${TF_LITE_SCHEMA_INCLUDE_PATH}/schema.fbs
+ DEPENDS ${TF_LITE_SCHEMA_PATH}/schema.fbs
)
list(APPEND unittest_sources ${CMAKE_CURRENT_BINARY_DIR}/SchemaText.cpp)
endif()
if(BUILD_ONNX_PARSER AND ARMNNREF)
list(APPEND unittest_sources
- src/armnnOnnxParser/test/Constructor.cpp
- src/armnnOnnxParser/test/CreateNetwork.cpp
- src/armnnOnnxParser/test/ProtoxtFixture.cpp
+ src/armnnOnnxParser/test/Addition.cpp
+ src/armnnOnnxParser/test/BatchNorm.cpp
+ src/armnnOnnxParser/test/Clip.cpp
src/armnnOnnxParser/test/Const.cpp
- src/armnnOnnxParser/test/Pooling.cpp
- src/armnnOnnxParser/test/Reshape.cpp
- src/armnnOnnxParser/test/Relu.cpp
+ src/armnnOnnxParser/test/Constructor.cpp
src/armnnOnnxParser/test/Conv2D.cpp
- src/armnnOnnxParser/test/Addition.cpp
+ src/armnnOnnxParser/test/CreateNetwork.cpp
+ src/armnnOnnxParser/test/DepthConv.cpp
+ src/armnnOnnxParser/test/Flatten.cpp
src/armnnOnnxParser/test/FullyConnected.cpp
src/armnnOnnxParser/test/GetInputsOutputs.cpp
- src/armnnOnnxParser/test/BatchNorm.cpp
- src/armnnOnnxParser/test/DepthConv.cpp
+ src/armnnOnnxParser/test/Pooling.cpp
+ src/armnnOnnxParser/test/ProtoxtFixture.cpp
+ src/armnnOnnxParser/test/Relu.cpp
+ src/armnnOnnxParser/test/Reshape.cpp
)
endif()
enable_language(ASM)
list(APPEND unittest_sources
src/armnnSerializer/test/ActivationSerializationTests.cpp
+ src/armnnSerializer/test/ComparisonSerializationTests.cpp
+ src/armnnSerializer/test/LstmSerializationTests.cpp
src/armnnSerializer/test/SerializerTests.cpp
+ src/armnnSerializer/test/SerializerTestUtils.cpp
+ src/armnnSerializer/test/SerializerTestUtils.hpp
src/armnnDeserializer/test/DeserializeAbs.cpp
src/armnnDeserializer/test/DeserializeActivation.cpp
src/armnnDeserializer/test/DeserializeAdd.cpp
src/armnnDeserializer/test/DeserializeConvolution2d.cpp
src/armnnDeserializer/test/DeserializeDepthToSpace.cpp
src/armnnDeserializer/test/DeserializeDivision.cpp
+ src/armnnDeserializer/test/DeserializeFill.cpp
src/armnnDeserializer/test/DeserializeFloor.cpp
src/armnnDeserializer/test/DeserializeFullyConnected.cpp
src/armnnDeserializer/test/DeserializeGather.cpp
src/armnnDeserializer/test/DeserializePad.cpp
src/armnnDeserializer/test/DeserializePermute.cpp
src/armnnDeserializer/test/DeserializePooling2d.cpp
+ src/armnnDeserializer/test/DeserializeRank.cpp
+ src/armnnDeserializer/test/DeserializeReduceSum.cpp
src/armnnDeserializer/test/DeserializeReshape.cpp
src/armnnDeserializer/test/DeserializeResizeBilinear.cpp
src/armnnDeserializer/test/DeserializeRsqrt.cpp
if(BUILD_GATORD_MOCK)
list(APPEND unittest_sources
tests/profiling/gatordmock/tests/GatordMockTests.cpp
- tests/profiling/timelineDecoder/tests/TimelineTests.cpp
)
endif()
+ if(BUILD_TIMELINE_DECODER)
+ list(APPEND unittest_sources
+ src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp
+ profiling/server/src/timelineDecoder/tests/TimelineTests.cpp
+ )
+ endif()
+
+ if(BUILD_BASE_PIPE_SERVER)
+ list(APPEND unittest_sources
+ profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
+ )
+ endif()
+
foreach(lib ${armnnUnitTestLibraries})
message(STATUS "Adding object library dependency to UnitTests: ${lib}")
list(APPEND unittest_sources $<TARGET_OBJECTS:${lib}>)
endif()
target_link_libraries(UnitTests ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(UnitTests ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
+ target_link_libraries(UnitTests ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
target_link_libraries(UnitTests armnn)
target_link_libraries(UnitTests armnnUtils)
target_link_libraries(UnitTests gatordMockService)
endif()
+ if(BUILD_TIMELINE_DECODER)
+ target_link_libraries(UnitTests timelineDecoder)
+ target_link_libraries(UnitTests timelineDecoderJson)
+ endif()
+
if(BUILD_TF_LITE_PARSER)
target_include_directories(UnitTests SYSTEM PRIVATE "${TF_LITE_SCHEMA_INCLUDE_PATH}")
target_include_directories(UnitTests SYSTEM PRIVATE "${FLATBUFFERS_INCLUDE_PATH}")
target_link_libraries(UnitTests armnnOnnxParser)
endif()
+ if(BUILD_BASE_PIPE_SERVER)
+ target_link_libraries(UnitTests armnnBasePipeServer)
+ endif()
+
addDllCopyCommands(UnitTests)
endif()
target_link_libraries(ArmnnConverter armnn)
target_link_libraries(ArmnnConverter ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(ArmnnConverter
- ${Boost_SYSTEM_LIBRARY}
- ${Boost_FILESYSTEM_LIBRARY}
- ${Boost_PROGRAM_OPTIONS_LIBRARY})
addDllCopyCommands(ArmnnConverter)
endif()
+if(BUILD_BASE_PIPE_SERVER)
+ add_subdirectory(profiling/server/src/basePipeServer)
+endif()
+
+if(BUILD_TIMELINE_DECODER)
+ add_subdirectory(profiling/server/src/timelineDecoder)
+ add_subdirectory(profiling/common/src)
+ add_subdirectory(src/timelineDecoder)
+endif()
+
+if(BUILD_GATORD_MOCK AND NOT BUILD_BASE_PIPE_SERVER)
+ message(ERROR, "In order to build GatordMock you must set BUILD_BASE_PIPE_SERVER = YES")
+endif()
+
+if(BUILD_GATORD_MOCK AND NOT BUILD_TIMELINE_DECODER)
+ message(ERROR, "In order to build GatordMock you must set BUILD_TIMELINE_DECODER = YES")
+endif()
+
if(BUILD_GATORD_MOCK)
set(gatord_mock_sources)
list(APPEND gatord_mock_sources
tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.hpp
tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp
tests/profiling/gatordmock/StreamMetadataCommandHandler.hpp
- tests/profiling/timelineDecoder/ITimelineDecoder.h
- tests/profiling/timelineDecoder/TimelineCaptureCommandHandler.cpp
- tests/profiling/timelineDecoder/TimelineCaptureCommandHandler.hpp
- tests/profiling/timelineDecoder/TimelineDecoder.cpp
- tests/profiling/timelineDecoder/TimelineDirectoryCaptureCommandHandler.cpp
- tests/profiling/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp
- tests/profiling/timelineDecoder/tests/TimelineTestFunctions.hpp
+ tests/profiling/gatordmock/StubCommandHandler.hpp
)
- include_directories(${Boost_INCLUDE_DIRS} src/profiling)
- include_directories(${Boost_INCLUDE_DIRS} tests/profiling)
- include_directories(${Boost_INCLUDE_DIRS} tests/profiling/gatordmock)
- include_directories(${Boost_INCLUDE_DIRS} tests/profiling/timelineDecoder)
-
add_library_ex(gatordMockService STATIC ${gatord_mock_sources})
- target_include_directories(gatordMockService PRIVATE src/armnnUtils)
+
+ target_include_directories(gatordMockService PRIVATE profiling/common/include
+ profiling/server/src/basePipeServer
+ src/armnnUtils
+ src/profiling
+ src/timelineDecoder)
+
+ if(BUILD_UNIT_TESTS)
+ target_include_directories(UnitTests PRIVATE tests/profiling/gatordmock)
+ target_include_directories(UnitTests PRIVATE src/backends/backendsCommon/test)
+ endif()
add_executable_ex(GatordMock tests/profiling/gatordmock/GatordMockMain.cpp)
- target_include_directories(GatordMock PRIVATE src/armnnUtils)
+
+ target_include_directories(GatordMock PRIVATE profiling/common/include
+ profiling/server/src/basePipeServer
+ src/armnnUtils
+ src/profiling
+ src/timelineDecoder)
target_link_libraries(GatordMock
- armnn
- gatordMockService
- ${Boost_PROGRAM_OPTIONS_LIBRARY}
- ${Boost_SYSTEM_LIBRARY})
+ armnn
+ armnnBasePipeServer
+ timelineDecoder
+ gatordMockService)
if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
- target_link_libraries(GatordMock pthread)
+ target_link_libraries(GatordMock ${CMAKE_THREAD_LIBS_INIT})
endif()
endif()
+
+####################################################
+# export targets
+set(armnn_export_targets)
+list(APPEND armnn_export_targets
+ armnn
+ armnnUtils
+)
+
+install(
+ TARGETS ${armnn_export_targets}
+ EXPORT armnn-targets
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+####################################################
+## Set export alias
+set_target_properties(armnn
+ PROPERTIES
+ EXPORT_NAME Armnn
+)
+
+## Export target scrips
+install(
+ EXPORT armnn-targets
+ FILE ArmnnTargets.cmake
+ NAMESPACE Armnn::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
+
+####################################################
+## Create ArmnnConfig.cmake
+include(CMakePackageConfigHelpers)
+set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR})
+
+message(STATUS "CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}" )
+message(STATUS "CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}" )
+configure_package_config_file(
+ ${CMAKE_CURRENT_LIST_DIR}/cmake/ArmnnConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
+
+####################################################
+## Install Armnn config file
+install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
+
+####################################################
+## Export from build tree
+export(
+ EXPORT armnn-targets
+ FILE ${CMAKE_CURRENT_BINARY_DIR}/ArmnnTargets.cmake
+ NAMESPACE Armnn::
+)
+
+add_library(Armnn::Armnn ALIAS armnn)
+add_library(Armnn::armnnUtils ALIAS armnnUtils)
+
+####################################################
+## Build Python bindings
+if (BUILD_PYTHON_WHL OR BUILD_PYTHON_SRC)
+ add_subdirectory(python/pyarmnn)
+endif()
projects / platform / upstream / armnn.git / blobdiff