projects / platform / upstream / armnn.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
IVGCVSW-3580: Extend the IProfilingConnection to connect to a Socket
[platform/upstream/armnn.git] / Android.mk
diff --git a/Android.mk b/Android.mk
index 1b0ffea..3640e0c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,12 @@ ARMNN_BACKEND_MAKEFILE_DIRS := $(subst /backend.mk,,$(ARMNN_BACKEND_MAKEFILE_PAT
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libarmnn
+ifeq ($(Q_OR_LATER),1)
+# "eng" is deprecated in Android Q
+LOCAL_MODULE_TAGS := optional
+else
 LOCAL_MODULE_TAGS := eng optional
+endif
 LOCAL_ARM_MODE := arm
 LOCAL_PROPRIETARY_MODULE := true
 
@@ -44,11 +49,13 @@ ARMNN_BACKEND_SOURCES :=
 #
 $(foreach mkPath,$(ARMNN_BACKEND_COMMON_MAKEFILE_DIRS),\
         $(eval include $(LOCAL_PATH)/$(mkPath)/common.mk)\
-        $(eval ARMNN_BACKEND_SOURCES := $(ARMNN_BACKEND_SOURCES) $(patsubst %,$(mkPath)/%,$(COMMON_SOURCES))))
+        $(eval ARMNN_BACKEND_SOURCES := $(ARMNN_BACKEND_SOURCES)\
+        $(patsubst %,$(mkPath)/%,$(COMMON_SOURCES))))
 
 $(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS),\
         $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk)\
-        $(eval ARMNN_BACKEND_SOURCES := $(ARMNN_BACKEND_SOURCES) $(patsubst %,$(mkPath)/%,$(BACKEND_SOURCES))))
+        $(eval ARMNN_BACKEND_SOURCES := $(ARMNN_BACKEND_SOURCES)\
+        $(patsubst %,$(mkPath)/%,$(BACKEND_SOURCES))))
 
 # Mark source files as dependent on Android.mk and backend makefiles
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk \
@@ -71,6 +78,29 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SRC_FILES := \
         $(ARMNN_BACKEND_SOURCES) \
+        src/armnn/BackendHelper.cpp \
+        src/armnn/Descriptors.cpp \
+        src/armnn/Exceptions.cpp \
+        src/armnn/Graph.cpp \
+        src/armnn/InternalTypes.cpp \
+        src/armnn/JsonPrinter.cpp \
+        src/armnn/Layer.cpp \
+        src/armnn/LayerSupport.cpp \
+        src/armnn/LoadedNetwork.cpp \
+        src/armnn/Network.cpp \
+        src/armnn/NetworkUtils.cpp \
+        src/armnn/Observable.cpp \
+        src/armnn/Optimizer.cpp \
+        src/armnn/ProfilingEvent.cpp \
+        src/armnn/Profiling.cpp \
+        src/armnn/Runtime.cpp \
+        src/armnn/SerializeLayerParameters.cpp \
+        src/armnn/SubgraphView.cpp \
+        src/armnn/SubgraphViewSelector.cpp \
+        src/armnn/Tensor.cpp \
+        src/armnn/TypesUtils.cpp \
+        src/armnn/Utils.cpp \
+        src/armnn/WallClockTimer.cpp \
         src/armnnUtils/CsvReader.cpp \
         src/armnnUtils/DataLayoutIndexed.cpp \
         src/armnnUtils/DotSerializer.cpp \
@@ -82,16 +112,20 @@ LOCAL_SRC_FILES := \
         src/armnnUtils/Permute.cpp \
         src/armnnUtils/TensorUtils.cpp \
         src/armnnUtils/VerificationHelpers.cpp \
+        src/armnn/layers/AbsLayer.cpp \
         src/armnn/layers/ActivationLayer.cpp \
         src/armnn/layers/AdditionLayer.cpp \
+        src/armnn/layers/ArgMinMaxLayer.cpp \
         src/armnn/layers/BatchNormalizationLayer.cpp \
         src/armnn/layers/BatchToSpaceNdLayer.cpp \
