projects / platform / upstream / armnn.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update ACL pin to b84f9d34dbb857ad6113c0c89ad109498fa75fe5
[platform/upstream/armnn.git] / Android.mk
diff --git a/Android.mk b/Android.mk
index 9a38a72..f767b20 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,10 @@ LOCAL_PATH := $(call my-dir)
 OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include
 NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
 ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
+ARMNN_PROFILING_INCLUDE_PATH := $(LOCAL_PATH)/profiling
+ARMNN_PROFILING_COMMON_INCLUDE_PATH := $(LOCAL_PATH)/profiling/common/include
+ARMNN_TIMELINE_DECODER_INCLUDE_PATH := $(LOCAL_PATH)/src/timelineDecoder
+ARMNN_THIRD_PARTY_INCLUDE_PATH := $(LOCAL_PATH)/third-party
 ARMNN_MAIN_HEADER_PATH := $(LOCAL_PATH)/src
 ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn
 ARMNN_SOURCE_UTILS_HEADER_PATH := $(LOCAL_PATH)/src/armnnUtils
@@ -64,6 +68,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk \
 LOCAL_EXPORT_C_INCLUDES := \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
+        $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
+        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
         $(ARMNN_PROFILING_HEADER_PATH) \
         $(ARMNN_BACKENDS_HEADER_PATH)
@@ -72,6 +80,10 @@ LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
+        $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
+        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
@@ -80,6 +92,16 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SRC_FILES := \
         $(ARMNN_BACKEND_SOURCES) \
+        profiling/common/src/CommandHandlerFunctor.cpp \
+        profiling/common/src/CommandHandlerKey.cpp \
+        profiling/common/src/CommandHandlerRegistry.cpp \
+        profiling/common/src/CommonProfilingUtils.cpp \
+        profiling/common/src/NetworkSockets.cpp \
+        profiling/common/src/PacketVersionResolver.cpp \
+        profiling/common/src/SwTrace.cpp \
+        profiling/server/src/timelineDecoder/TimelineCaptureCommandHandler.cpp \
+        profiling/server/src/timelineDecoder/TimelineDecoder.cpp \
+        profiling/server/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.cpp \
         src/armnn/BackendHelper.cpp \
         src/armnn/BackendRegistry.cpp \
         src/armnn/Descriptors.cpp \
@@ -95,7 +117,6 @@ LOCAL_SRC_FILES := \
         src/armnn/NetworkUtils.cpp \
         src/armnn/Observable.cpp \
         src/armnn/Optimizer.cpp \
-        src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.cpp \
         src/armnn/OutputHandler.cpp \
         src/armnn/ProfilingEvent.cpp \
         src/armnn/Profiling.cpp \
@@ -117,9 +138,10 @@ LOCAL_SRC_FILES := \
         src/armnnUtils/Permute.cpp \
         src/armnnUtils/TensorUtils.cpp \
         src/armnnUtils/VerificationHelpers.cpp \
-        src/armnnUtils/NetworkSockets.cpp \
         src/armnnUtils/Filesystem.cpp \
         src/armnnUtils/Processes.cpp \
+        src/armnnUtils/Threads.cpp \
+        src/armnnUtils/Transpose.cpp \
         src/armnn/layers/ActivationLayer.cpp \
         src/armnn/layers/AdditionLayer.cpp \
         src/armnn/layers/ArgMinMaxLayer.cpp \
@@ -129,7 +151,9 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/ConcatLayer.cpp \
         src/armnn/layers/ConstantLayer.cpp \
         src/armnn/layers/Convolution2dLayer.cpp \
+        src/armnn/layers/ConvertBf16ToFp32Layer.cpp \
         src/armnn/layers/ConvertFp16ToFp32Layer.cpp \
+        src/armnn/layers/ConvertFp32ToBf16Layer.cpp \
         src/armnn/layers/ConvertFp32ToFp16Layer.cpp \
         src/armnn/layers/DebugLayer.cpp \
         src/armnn/layers/DepthToSpaceLayer.cpp \
