1 files changed, 36 insertions, 20 deletions
diff --git a/test/1.1/Lstm.cpp b/test/1.1/Lstm.cpp
index 703597e5..2699ec4c 100644
--- a/test/1.1/Lstm.cpp
+++ b/test/1.1/Lstm.cpp
@@ -5,30 +5,46 @@
 
 #include "../Lstm.hpp"
 
-#include <boost/test/data/test_case.hpp>
-
-BOOST_AUTO_TEST_SUITE(LstmTests)
-
 using namespace armnn_driver;
 
-BOOST_DATA_TEST_CASE(LstmNoCifgNoPeepholeNoProjectionTest, COMPUTE_DEVICES)
-{
-    LstmNoCifgNoPeepholeNoProjection<hal_1_1::HalPolicy>(sample);
-}
-
-BOOST_DATA_TEST_CASE(LstmCifgPeepholeNoProjectionTest, COMPUTE_DEVICES)
+TEST_SUITE("LstmTests_1.1_CpuRef")
 {
-    LstmCifgPeepholeNoProjection<hal_1_1::HalPolicy>(sample);
+    TEST_CASE("LstmNoCifgNoPeepholeNoProjectionTest_1.1_armnn::Compute::CpuRef")
+    {
+        LstmNoCifgNoPeepholeNoProjection<hal_1_1::HalPolicy>(armnn::Compute::CpuRef);
+    }
+    TEST_CASE("LstmCifgPeepholeNoProjectionTest_1.1_CpuRef")
+    {
+        LstmCifgPeepholeNoProjection<hal_1_1::HalPolicy>(armnn::Compute::CpuRef);
+    }
+    TEST_CASE("LstmNoCifgPeepholeProjectionTest_1.1_CpuRef")
+    {
+        LstmNoCifgPeepholeProjection<hal_1_1::HalPolicy>(armnn::Compute::CpuRef);
+    }
+    TEST_CASE("LstmCifgPeepholeNoProjectionBatch2Test_1.1_CpuRef")
+    {
+        LstmCifgPeepholeNoProjectionBatch2<hal_1_1::HalPolicy>(armnn::Compute::CpuRef);
+    }
 }
 
-BOOST_DATA_TEST_CASE(LstmNoCifgPeepholeProjectionTest, COMPUTE_DEVICES)
+#if defined(ARMCOMPUTECL_ENABLED)
+TEST_SUITE("LstmTests_1.1_GpuAcc")
 {
-    LstmNoCifgPeepholeProjection<hal_1_1::HalPolicy>(sample);
+    TEST_CASE("LstmNoCifgNoPeepholeNoProjectionTest_1.1_GpuAcc")
+    {
+        LstmNoCifgNoPeepholeNoProjection<hal_1_1::HalPolicy>(armnn::Compute::GpuAcc);
+    }
+    TEST_CASE("LstmCifgPeepholeNoProjectionTest_1.1_GpuAcc")
+    {
+        LstmCifgPeepholeNoProjection<hal_1_1::HalPolicy>(armnn::Compute::GpuAcc);
+    }
+    TEST_CASE("LstmNoCifgPeepholeProjectionTest_1.1_GpuAcc")
+    {
+        LstmNoCifgPeepholeProjection<hal_1_1::HalPolicy>(armnn::Compute::GpuAcc);
+    }
+    TEST_CASE("LstmCifgPeepholeNoProjectionBatch2Test_1.1_GpuAcc")
+    {
+        LstmCifgPeepholeNoProjectionBatch2<hal_1_1::HalPolicy>(armnn::Compute::GpuAcc);
+    }
 }
-
-BOOST_DATA_TEST_CASE(LstmCifgPeepholeNoProjectionBatch2Test, COMPUTE_DEVICES)
-{
-    LstmCifgPeepholeNoProjectionBatch2<hal_1_1::HalPolicy>(sample);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
+#endif