IVGCVSW-4368 Update Android.mk and backend.mk files with latest unit tests
* Sync up the Android build files with the CMakeLists.txt
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: I1675b0937fed7c74833e46af6d077ced57cf5bed
diff --git a/Android.mk b/Android.mk
index 6006dd3..d1fa1b0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -324,22 +324,61 @@
LOCAL_SRC_FILES := \
$(ARMNN_BACKEND_TEST_SOURCES) \
+ src/armnn/test/ConstTensorLayerVisitor.cpp \
+ src/armnn/test/CsvReaderTest.cpp \
src/armnn/test/EndToEndTest.cpp \
+ src/armnn/ExecutionFrame.cpp \
+ src/armnn/test/ExecutionFrameTest.cpp \
+ src/armnn/test/FloatingPointConverterTest.cpp \
+ src/armnn/test/FlowControl.cpp \
src/armnn/test/GraphTests.cpp \
src/armnn/test/GraphUtils.cpp \
src/armnn/test/InferOutputTests.cpp \
src/armnn/test/InstrumentTests.cpp \
+ src/armnnUtils/ModelAccuracyChecker.cpp \
+ src/armnn/test/ModelAccuracyCheckerTest.cpp \
src/armnn/test/NetworkTests.cpp \
src/armnn/test/ObservableTest.cpp \
+ src/armnn/test/optimizations/ConvertConstantsFloatToHalfTests.cpp \
+ src/armnn/test/optimizations/ConvertConstantsHalfToFloatTests.cpp \
+ src/armnn/test/optimizations/Fp32NetworkToFp16ConverterTests.cpp \
+ src/armnn/test/optimizations/InsertDebugLayerTests.cpp \
+ src/armnn/test/optimizations/MovePermuteUpTests.cpp \
+ src/armnn/test/optimizations/OptimizeConsecutiveReshapesTests.cpp \
+ src/armnn/test/optimizations/OptimizeInverseConversionsTests.cpp \
+ src/armnn/test/optimizations/OptimizeInversePermutesTests.cpp \
+ src/armnn/test/optimizations/PermuteAndBatchToSpaceAsDepthToSpaceTests.cpp \
+ src/armnn/test/optimizations/PermuteAsReshapeTests.cpp \
+ src/armnn/test/optimizations/SquashEqualSiblingsTests.cpp \
+ src/armnn/test/OptimizerTests.cpp \
src/armnn/test/OptionalTest.cpp \
+ src/armnn/test/ProfilerTests.cpp \
src/armnn/test/ProfilingEventTest.cpp \
+ src/armnnUtils/PrototxtConversions.cpp \
+ src/armnnUtils/test/PrototxtConversionsTest.cpp \
src/armnn/test/SubgraphViewTests.cpp \
src/armnn/test/TensorHandleStrategyTest.cpp \
src/armnn/test/TensorTest.cpp \
+ src/armnn/test/TestInputOutputLayerVisitor.cpp \
+ src/armnn/test/TestLayerVisitor.cpp \
+ src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp \
+ src/armnn/test/TestNameOnlyLayerVisitor.cpp \
src/armnn/test/TestUtils.cpp \
src/armnn/test/UnitTests.cpp \
src/armnn/test/UtilsTests.cpp \
- src/profiling/test/ProfilingTestUtils.cpp
+ src/armnnUtils/test/ParserHelperTest.cpp \
+ src/armnnUtils/test/QuantizeHelperTest.cpp \
+ src/armnnUtils/test/TensorUtilsTest.cpp \
+ src/profiling/test/BufferTests.cpp \
+ src/profiling/test/FileOnlyProfilingDecoratorTests.cpp \
+ src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp \
+ src/profiling/test/ProfilingGuidTest.cpp \
+ src/profiling/test/ProfilingTests.cpp \
+ src/profiling/test/ProfilingTestUtils.cpp \
+ src/profiling/test/SendCounterPacketTests.cpp \
+ src/profiling/test/SendTimelinePacketTests.cpp \
+ src/profiling/test/TimelinePacketTests.cpp \
+ src/profiling/test/TimelineUtilityMethodsTests.cpp
ifeq ($(ARMNN_REF_ENABLED),1)
LOCAL_SRC_FILES += \
diff --git a/src/armnn/ExecutionFrame.hpp b/src/armnn/ExecutionFrame.hpp
index 3661fc7..97f6f3f 100644
--- a/src/armnn/ExecutionFrame.hpp
+++ b/src/armnn/ExecutionFrame.hpp
@@ -17,7 +17,7 @@
{
public:
- ~IExecutionFrame() {}
+ virtual ~IExecutionFrame() {}
virtual IExecutionFrame* ExecuteWorkloads(IExecutionFrame* previousFrame) = 0;
virtual void PostAllocationConfigure() {};
@@ -39,4 +39,4 @@
IExecutionFrame* m_NextExecutionFrame = nullptr;
};
-}
\ No newline at end of file
+}
diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk
index 412dc94..1987bd5 100644
--- a/src/backends/reference/backend.mk
+++ b/src/backends/reference/backend.mk
@@ -115,6 +115,7 @@
# Include the source files for the CL backend tests
BACKEND_TEST_SOURCES := \
+ test/ArgMinMaxTests.cpp \
test/RefCreateWorkloadTests.cpp \
test/RefDetectionPostProcessTests.cpp \
test/RefEndToEndTests.cpp \
@@ -123,7 +124,8 @@
test/RefLayerTests.cpp \
test/RefMemoryManagerTests.cpp \
test/RefOptimizedNetworkTests.cpp \
- test/RefRuntimeTests.cpp
+ test/RefRuntimeTests.cpp \
+ test/RefTensorHandleTests.cpp
else
# ARMNN_REF_ENABLED == 0