aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGian Marco Iodice <gianmarco.iodice@arm.com>2017-09-13 16:23:18 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-11-02 16:35:24 +0000
commitb2833b86def3a44af349b71450629fdb4590ad25 (patch)
tree4ac622759961c71a9df5f55728bdbc708558351a
parent92111c6db643b6098922b7dd1ad2fdfcc558850e (diff)
downloadComputeLibrary-b2833b86def3a44af349b71450629fdb4590ad25.tar.gz
COMPMID-415 - Fixed bad_alloc in DepthConcatenate reducing the size of input tensor for the NIGHTLY tests
Change-Id: I06a4b3f56c5157a67548570371d78f8a73029c2d Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87601 Reviewed-by: Pablo Tello <pablo.tello@arm.com> Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
-rw-r--r--tests/datasets/ShapeDatasets.h16
-rw-r--r--tests/validation/CL/DepthConcatenateLayer.cpp6
2 files changed, 19 insertions, 3 deletions
diff --git a/tests/datasets/ShapeDatasets.h b/tests/datasets/ShapeDatasets.h
index 806fc04c0d..ddcf6a7a95 100644
--- a/tests/datasets/ShapeDatasets.h
+++ b/tests/datasets/ShapeDatasets.h
@@ -202,6 +202,22 @@ public:
{
}
};
+
+/** Data set containing 2D tensor shapes for DepthConcatenate. */
+class DepthConcatenateShapes final : public ShapeDataset
+{
+public:
+ DepthConcatenateShapes()
+ : ShapeDataset("Shape",
+ {
+ TensorShape{ 322U, 243U },
+ TensorShape{ 463U, 879U },
+ TensorShape{ 416U, 651U }
+ })
+ {
+ }
+};
+
} // namespace datasets
} // namespace test
} // namespace arm_compute
diff --git a/tests/validation/CL/DepthConcatenateLayer.cpp b/tests/validation/CL/DepthConcatenateLayer.cpp
index 5ad423fe8f..8c738747e3 100644
--- a/tests/validation/CL/DepthConcatenateLayer.cpp
+++ b/tests/validation/CL/DepthConcatenateLayer.cpp
@@ -71,7 +71,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLDepthConcatenateLayerFixture<float>, framewor
// Validate output
validate(CLAccessor(_target), _reference);
}
-FIXTURE_DATA_TEST_CASE(RunLarge, CLDepthConcatenateLayerFixture<float>, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunLarge, CLDepthConcatenateLayerFixture<float>, framework::DatasetMode::NIGHTLY, combine(datasets::DepthConcatenateShapes(), framework::dataset::make("DataType",
DataType::F32)))
{
// Validate output
@@ -89,7 +89,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLDepthConcatenateLayerFixture<int8_t>, framewo
// Validate output
validate(CLAccessor(_target), _reference);
}
-FIXTURE_DATA_TEST_CASE(RunLarge, CLDepthConcatenateLayerFixture<int8_t>, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(),
+FIXTURE_DATA_TEST_CASE(RunLarge, CLDepthConcatenateLayerFixture<int8_t>, framework::DatasetMode::NIGHTLY, combine(datasets::DepthConcatenateShapes(),
framework::dataset::make("DataType",
DataType::QS8)))
{
@@ -106,7 +106,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLDepthConcatenateLayerFixture<int16_t>, framew
// Validate output
validate(CLAccessor(_target), _reference);
}
-FIXTURE_DATA_TEST_CASE(RunLarge, CLDepthConcatenateLayerFixture<int16_t>, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(),
+FIXTURE_DATA_TEST_CASE(RunLarge, CLDepthConcatenateLayerFixture<int16_t>, framework::DatasetMode::NIGHTLY, combine(datasets::DepthConcatenateShapes(),
framework::dataset::make("DataType",
DataType::QS16)))
{