+        src/armnn/layers/ConcatLayer.cpp \
         src/armnn/layers/ConstantLayer.cpp \
         src/armnn/layers/Convolution2dLayer.cpp \
         src/armnn/layers/ConvertFp16ToFp32Layer.cpp \
         src/armnn/layers/ConvertFp32ToFp16Layer.cpp \
         src/armnn/layers/DebugLayer.cpp \
         src/armnn/layers/DepthwiseConvolution2dLayer.cpp \
+        src/armnn/layers/DequantizeLayer.cpp \
         src/armnn/layers/DetectionPostProcessLayer.cpp \
         src/armnn/layers/DivisionLayer.cpp \
         src/armnn/layers/ElementwiseBaseLayer.cpp \
@@ -107,7 +141,8 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/MaximumLayer.cpp \
         src/armnn/layers/MeanLayer.cpp \
         src/armnn/layers/MemCopyLayer.cpp \
-        src/armnn/layers/MergerLayer.cpp \
+        src/armnn/layers/MemImportLayer.cpp \
+        src/armnn/layers/MergeLayer.cpp \
         src/armnn/layers/MinimumLayer.cpp \
         src/armnn/layers/MultiplicationLayer.cpp \
         src/armnn/layers/NormalizationLayer.cpp \
@@ -116,47 +151,34 @@ LOCAL_SRC_FILES := \
         src/armnn/layers/PermuteLayer.cpp \
         src/armnn/layers/Pooling2dLayer.cpp \
         src/armnn/layers/PreCompiledLayer.cpp \
+        src/armnn/layers/PreluLayer.cpp \
+        src/armnn/layers/QuantizeLayer.cpp \
+        src/armnn/layers/QuantizedLstmLayer.cpp \
         src/armnn/layers/ReshapeLayer.cpp \
-        src/armnn/layers/ResizeBilinearLayer.cpp \
+        src/armnn/layers/ResizeLayer.cpp \
         src/armnn/layers/RsqrtLayer.cpp \
         src/armnn/layers/SpaceToBatchNdLayer.cpp \
+        src/armnn/layers/SpaceToDepthLayer.cpp \
         src/armnn/layers/SoftmaxLayer.cpp \
         src/armnn/layers/SplitterLayer.cpp \
+        src/armnn/layers/StackLayer.cpp \
         src/armnn/layers/StridedSliceLayer.cpp \
         src/armnn/layers/SubtractionLayer.cpp \
-        src/armnn/Descriptors.cpp \
-        src/armnn/Exceptions.cpp \
-        src/armnn/Graph.cpp \
-        src/armnn/Optimizer.cpp \
-        src/armnn/Runtime.cpp \
-        src/armnn/SerializeLayerParameters.cpp \
-        src/armnn/SubGraph.cpp \
-        src/armnn/SubGraphSelector.cpp \
-        src/armnn/InternalTypes.cpp \
-        src/armnn/Layer.cpp \
-        src/armnn/LoadedNetwork.cpp \
-        src/armnn/Network.cpp \
-        src/armnn/NetworkUtils.cpp \
-        src/armnn/WallClockTimer.cpp \
-        src/armnn/ProfilingEvent.cpp \
-        src/armnn/Profiling.cpp \
-        src/armnn/JsonPrinter.cpp \
-        src/armnn/Tensor.cpp \
-        src/armnn/Utils.cpp \
-        src/armnn/LayerSupport.cpp \
-        src/armnn/Observable.cpp
+        src/armnn/layers/SwitchLayer.cpp \
+        src/armnn/layers/TransposeConvolution2dLayer.cpp
 
 LOCAL_STATIC_LIBRARIES := \
         armnn-arm_compute \
         libboost_log \
         libboost_system \
-        libboost_thread
+        libboost_thread \
+        libboost_filesystem
 
 LOCAL_SHARED_LIBRARIES := \
         liblog
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -Wno-unused-parameter \
         -frtti
