IVGCVSW-7147 Bug Fix for refactor of the ExecuteNetwork for strategy in ConvertLayers.
* ConvertBf16ToFp32Layer
* ConvertFp16ToFp32Layer
* ConvertFp32ToBf16Layer
* ConvertFp32ToFp16Layer
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I5e763519a12f017dc14b09ea191fdb3b7398c0d7
diff --git a/src/armnn/layers/ConvertBf16ToFp32Layer.cpp b/src/armnn/layers/ConvertBf16ToFp32Layer.cpp
index d7ad692..a0958e3 100644
--- a/src/armnn/layers/ConvertBf16ToFp32Layer.cpp
+++ b/src/armnn/layers/ConvertBf16ToFp32Layer.cpp
@@ -49,10 +49,7 @@
void ConvertBf16ToFp32Layer::ExecuteStrategy(IStrategy& strategy) const
{
- // these conversion layers are only inserted by the
- // optimizer and so will never be in an input graph.
- IgnoreUnused(strategy);
- throw armnn::Exception("ConvertBf16ToFp32Layer should never appear in an input graph");
+ strategy.ExecuteStrategy(this, GetParameters(), {}, GetName());
}
} // namespace armnn
diff --git a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp
index 423721d..e3865a6 100644
--- a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp
+++ b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp
@@ -49,10 +49,7 @@
void ConvertFp16ToFp32Layer::ExecuteStrategy(IStrategy& strategy) const
{
- // these conversion layers are only inserted by the
- // optimizer and so will never be in an input graph.
- IgnoreUnused(strategy);
- throw armnn::Exception("ConvertFp16ToFp32Layer should never appear in an input graph");
+ strategy.ExecuteStrategy(this, GetParameters(), {}, GetName());
}
} // namespace armnn
diff --git a/src/armnn/layers/ConvertFp32ToBf16Layer.cpp b/src/armnn/layers/ConvertFp32ToBf16Layer.cpp
index 1556dee..7c98eea 100644
--- a/src/armnn/layers/ConvertFp32ToBf16Layer.cpp
+++ b/src/armnn/layers/ConvertFp32ToBf16Layer.cpp
@@ -50,10 +50,7 @@
void ConvertFp32ToBf16Layer::ExecuteStrategy(IStrategy& strategy) const
{
- // these conversion layers are only inserted by the
- // optimizer and so will never be in an input graph.
- IgnoreUnused(strategy);
- throw armnn::Exception("ConvertFp32ToBf16Layer should never appear in an input graph");
+ strategy.ExecuteStrategy(this, GetParameters(), {}, GetName());
}
} // namespace armnn
diff --git a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp
index 748cde3..36708c5 100644
--- a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp
+++ b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp
@@ -49,10 +49,7 @@
void ConvertFp32ToFp16Layer::ExecuteStrategy(IStrategy& strategy) const
{
- // These conversion layers are only inserted by the
- // optimizer and so will never be in an input graph.
- IgnoreUnused(strategy);
- throw armnn::Exception("ConvertFp32ToFp16Layer should never appear in an input graph");
+ strategy.ExecuteStrategy(this, GetParameters(), {}, GetName());
}
} // namespace armnn