aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichalis Spyrou <michalis.spyrou@arm.com>2019-05-13 15:21:29 +0100
committerMichalis Spyrou <michalis.spyrou@arm.com>2019-05-13 17:42:10 +0100
commitc520b7887487ff4179efb0f63c10ac95def9dbf2 (patch)
treef303c59ac2cfbd9a37e3d5eb1c96fffd62c20a3b
parent57f5d28dd387383442db652177ab28aef758bc26 (diff)
downloadComputeLibrary-c520b7887487ff4179efb0f63c10ac95def9dbf2.tar.gz
COMPMID-2326: (Nightly) NEDepthConcatenate bechmark failure
Change-Id: I7f016a483e084c02ddee842afaba6c33a8d028c8 Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com> Reviewed-on: https://review.mlplatform.org/c/1115 Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Pablo Marquez <pablo.tello@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
-rw-r--r--tests/benchmark/NEON/DepthConcatenateLayer.cpp12
-rw-r--r--tests/benchmark/fixtures/DepthConcatenateLayerFixture.h23
2 files changed, 9 insertions, 26 deletions
diff --git a/tests/benchmark/NEON/DepthConcatenateLayer.cpp b/tests/benchmark/NEON/DepthConcatenateLayer.cpp
index 04c0bffcc..b82da2499 100644
--- a/tests/benchmark/NEON/DepthConcatenateLayer.cpp
+++ b/tests/benchmark/NEON/DepthConcatenateLayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -46,14 +46,14 @@ const auto data_types = framework::dataset::make("DataType", { DataType::F16, Da
using NEDepthConcatenateLayerFixture = DepthConcatenateLayerFixture<Tensor, ITensor, NEDepthConcatenateLayer, Accessor>;
-TEST_SUITE(NE)
+TEST_SUITE(NEON)
TEST_SUITE(DepthConcatenateLayer)
-REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEDepthConcatenateLayerFixture, framework::DatasetMode::PRECOMMIT, framework::dataset::combine(datasets::Small2DShapes(), data_types));
-REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEDepthConcatenateLayerFixture, framework::DatasetMode::NIGHTLY, framework::dataset::combine(datasets::DepthConcatenateLayerShapes(), data_types));
+REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEDepthConcatenateLayerFixture, framework::DatasetMode::PRECOMMIT, framework::dataset::combine(datasets::Small3DShapes(), data_types));
+REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEDepthConcatenateLayerFixture, framework::DatasetMode::NIGHTLY, framework::dataset::combine(datasets::ConcatenateLayerShapes(), data_types));
-TEST_SUITE_END()
-TEST_SUITE_END()
+TEST_SUITE_END() // DepthConcatenateLayer
+TEST_SUITE_END() // NEON
} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h b/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h
index 4db27e707..541dfb285 100644
--- a/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h
+++ b/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h
@@ -50,34 +50,17 @@ public:
{
// Create input shapes
std::mt19937 gen(library->seed());
- std::uniform_int_distribution<> num_dis(2, 6);
+ std::uniform_int_distribution<> num_dis(2, 4);
const int num_tensors = num_dis(gen);
- std::vector<TensorShape> shapes(num_tensors, shape);
- std::uniform_int_distribution<> depth_dis(1, 7);
- std::bernoulli_distribution mutate_dis(0.25f);
- std::uniform_real_distribution<> change_dis(-0.25f, 0.f);
+ std::vector<TensorShape> shapes(num_tensors, shape);
+ std::uniform_int_distribution<> depth_dis(1, 3);
// Generate more shapes based on the input
for(auto &s : shapes)
{
// Set the depth of the tensor
s.set(2, depth_dis(gen));
-
- // Randomly change the first dimension
- if(mutate_dis(gen))
- {
- // Decrease the dimension by a small percentage. Don't increase
- // as that could make tensor too large. Also the change must be
- // an even number. Otherwise out depth concatenate fails.
- s.set(0, s[0] + 2 * static_cast<int>(s[0] * change_dis(gen)));
- }
-
- // Repeat the same as above for the second dimension
- if(mutate_dis(gen))
- {
- s.set(1, s[1] + 2 * static_cast<int>(s[1] * change_dis(gen)));
- }
}
return shapes;