From b2397fd9d68f12792b04dd90ae72dfb8cb9f4a60 Mon Sep 17 00:00:00 2001
From: Ferran Balaguer <ferran.balaguer@arm.com>
Date: Thu, 25 Jul 2019 12:12:39 +0100
Subject: IVGCVSW-3398 Add LSTM normalization parameters to HAL 1.2

* Adding LSTM processing function in HAL 1.2 with normalization parameters
* Refactoring LSTM tests

!armnn:1608

Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: I0e00f14ef078a333e9f2f23d6278a5d92a3001d6
---
 test/DriverTestHelpers.hpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'test/DriverTestHelpers.hpp')

diff --git a/test/DriverTestHelpers.hpp b/test/DriverTestHelpers.hpp
index 980b3a72..c6f3f1fe 100644
--- a/test/DriverTestHelpers.hpp
+++ b/test/DriverTestHelpers.hpp
@@ -67,6 +67,36 @@ private:
     android::sp<V1_0::IPreparedModel>  m_PreparedModel;
 };
 
+#ifdef ARMNN_ANDROID_NN_V1_2
+
+class PreparedModelCallback_1_2 : public V1_2::IPreparedModelCallback
+{
+public:
+    PreparedModelCallback_1_2()
+            : m_ErrorStatus(ErrorStatus::NONE)
+            , m_PreparedModel()
+            , m_PreparedModel_1_2()
+    { }
+    ~PreparedModelCallback_1_2() override { }
+
+    Return<void> notify(ErrorStatus status, const android::sp<V1_0::IPreparedModel>& preparedModel) override;
+
+    Return<void> notify_1_2(ErrorStatus status, const android::sp<V1_2::IPreparedModel>& preparedModel) override;
+
+    ErrorStatus GetErrorStatus() { return m_ErrorStatus; }
+
+    android::sp<V1_0::IPreparedModel> GetPreparedModel() { return m_PreparedModel; }
+
+    android::sp<V1_2::IPreparedModel> GetPreparedModel_1_2() { return m_PreparedModel_1_2; }
+
+private:
+    ErrorStatus                        m_ErrorStatus;
+    android::sp<V1_0::IPreparedModel>  m_PreparedModel;
+    android::sp<V1_2::IPreparedModel>  m_PreparedModel_1_2;
+};
+
+#endif
+
 hidl_memory allocateSharedMemory(int64_t size);
 
 android::sp<IMemory> AddPoolAndGetData(uint32_t size, Request& request);
@@ -259,6 +289,24 @@ android::sp<V1_0::IPreparedModel> PrepareModel(const HalModel& model,
     return PrepareModelWithStatus(model, driver, prepareStatus);
 }
 
+#ifdef ARMNN_ANDROID_NN_V1_2
+
+android::sp<V1_2::IPreparedModel> PrepareModelWithStatus_1_2(const armnn_driver::hal_1_2::HalPolicy::Model& model,
+                                                            armnn_driver::ArmnnDriver& driver,
+                                                            ErrorStatus& prepareStatus,
+                                                            ErrorStatus expectedStatus = ErrorStatus::NONE);
+
+template<typename HalModel>
+android::sp<V1_2::IPreparedModel> PrepareModel_1_2(const HalModel& model,
+                                                   armnn_driver::ArmnnDriver& driver)
+{
+    ErrorStatus prepareStatus = ErrorStatus::NONE;
+    return PrepareModelWithStatus_1_2(model, driver, prepareStatus);
+}
+
+#endif
+
+
 ErrorStatus Execute(android::sp<V1_0::IPreparedModel> preparedModel,
                     const Request& request,
                     ErrorStatus expectedStatus = ErrorStatus::NONE);
-- 
cgit v1.2.1