diff options
author | surmeh01 <surabhi.mehta@arm.com> | 2018-07-05 14:03:08 +0100 |
---|---|---|
committer | surmeh01 <surabhi.mehta@arm.com> | 2018-07-05 14:03:08 +0100 |
commit | 4c7098bfeab1ffe1cdc77f6c15548d3e73274746 (patch) | |
tree | d3f8e5972426389a9e73b03465f463461be6045d | |
parent | dccfe8eeeda135559bb8caa06c465106e00d80a9 (diff) | |
download | armnn-4c7098bfeab1ffe1cdc77f6c15548d3e73274746.tar.gz |
Release 18.05.02
-rw-r--r-- | Android.bp | 188 | ||||
-rw-r--r-- | Android.mk | 204 | ||||
-rw-r--r-- | include/armnn/Version.hpp | 2 |
3 files changed, 207 insertions, 187 deletions
diff --git a/Android.bp b/Android.bp index 1a2afb8c8f..78bfc2a4f8 100644 --- a/Android.bp +++ b/Android.bp @@ -3,188 +3,6 @@ // See LICENSE file in the project root for full license information. // -//////////////////////////////////////////// -// // -// libarmnn.a // -// // -//////////////////////////////////////////// -cc_library_static { - name: "libarmnn", - proprietary: true, - export_include_dirs: ["include", - "src/armnnUtils"], - local_include_dirs: ["src/armnn"], - srcs: [ - "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" - ], - static_libs: [ - "armnn-arm_compute", - "libboost_log", - "libboost_system", - "libboost_thread"], - shared_libs: [ - "liblog"], - stl: "libc++", - cppflags: [ - "-fexceptions", - "-std=c++14", - "-DARMCOMPUTECL_ENABLED", - "-DARMCOMPUTENEON_ENABLED", - "-Wno-unused-parameter", - ], - rtti: true, -} +// Dummy Android.bp file to keep backward compatibility with previous +// build systems/environments. + diff --git a/Android.mk b/Android.mk index 14ec703265..f008840e30 100644 --- a/Android.mk +++ b/Android.mk @@ -11,6 +11,207 @@ OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include 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 @@ LOCAL_C_INCLUDES := \ $(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 \ diff --git a/include/armnn/Version.hpp b/include/armnn/Version.hpp index ec99335530..d5f794eb8b 100644 --- a/include/armnn/Version.hpp +++ b/include/armnn/Version.hpp @@ -9,4 +9,4 @@ // YYYY = 4-digit year number // MM = 2-digit month number // PP = 2-digit patch number -#define ARMNN_VERSION "20180500" +#define ARMNN_VERSION "20180502" |