@@ -140,6 +164,7 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/ElementwiseBaseLayer.cpp \
         src/armnn/layers/ElementwiseUnaryLayer.cpp \
         src/armnn/layers/FakeQuantizationLayer.cpp \
+        src/armnn/layers/FillLayer.cpp \
         src/armnn/layers/FloorLayer.cpp \
         src/armnn/layers/FullyConnectedLayer.cpp \
         src/armnn/layers/GatherLayer.cpp \
@@ -162,8 +187,10 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/Pooling2dLayer.cpp \
         src/armnn/layers/PreCompiledLayer.cpp \
         src/armnn/layers/PreluLayer.cpp \
+        src/armnn/layers/QLstmLayer.cpp \
         src/armnn/layers/QuantizeLayer.cpp \
         src/armnn/layers/QuantizedLstmLayer.cpp \
+        src/armnn/layers/RankLayer.cpp \
         src/armnn/layers/ReshapeLayer.cpp \
         src/armnn/layers/ResizeLayer.cpp \
         src/armnn/layers/SliceLayer.cpp \
@@ -177,20 +204,19 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/SubtractionLayer.cpp \
         src/armnn/layers/SwitchLayer.cpp \
         src/armnn/layers/TransposeConvolution2dLayer.cpp \
+        src/armnn/layers/TransposeLayer.cpp \
+        src/profiling/ActivateTimelineReportingCommandHandler.cpp \
         src/profiling/BufferManager.cpp \
         src/profiling/CommandHandler.cpp \
-        src/profiling/CommandHandlerFunctor.cpp \
-        src/profiling/CommandHandlerKey.cpp \
-        src/profiling/CommandHandlerRegistry.cpp \
         src/profiling/ConnectionAcknowledgedCommandHandler.cpp \
         src/profiling/CounterDirectory.cpp \
         src/profiling/CounterIdMap.cpp \
+        src/profiling/DeactivateTimelineReportingCommandHandler.cpp \
         src/profiling/DirectoryCaptureCommandHandler.cpp \
         src/profiling/FileOnlyProfilingConnection.cpp \
         src/profiling/Holder.cpp \
         src/profiling/LabelsAndEventClasses.cpp \
         src/profiling/PacketBuffer.cpp \
-        src/profiling/PacketVersionResolver.cpp \
         src/profiling/PeriodicCounterCapture.cpp \
         src/profiling/PeriodicCounterSelectionCommandHandler.cpp \
         src/profiling/PerJobCounterSelectionCommandHandler.cpp \
@@ -199,15 +225,18 @@ LOCAL_SRC_FILES := \
         src/profiling/ProfilingService.cpp \
         src/profiling/ProfilingStateMachine.cpp \
         src/profiling/ProfilingUtils.cpp \
+        src/profiling/RegisterBackendCounters.cpp \
         src/profiling/RequestCounterDirectoryCommandHandler.cpp \
         src/profiling/SendCounterPacket.cpp \
+        src/profiling/SendThread.cpp \
         src/profiling/SendTimelinePacket.cpp \
         src/profiling/SocketProfilingConnection.cpp \
         src/profiling/TimelinePacketWriterFactory.cpp \
-        src/profiling/TimelineUtilityMethods.cpp
+        src/profiling/TimelineUtilityMethods.cpp \
+        src/profiling/backends/BackendProfiling.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-        armnn-arm_compute \
+        arm_compute_library \
         libboost_log \
         libboost_system \
         libboost_thread \
@@ -220,7 +249,8 @@ LOCAL_CFLAGS := \
         -std=$(CPP_VERSION) \
         -fexceptions \
         -Wno-unused-parameter \
-        -frtti
+        -frtti \
+        -DFMT_HEADER_ONLY
 
 # The variable to enable/disable the CL backend (ARMNN_COMPUTE_CL_ENABLED) is declared in android-nn-driver/Android.mk
 ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