@@ -170,6 +192,16 @@ ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
 LOCAL_CFLAGS += \
         -DARMCOMPUTENEON_ENABLED
 endif # ARMNN_COMPUTE_NEON_ENABLED == 1
+# The variable to enable/disable the REFERENCE backend (ARMNN_REF_ENABLED) is declared in android-nn-driver/Android.mk
+ifeq ($(ARMNN_REF_ENABLED),1)
+LOCAL_CFLAGS += \
+        -DARMNNREF_ENABLED
+endif # ARMNN_REF_ENABLED == 1
+
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -179,7 +211,12 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := armnn-tests
+ifeq ($(Q_OR_LATER),1)
+# "eng" is deprecated in Android Q
+LOCAL_MODULE_TAGS := optional
+else
 LOCAL_MODULE_TAGS := eng optional
+endif
 LOCAL_ARM_MODE := arm
 LOCAL_PROPRIETARY_MODULE := true
 
@@ -214,7 +251,7 @@ LOCAL_C_INCLUDES := \
         $(ARMNN_BACKENDS_HEADER_PATH)
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -frtti \
         -isystem vendor/arm/android-nn-driver/boost_1_64_0
@@ -228,22 +265,40 @@ ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
 LOCAL_CFLAGS += \
         -DARMCOMPUTENEON_ENABLED
 endif # ARMNN_COMPUTE_NEON_ENABLED == 1
+# The variable to enable/disable the REFERENCE backend (ARMNN_REF_ENABLED) is declared in android-nn-driver/Android.mk
+ifeq ($(ARMNN_REF_ENABLED),1)
+LOCAL_CFLAGS += \
+        -DARMNNREF_ENABLED
+endif # ARMNN_REF_ENABLED == 1
+
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
 
 LOCAL_SRC_FILES := \
         $(ARMNN_BACKEND_TEST_SOURCES) \
-        src/armnn/test/UnitTests.cpp \
         src/armnn/test/EndToEndTest.cpp \
-        src/armnn/test/UtilsTests.cpp \
         src/armnn/test/GraphTests.cpp \
         src/armnn/test/GraphUtils.cpp \
-        src/armnn/test/RuntimeTests.cpp \
-        src/armnn/test/SubGraphTests.cpp \
-        src/armnn/test/TensorTest.cpp \
-        src/armnn/test/NetworkTests.cpp \
+        src/armnn/test/InferOutputTests.cpp \
         src/armnn/test/InstrumentTests.cpp \
-        src/armnn/test/ProfilingEventTest.cpp \
+        src/armnn/test/NetworkTests.cpp \
         src/armnn/test/ObservableTest.cpp \
-        src/armnn/test/OptionalTest.cpp
+        src/armnn/test/OptionalTest.cpp \
+        src/armnn/test/ProfilingEventTest.cpp \
+        src/armnn/test/SubgraphViewTests.cpp \
+        src/armnn/test/TensorHandleStrategyTest.cpp \
+        src/armnn/test/TensorTest.cpp \
+        src/armnn/test/TestUtils.cpp \
+        src/armnn/test/UnitTests.cpp \
+        src/armnn/test/UtilsTests.cpp
+
+ifeq ($(ARMNN_REF_ENABLED),1)
+LOCAL_SRC_FILES += \
+        src/armnn/test/DebugCallbackTest.cpp \
+        src/armnn/test/RuntimeTests.cpp
+endif
 
 LOCAL_STATIC_LIBRARIES := \
         libneuralnetworks_common \
@@ -251,6 +306,7 @@ LOCAL_STATIC_LIBRARIES := \
         libboost_system \
         libboost_unit_test_framework \
         libboost_thread \
+        libboost_filesystem \
         armnn-arm_compute
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -264,7 +320,11 @@ LOCAL_SHARED_LIBRARIES := \
         libutils \
         android.hardware.neuralnetworks@1.0 \
         android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0 \
+        android.hidl.memory@1.0
+
+ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
+LOCAL_SHARED_LIBRARIES += \
         libOpenCL
+endif
 
 include $(BUILD_EXECUTABLE)
Domain: Machine Learning / ML Framework;