diff options
| -rw-r--r-- | test/Convolution2D.hpp | 2 | ||||
| -rw-r--r-- | test/DriverTestHelpers.cpp | 2 | ||||
| -rw-r--r-- | test/DriverTestHelpers.hpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/Convolution2D.hpp b/test/Convolution2D.hpp index ec43ae35..46b46549 100644 --- a/test/Convolution2D.hpp +++ b/test/Convolution2D.hpp @@ -32,7 +32,7 @@ namespace driverTestHelpers void SetModelFp16Flag(V1_0::Model& model, bool fp16Enabled); -#ifdef ARMNN_ANDROID_NN_V1_1 +#if defined(ARMNN_ANDROID_NN_V1_1) || defined(ARMNN_ANDROID_NN_V1_2) void SetModelFp16Flag(V1_1::Model& model, bool fp16Enabled); #endif diff --git a/test/DriverTestHelpers.cpp b/test/DriverTestHelpers.cpp index 7a6b7804..675757f0 100644 --- a/test/DriverTestHelpers.cpp +++ b/test/DriverTestHelpers.cpp @@ -126,7 +126,7 @@ android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_0::Model& mode return cb->GetPreparedModel(); } -#ifdef ARMNN_ANDROID_NN_V1_1 +#if defined(ARMNN_ANDROID_NN_V1_1) || defined(ARMNN_ANDROID_NN_V1_2) android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_1::Model& model, armnn_driver::ArmnnDriver& driver, diff --git a/test/DriverTestHelpers.hpp b/test/DriverTestHelpers.hpp index 428359e2..980b3a72 100644 --- a/test/DriverTestHelpers.hpp +++ b/test/DriverTestHelpers.hpp @@ -242,12 +242,12 @@ android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_0::Model& mode ErrorStatus& prepareStatus, ErrorStatus expectedStatus = ErrorStatus::NONE); -#ifdef ARMNN_ANDROID_NN_V1_1 +#if defined(ARMNN_ANDROID_NN_V1_1) || defined(ARMNN_ANDROID_NN_V1_2) android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_1::Model& model, - armnn_driver::ArmnnDriver& driver, - ErrorStatus& prepareStatus, - ErrorStatus expectedStatus = ErrorStatus::NONE); + armnn_driver::ArmnnDriver& driver, + ErrorStatus& prepareStatus, + ErrorStatus expectedStatus = ErrorStatus::NONE); #endif |