@@ -286,6 +316,10 @@ LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
+        $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
+        $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
@@ -321,22 +355,67 @@ endif # PLATFORM_VERSION == Q or later
 
 LOCAL_SRC_FILES := \
         $(ARMNN_BACKEND_TEST_SOURCES) \
+        src/armnn/test/ConstTensorLayerVisitor.cpp \
+        src/armnn/test/CsvReaderTest.cpp \
         src/armnn/test/EndToEndTest.cpp \
+        src/armnn/ExecutionFrame.cpp \
+        src/armnn/test/ExecutionFrameTest.cpp \
+        src/armnn/test/FloatingPointConverterTest.cpp \
+        src/armnn/test/FlowControl.cpp \
         src/armnn/test/GraphTests.cpp \
         src/armnn/test/GraphUtils.cpp \
         src/armnn/test/InferOutputTests.cpp \
         src/armnn/test/InstrumentTests.cpp \
+        src/armnnUtils/ModelAccuracyChecker.cpp \
+        src/armnn/test/ModelAccuracyCheckerTest.cpp \
         src/armnn/test/NetworkTests.cpp \
         src/armnn/test/ObservableTest.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/InsertDebugLayerTests.cpp \
+        src/armnn/test/optimizations/MovePermuteUpTests.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/OptimizerTests.cpp \
         src/armnn/test/OptionalTest.cpp \
+        src/armnn/test/ProfilerTests.cpp \
         src/armnn/test/ProfilingEventTest.cpp \
+        src/armnnUtils/PrototxtConversions.cpp \
+        src/armnnUtils/test/PrototxtConversionsTest.cpp \
         src/armnn/test/SubgraphViewTests.cpp \
         src/armnn/test/TensorHandleStrategyTest.cpp \
         src/armnn/test/TensorTest.cpp \
+        src/armnn/test/TestInputOutputLayerVisitor.cpp \
+        src/armnn/test/TestLayerVisitor.cpp \
+        src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp \
+        src/armnn/test/TestNameOnlyLayerVisitor.cpp \
         src/armnn/test/TestUtils.cpp \
         src/armnn/test/UnitTests.cpp \
         src/armnn/test/UtilsTests.cpp \
-        src/profiling/test/ProfilingTestUtils.cpp
+        src/armnnUtils/test/ParserHelperTest.cpp \
+        src/armnnUtils/test/QuantizeHelperTest.cpp \
+        src/armnnUtils/test/TensorUtilsTest.cpp \
+        src/profiling/test/BufferTests.cpp \
+        src/profiling/test/FileOnlyProfilingDecoratorTests.cpp \
+        src/profiling/test/PrintPacketHeaderHandler.cpp \
+        src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp \
+        src/profiling/test/ProfilingGuidTest.cpp \
+        src/profiling/test/ProfilingTests.cpp \
+        src/profiling/test/ProfilingTestUtils.cpp \
+        src/profiling/test/SendCounterPacketTests.cpp \
+        src/profiling/test/SendTimelinePacketTests.cpp \
+        src/profiling/test/TestTimelinePacketHandler.cpp \
+        src/profiling/test/TimelineModel.cpp \
+        src/profiling/test/TimelinePacketTests.cpp \
+        src/profiling/test/TimelineUtilityMethodsTests.cpp
 
 ifeq ($(ARMNN_REF_ENABLED),1)
 LOCAL_SRC_FILES += \
@@ -351,7 +430,7 @@ LOCAL_STATIC_LIBRARIES := \
         libboost_unit_test_framework \
         libboost_thread \
         libboost_filesystem \
-        armnn-arm_compute
+        arm_compute_library
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
 
@@ -366,7 +445,7 @@ LOCAL_SHARED_LIBRARIES := \
         android.hidl.allocator@1.0 \
         android.hidl.memory@1.0
 
-ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
+ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
 LOCAL_SHARED_LIBRARIES += \
         libOpenCL
 endif
Domain: Machine Learning / ML Framework;