IVGCVSW-4531 Fix for failing strided slice NNT/VTS tests on Android R
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I7f6932f0d21b5678ab9822b0fc69f589bbbb07e5
diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
index 358f4e3..4221f62 100644
--- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
@@ -766,4 +766,40 @@
BOOST_TEST(found != std::string::npos);
}
+inline void StridedSliceInvalidSliceEndToEndTest(std::vector<BackendId> backends)
+{
+ using namespace armnn;
+
+ // Create runtime in which test will run
+ IRuntime::CreationOptions options;
+ IRuntimePtr runtime(armnn::IRuntime::Create(options));
+
+ // build up the structure of the network
+ INetworkPtr net(INetwork::Create());
+
+ IConnectableLayer* input = net->AddInputLayer(0);
+
+ // Configure a strided slice with a stride the same size as the input but with a ShrinkAxisMask on the first
+ // dim of the output to make it too small to hold the specified slice.
+ StridedSliceDescriptor descriptor;
+ descriptor.m_Begin = {0, 0};
+ descriptor.m_End = {2, 3};
+ descriptor.m_Stride = {1, 1};
+ descriptor.m_BeginMask = 0;
+ descriptor.m_EndMask = 0;
+ descriptor.m_ShrinkAxisMask = 1;
+ IConnectableLayer* stridedSlice = net->AddStridedSliceLayer(descriptor);
+
+ IConnectableLayer* output0 = net->AddOutputLayer(0);
+
+ input->GetOutputSlot(0).Connect(stridedSlice->GetInputSlot(0));
+ stridedSlice->GetOutputSlot(0).Connect(output0->GetInputSlot(0));
+
+ input->GetOutputSlot(0).SetTensorInfo(TensorInfo({ 2, 3 }, DataType::Float32));
+ stridedSlice->GetOutputSlot(0).SetTensorInfo(TensorInfo({ 3 }, DataType::Float32));
+
+ // Attempt to optimize the network and check that the correct exception is thrown
+ BOOST_CHECK_THROW(Optimize(*net, backends, runtime->GetDeviceSpec()), armnn::LayerValidationException);
+}
+
} // anonymous namespace
diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp
index 10abcc9..05f9538 100644
--- a/src/backends/cl/test/ClEndToEndTests.cpp
+++ b/src/backends/cl/test/ClEndToEndTests.cpp
@@ -126,6 +126,11 @@
DequantizeEndToEndOffset<armnn::DataType::QAsymmU8>(defaultBackends);
}
+BOOST_AUTO_TEST_CASE(ClStridedSliceInvalidSliceEndToEndTest)
+{
+ StridedSliceInvalidSliceEndToEndTest(defaultBackends);
+}
+
BOOST_AUTO_TEST_CASE(ClGreaterSimpleEndToEndTest)
{
const std::vector<uint8_t> expectedOutput({ 0, 0, 0, 0, 1, 1, 1, 1,
diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp
index abded64..081b8af 100644
--- a/src/backends/neon/test/NeonEndToEndTests.cpp
+++ b/src/backends/neon/test/NeonEndToEndTests.cpp
@@ -513,6 +513,11 @@
ArgMinAxis3EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
}
+BOOST_AUTO_TEST_CASE(NeonStridedSliceInvalidSliceEndToEndTest)
+{
+ StridedSliceInvalidSliceEndToEndTest(defaultBackends);
+}
+
BOOST_AUTO_TEST_CASE(NeonDetectionPostProcessRegularNmsTest, * boost::unit_test::disabled())
{
std::vector<float> boxEncodings({
diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp
index 54a6881..bdda12f 100644
--- a/src/backends/reference/test/RefEndToEndTests.cpp
+++ b/src/backends/reference/test/RefEndToEndTests.cpp
@@ -1210,6 +1210,11 @@
ExportOutputWithSeveralOutputSlotConnectionsTest(defaultBackends);
}
+BOOST_AUTO_TEST_CASE(RefStridedSliceInvalidSliceEndToEndTest)
+{
+ StridedSliceInvalidSliceEndToEndTest(defaultBackends);
+}
+
#endif
BOOST_AUTO_TEST_SUITE_END()