commit 20dda37357ac0d02550f4421de6c8bfe44304f90
author Teresa Charlin <teresa.charlinreyes@arm.com> Thu Feb 08 16:23:25 2024 +0000
committer Teresa Charlin <teresa.charlinreyes@arm.com> Thu Feb 08 16:26:13 2024 +0000
tree dedea8fbe56180d322bfa2720992caf1b3faa4c5
parent a4b6090eea91d4c11f4319d175b5c6fbf1d2a984

IVGCVSW-7570 GpuFsa Op: Add ElemenWiseBinary Operators available

* Refactor to generalize
* Add MUL

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I2ee273d50d3a8b114b5a41abc8ee7585b15e3308

src/backends/gpuFsa/test/GpuFsaOptimizedNetworkTests.cpp

diff --git a/src/backends/gpuFsa/test/GpuFsaOptimizedNetworkTests.cpp b/src/backends/gpuFsa/test/GpuFsaOptimizedNetworkTests.cpp
index aad3a0f..6ddb942 100644
--- a/src/backends/gpuFsa/test/GpuFsaOptimizedNetworkTests.cpp
+++ b/src/backends/gpuFsa/test/GpuFsaOptimizedNetworkTests.cpp
@@ -173,7 +173,7 @@
                         &IsLayerOfType<OutputLayer>));
 }
 
-TEST_CASE("ElementwiseBinaryAddSupportedOptimizedNetwork")
+TEST_CASE("ElementwiseBinarySupportedOptimizedNetwork")
 {
     using namespace armnn;
 
@@ -196,55 +196,18 @@
     IConnectableLayer* input2 = network->AddInputLayer(1, "input1");
 
     ElementwiseBinaryDescriptor desc;
-    desc.m_Operation = BinaryOperation::Add;
-
-    IConnectableLayer* elementwiseBinaryLayer = network->AddElementwiseBinaryLayer(desc, "elementwiseBinary");
-    IConnectableLayer* output = network->AddOutputLayer(2, "output");
-
-    Connect(input1, elementwiseBinaryLayer, input1TensorInfo, 0, 0);
-    Connect(input2, elementwiseBinaryLayer, input2TensorInfo, 0, 1);
-    Connect(elementwiseBinaryLayer, output, outputTensorInfo, 0, 0);
-
-    std::vector<BackendId> backends = { "GpuFsa" };
-
-    OptimizerOptionsOpaque optimizedOptions;
-    IOptimizedNetworkPtr optNet = Optimize(*network, backends, runtime->GetDeviceSpec(), optimizedOptions);
-    CHECK(optNet);
-
-    Graph& graph = GetGraphForTesting(optNet.get());
-
-    // Check graph layer sequence to ensure that the network has been replaced with a PreCompiledLayer
-    CHECK(CheckSequence(graph.cbegin(), graph.cend(),
-                        &IsLayerOfType<InputLayer>,
-                        &IsLayerOfType<InputLayer>,
-                        &IsLayerOfType<PreCompiledLayer>,
-                        &IsLayerOfType<OutputLayer>));
-}
-
-TEST_CASE("ElementwiseBinarySubSupportedOptimizedNetwork")
-{
-    using namespace armnn;
-
-    const float qScale = 1.0f;
-    const int32_t qOffset = 0;
-
-    const TensorShape& input1Shape  = { 2, 2, 2 };
-    const TensorShape& input2Shape  = { 2, 2, 2 };
-    const TensorShape& outputShape  = { 2, 2, 2 };
-
-    TensorInfo input1TensorInfo(input1Shape, DataType::Float32, qScale, qOffset, true);
-    TensorInfo input2TensorInfo(input2Shape, DataType::Float32, qScale, qOffset, true);
-    TensorInfo outputTensorInfo(outputShape, DataType::Float32, qScale, qOffset);
-
-    IRuntime::CreationOptions options;
-    IRuntimePtr runtime(IRuntime::Create(options));
-    INetworkPtr network(INetwork::Create());
-
-    IConnectableLayer* input1 = network->AddInputLayer(0, "input0");
-    IConnectableLayer* input2 = network->AddInputLayer(1, "input1");
-
-    ElementwiseBinaryDescriptor desc;
-    desc.m_Operation = BinaryOperation::Sub;
+    SUBCASE("Add")
+    {
+        desc.m_Operation = BinaryOperation::Add;
+    }
+    SUBCASE("Mul")
+    {
+        desc.m_Operation = BinaryOperation::Mul;
+    }
+    SUBCASE("Sub")
+    {
+        desc.m_Operation = BinaryOperation::Sub;
+    }
 
     IConnectableLayer* elementwiseBinaryLayer = network->AddElementwiseBinaryLayer(desc, "elementwiseBinary");
     IConnectableLayer* output = network->AddOutputLayer(2, "output");