From 42477c1d3e7ddf74863e84ab79dbe6f42e4a0ba3 Mon Sep 17 00:00:00 2001 From: Kevin May Date: Thu, 26 Mar 2020 13:34:14 +0000 Subject: IVGCVSW-4447 Add Hal 1_3 Support * Add new 1.3 files HalPolicy, ArmnnDriver, ArmnnDriverImpl * Add new .rc file for 1.3 service * Add ArmnnPreparedModel_1_3 and implement new functions * Update Android.mk with 1.3 driver and service * Refactor ifdef to include ARMNN_ANDROID_NN_V1_3 * Create Utils getMainModel for new 1.3 Model Main Subgraph * Use android Utils to convertToV1_X in ArmnnPrepapredModel_1_3 * Refactor HAL 1.2 convert functions into ConversionUtils_1_2.hpp * Replace ArmnnBurstExecutorWithCache with call to ExecutionBurstServer Signed-off-by: Kevin May Change-Id: I514069e9e1b16bcd1c4abfb5d563d25ac22d02e3 --- test/Convolution2D.hpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'test/Convolution2D.hpp') diff --git a/test/Convolution2D.hpp b/test/Convolution2D.hpp index 002677fe..38216f10 100644 --- a/test/Convolution2D.hpp +++ b/test/Convolution2D.hpp @@ -32,9 +32,7 @@ namespace driverTestHelpers void SetModelFp16Flag(V1_0::Model& model, bool fp16Enabled); -#if defined(ARMNN_ANDROID_NN_V1_1) || defined(ARMNN_ANDROID_NN_V1_2) void SetModelFp16Flag(V1_1::Model& model, bool fp16Enabled); -#endif template void PaddingTestImpl(android::nn::PaddingScheme paddingScheme, bool fp16Enabled = false) -- cgit v1.2.1