Release 18.02

Change-Id: Id3c11dc5ee94ef664374a988fcc6901e9a232fa6

Author: TelmoARM

Android.bp

@@ -0,0 +1,160 @@
+//
+// Copyright © 2017 ARM Ltd. All rights reserved.
+// See LICENSE file in the project root for full license information.
+//
+
+////////////////////////////////////////////
+//                                        //
+//             libarmnn.a                 //
+//                                        //
+////////////////////////////////////////////
+cc_library_static {
+    name: "libarmnn",
+    export_include_dirs: ["include",
+                          "src/armnnUtils"],
+    local_include_dirs: ["src/armnn"],
+    srcs: [
+        "src/armnnUtils/Logging.cpp",
+        "src/armnnUtils/Permute.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/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/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/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/Descriptors.cpp",
+        "src/armnn/Exceptions.cpp",
+        "src/armnn/Graph.cpp",
+        "src/armnn/Optimizer.cpp",
+        "src/armnn/Runtime.cpp",
+        "src/armnn/InternalTypes.cpp",
+        "src/armnn/Layer.cpp",
+        "src/armnn/Layers.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"],
+    stl: "libc++",
+    cppflags: [
+        "-fexceptions",
+        "-std=c++14",
+        "-DARMCOMPUTECL_ENABLED",
+        "-DARMCOMPUTENEON_ENABLED",
+        "-Wno-unused-parameter",
+    ],
+    rtti: true,
+}

Android.mk

@@ -0,0 +1,84 @@
+#
+# Copyright © 2017 ARM Ltd. All rights reserved.
+# See LICENSE file in the project root for full license information.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+# Configure these paths if you move the source or Khronos headers
+#
+OPENCL_HEADER_PATH := $(LOCAL_PATH)/../../mali/product/khronos/original
+NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
+ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
+ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn
+
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES :=  \
+	$(OPENCL_HEADER_PATH) \
+	$(NN_HEADER_PATH) \
+	$(ARMNN_HEADER_PATH) \
+	$(ARMNN_SOURCE_HEADER_PATH)
+
+LOCAL_CFLAGS := \
+	-std=c++14 \
+	-fexceptions \
+	-frtti \
+	-isystem vendor/arm/android-nn-driver/boost_1_64_0 \
+	-DARMCOMPUTECL_ENABLED \
+	-DARMCOMPUTENEON_ENABLED
+
+LOCAL_SRC_FILES :=  \
+	src/armnn/test/UnitTests.cpp \
+    src/armnn/test/EndToEndTest.cpp \
+    src/armnn/test/UtilsTests.cpp \
+    src/armnn/test/GraphTests.cpp \
+    src/armnn/test/RuntimeTests.cpp \
+    src/armnn/test/TensorTest.cpp \
+    src/armnn/test/Network_test.cpp \
+    src/armnn/backends/test/IsLayerSupportedTest.cpp \
+    src/armnn/backends/test/Reference.cpp \
+    src/armnn/backends/test/WorkloadDataValidation.cpp \
+    src/armnn/backends/test/TensorCopyUtils.cpp \
+    src/armnn/backends/test/LayerTests.cpp \
+    src/armnn/backends/test/CreateWorkloadRef.cpp \
+	src/armnn/backends/test/ArmComputeCl.cpp \
+	src/armnn/backends/test/ArmComputeNeon.cpp \
+	src/armnn/backends/test/CreateWorkloadCl.cpp \
+	src/armnn/backends/test/CreateWorkloadNeon.cpp \
+	src/armnn/backends/test/MemCopyTests.cpp
+
+LOCAL_STATIC_LIBRARIES := \
+	libneuralnetworks_common \
+	libarmnn \
+	libboost_log \
+	libboost_system \
+	libboost_unit_test_framework \
+	libboost_thread \
+	armnn-arm_compute
+
+LOCAL_SHARED_LIBRARIES :=  \
+	libbase \
+	libhidlbase \
+	libhidltransport \
+	libhidlmemory \
+	liblog \
+	libutils \
+	[email protected] \
+	[email protected] \
+	[email protected] \
+	libOpenCL
+
+LOCAL_MODULE := armnn-tests
+
+LOCAL_MODULE_TAGS := eng optional
+
+LOCAL_ARM_MODE := arm
+
+# Mark source files as dependent on Android.mk
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+include $(BUILD_EXECUTABLE)
+
+
+