Release 18.05.02
diff --git a/Android.mk b/Android.mk
index 14ec703..f008840 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,207 @@
NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn
+ARMNN_SOURCE_UTILS_HEADER_PATH := $(LOCAL_PATH)/src/armnnUtils
+
+##############
+# libarmnn.a #
+##############
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libarmnn
+LOCAL_MODULE_TAGS := eng optional
+LOCAL_ARM_MODE := arm
+LOCAL_PROPRIETARY_MODULE := true
+
+# Mark source files as dependent on Android.mk
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+LOCAL_EXPORT_C_INCLUDES := \
+ $(ARMNN_SOURCE_HEADER_PATH) \
+ $(ARMNN_SOURCE_UTILS_HEADER_PATH)
+
+LOCAL_C_INCLUDES := \
+ $(OPENCL_HEADER_PATH) \
+ $(NN_HEADER_PATH) \
+ $(ARMNN_HEADER_PATH) \
+ $(ARMNN_SOURCE_HEADER_PATH) \
+ $(ARMNN_SOURCE_UTILS_HEADER_PATH)
+
+LOCAL_SRC_FILES := \
+ src/armnnUtils/Logging.cpp \
+ src/armnnUtils/Permute.cpp \
+ src/armnnUtils/DotSerializer.cpp \
+ src/armnn/backends/ArmComputeTensorUtils.cpp \
+ src/armnn/backends/ClWorkloads/ClActivationFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClActivationUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClAdditionFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClBaseConstantWorkload.cpp \
+ src/armnn/backends/ClWorkloads/ClBatchNormalizationFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClConstantFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClConstantUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp \
+ src/armnn/backends/ClWorkloads/ClConvolution2dFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClConvolution2dUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClDepthwiseConvolutionUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClFloorFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClFullyConnectedFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClL2NormalizationFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClMergerFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClMergerUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClMultiplicationFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClNormalizationFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClPermuteWorkload.cpp \
+ src/armnn/backends/ClWorkloads/ClPooling2dBaseWorkload.cpp \
+ src/armnn/backends/ClWorkloads/ClPooling2dFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClPooling2dUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClReshapeFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClReshapeUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClResizeBilinearFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClSoftmaxFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClSoftmaxUint8Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClSplitterFloat32Workload.cpp \
+ src/armnn/backends/ClWorkloads/ClSplitterUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonActivationFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonActivationUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonAdditionFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonBatchNormalizationFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonConstantFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonConstantUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonConvolution2dBaseWorkload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonConvolution2dFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonConvolution2dUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonFloorFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonFullyConnectedFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonL2NormalizationFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonMergerFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonMergerUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonMultiplicationFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonNormalizationFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonPermuteWorkload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonPooling2dBaseWorkload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonPooling2dFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonPooling2dUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonReshapeFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonReshapeUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonSoftmaxFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonSoftmaxUint8Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonSplitterFloat32Workload.cpp \
+ src/armnn/backends/NeonWorkloads/NeonSplitterUint8Workload.cpp \
+ src/armnn/backends/ClWorkloadFactory.cpp \
+ src/armnn/backends/ClContextControl.cpp \
+ src/armnn/backends/CpuTensorHandle.cpp \
+ src/armnn/backends/RefWorkloadFactory.cpp \
+ src/armnn/backends/RefWorkloads/RefMergerUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefResizeBilinearUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/FullyConnected.cpp \
+ src/armnn/backends/RefWorkloads/RefFullyConnectedFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefSoftmaxFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefActivationFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefBatchNormalizationUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/Multiplication.cpp \
+ src/armnn/backends/RefWorkloads/RefMultiplicationUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefBaseConstantWorkload.cpp \
+ src/armnn/backends/RefWorkloads/RefAdditionUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefResizeBilinearFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefBatchNormalizationFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/Broadcast.cpp \
+ src/armnn/backends/RefWorkloads/Addition.cpp \
+ src/armnn/backends/RefWorkloads/RefFakeQuantizationFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/ResizeBilinear.cpp \
+ src/armnn/backends/RefWorkloads/RefSoftmaxUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefDepthwiseConvolution2dFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefPooling2dUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefFloorFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/ConvImpl.cpp \
+ src/armnn/backends/RefWorkloads/Activation.cpp \
+ src/armnn/backends/RefWorkloads/RefReshapeUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefL2NormalizationFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefConvolution2dFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefConvolution2dUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefSplitterFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefActivationUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefSplitterUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefPooling2dFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefMultiplicationFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefReshapeFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefNormalizationFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/Softmax.cpp \
+ src/armnn/backends/RefWorkloads/RefDepthwiseConvolution2dUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefConstantUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefConstantFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/Pooling2d.cpp \
+ src/armnn/backends/RefWorkloads/RefAdditionFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefMergerFloat32Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefFullyConnectedUint8Workload.cpp \
+ src/armnn/backends/RefWorkloads/RefPermuteWorkload.cpp \
+ src/armnn/backends/MemCopyWorkload.cpp \
+ src/armnn/backends/WorkloadData.cpp \
+ src/armnn/backends/WorkloadFactory.cpp \
+ src/armnn/backends/AclBaseMemoryManager.cpp \
+ src/armnn/layers/ActivationLayer.cpp \
+ src/armnn/layers/AdditionLayer.cpp \
+ src/armnn/layers/BatchNormalizationLayer.cpp \
+ src/armnn/layers/ConstantLayer.cpp \
+ src/armnn/layers/Convolution2dLayer.cpp \
+ src/armnn/layers/DepthwiseConvolution2dLayer.cpp \
+ src/armnn/layers/FakeQuantizationLayer.cpp \
+ src/armnn/layers/FloorLayer.cpp \
+ src/armnn/layers/FullyConnectedLayer.cpp \
+ src/armnn/layers/InputLayer.cpp \
+ src/armnn/layers/L2NormalizationLayer.cpp \
+ src/armnn/layers/MemCopyLayer.cpp \
+ src/armnn/layers/MergerLayer.cpp \
+ src/armnn/layers/MultiplicationLayer.cpp \
+ src/armnn/layers/NormalizationLayer.cpp \
+ src/armnn/layers/OutputLayer.cpp \
+ src/armnn/layers/PermuteLayer.cpp \
+ src/armnn/layers/Pooling2dLayer.cpp \
+ src/armnn/layers/ReshapeLayer.cpp \
+ src/armnn/layers/ResizeBilinearLayer.cpp \
+ src/armnn/layers/SoftmaxLayer.cpp \
+ src/armnn/layers/SplitterLayer.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/InternalTypes.cpp \
+ src/armnn/Layer.cpp \
+ src/armnn/LoadedNetwork.cpp \
+ src/armnn/Network.cpp \
+ src/armnn/backends/OutputHandler.cpp \
+ src/armnn/Profiling.cpp \
+ src/armnn/Tensor.cpp \
+ src/armnn/Utils.cpp \
+ src/armnn/LayerSupport.cpp \
+ src/armnn/backends/RefLayerSupport.cpp \
+ src/armnn/backends/ClLayerSupport.cpp \
+ src/armnn/backends/NeonLayerSupport.cpp \
+ src/armnn/backends/NeonWorkloadUtils.cpp \
+ src/armnn/backends/NeonWorkloadFactory.cpp
+
+LOCAL_STATIC_LIBRARIES := \
+ armnn-arm_compute \
+ libboost_log \
+ libboost_system \
+ libboost_thread
+
+LOCAL_SHARED_LIBRARIES := \
+ liblog
+
+LOCAL_CFLAGS := \
+ -std=c++14 \
+ -fexceptions \
+ -DARMCOMPUTECL_ENABLED \
+ -DARMCOMPUTENEON_ENABLED \
+ -Wno-unused-parameter \
+ -frtti
+
+include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
@@ -18,7 +219,8 @@
$(OPENCL_HEADER_PATH) \
$(NN_HEADER_PATH) \
$(ARMNN_HEADER_PATH) \
- $(ARMNN_SOURCE_HEADER_PATH)
+ $(ARMNN_SOURCE_HEADER_PATH) \
+ $(ARMNN_SOURCE_UTILS_HEADER_PATH)
LOCAL_CFLAGS := \
-std=c++14 \