diff options
| author | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:31:35 +0100 |
|---|---|---|
| committer | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:31:35 +0100 |
| commit | ce3e84a8d449cbf31cee57e30f0eef6a96c0ce94 (patch) | |
| tree | 77a769e27879fb712027c990071b061c5e0e3b60 /test/Android.mk | |
| parent | deb3bdbe028a59da0759dd7a560387d03a11d322 (diff) | |
| download | android-nn-driver-ce3e84a8d449cbf31cee57e30f0eef6a96c0ce94.tar.gz | |
Release 18.08
Diffstat (limited to 'test/Android.mk')
| -rw-r--r-- | test/Android.mk | 166 |
1 files changed, 118 insertions, 48 deletions
diff --git a/test/Android.mk b/test/Android.mk index 97e9a903..1cef3787 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -12,55 +12,72 @@ NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include ARMNN_HEADER_PATH := $(LOCAL_PATH)/../armnn/include ARMNN_DRIVER_HEADER_PATH := $(LOCAL_PATH)/.. +########################## +# armnn-driver-tests@1.0 # +########################## include $(CLEAR_VARS) -LOCAL_C_INCLUDES := \ - $(OPENCL_HEADER_PATH) \ - $(NN_HEADER_PATH) \ - $(ARMNN_HEADER_PATH) \ - $(ARMNN_DRIVER_HEADER_PATH) +LOCAL_MODULE := armnn-driver-tests@1.0 +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_C_INCLUDES := \ + $(OPENCL_HEADER_PATH) \ + $(NN_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ + $(ARMNN_DRIVER_HEADER_PATH) LOCAL_CFLAGS := \ - -std=c++14 \ - -fexceptions \ - -Werror \ - -UNDEBUG - -LOCAL_SRC_FILES := \ - Tests.cpp \ - UtilsTests.cpp \ - Concurrent.cpp \ - Convolution2D.cpp \ - FullyConnected.cpp \ - GenericLayerTests.cpp \ - DriverTestHelpers.cpp \ - SystemProperties.cpp \ - Merger.cpp \ - TestTensor.cpp + -std=c++14 \ + -fexceptions \ + -Werror \ + -O0 \ + -UNDEBUG +ifeq ($(PLATFORM_VERSION),9) +# Required to build with the changes made to the Android ML framework starting from Android P, +# regardless of the HAL version used for the build. +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_P +endif -LOCAL_STATIC_LIBRARIES := \ - libarmnn-driver \ - libneuralnetworks_common \ - libarmnn \ - libboost_log \ - libboost_system \ - libboost_unit_test_framework \ - libboost_thread \ - armnn-arm_compute - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libhidlbase \ - libhidltransport \ - libhidlmemory \ - liblog \ - libtextclassifier_hash \ - libutils \ - android.hardware.neuralnetworks@1.0 \ - android.hidl.allocator@1.0 \ - android.hidl.memory@1.0 \ - libOpenCL +LOCAL_SRC_FILES := \ + Tests.cpp \ + UtilsTests.cpp \ + Concurrent.cpp \ + Convolution2D.cpp \ + FullyConnected.cpp \ + GenericLayerTests.cpp \ + DriverTestHelpers.cpp \ + SystemProperties.cpp \ + Lstm.cpp \ + Merger.cpp \ + TestTensor.cpp +LOCAL_STATIC_LIBRARIES := \ + libarmnn-driver@1.0 \ + libneuralnetworks_common \ + libarmnn \ + libboost_log \ + libboost_system \ + libboost_unit_test_framework \ + libboost_thread \ + armnn-arm_compute + +LOCAL_SHARED_LIBRARIES := \ + libbase \ + libhidlbase \ + libhidltransport \ + libhidlmemory \ + liblog \ + libtextclassifier_hash \ + libutils \ + android.hardware.neuralnetworks@1.0 \ + android.hidl.allocator@1.0 \ + android.hidl.memory@1.0 \ + libOpenCL ifeq ($(PLATFORM_VERSION),9) # Required to build the 1.0 version of the NN Driver on Android P and later versions, # as the 1.0 version of the NN API needs the 1.1 HAL headers to be included regardless. @@ -68,18 +85,71 @@ LOCAL_SHARED_LIBRARIES+= \ android.hardware.neuralnetworks@1.1 endif -LOCAL_MODULE := armnn-driver-tests +include $(BUILD_EXECUTABLE) -LOCAL_MODULE_TAGS := eng optional +########################## +# armnn-driver-tests@1.1 # +########################## +include $(CLEAR_VARS) +LOCAL_MODULE := armnn-driver-tests@1.1 +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_PROPRIETARY_MODULE := true +LOCAL_C_INCLUDES := \ + $(OPENCL_HEADER_PATH) \ + $(NN_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ + $(ARMNN_DRIVER_HEADER_PATH) -include $(BUILD_EXECUTABLE) +LOCAL_CFLAGS := \ + -std=c++14 \ + -fexceptions \ + -Werror \ + -O0 \ + -UNDEBUG \ + -DARMNN_ANDROID_P \ + -DARMNN_ANDROID_NN_V1_1 + +LOCAL_SRC_FILES := \ + Tests.cpp \ + UtilsTests.cpp \ + Concurrent.cpp \ + Convolution2D.cpp \ + FullyConnected.cpp \ + GenericLayerTests.cpp \ + DriverTestHelpers.cpp \ + SystemProperties.cpp \ + Lstm.cpp \ + Merger.cpp \ + TestTensor.cpp +LOCAL_STATIC_LIBRARIES := \ + libarmnn-driver@1.1 \ + libneuralnetworks_common \ + libarmnn \ + libboost_log \ + libboost_system \ + libboost_unit_test_framework \ + libboost_thread \ + armnn-arm_compute + +LOCAL_SHARED_LIBRARIES := \ + libbase \ + libhidlbase \ + libhidltransport \ + libhidlmemory \ + liblog \ + libtextclassifier_hash \ + libutils \ + android.hardware.neuralnetworks@1.0 \ + android.hardware.neuralnetworks@1.1 \ + android.hidl.allocator@1.0 \ + android.hidl.memory@1.0 \ + libOpenCL +include $(BUILD_EXECUTABLE) |