COMPMID-502: Move MeanStdDev to new validation

Change-Id: I838dfccccaf65db7b9dc38cec20950e48445e474
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/85358
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>

7 files changed, 0 insertions, 350 deletions

diff --git a/tests/validation/CL/MeanStdDev.cpp b/tests/validation/CL/MeanStdDev.cpp
deleted file mode 100644
index 439d8f3259..0000000000
--- a/tests/validation/CL/MeanStdDev.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2017 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include "AssetsLibrary.h"
-#include "CL/CLAccessor.h"
-#include "Globals.h"
-#include "PaddingCalculator.h"
-#include "TypePrinter.h"
-#include "Utils.h"
-#include "validation/Datasets.h"
-#include "validation/Reference.h"
-#include "validation/Validation.h"
-
-#include "arm_compute/core/Helpers.h"
-#include "arm_compute/core/Types.h"
-#include "arm_compute/runtime/CL/functions/CLMeanStdDev.h"
-#include "arm_compute/runtime/Tensor.h"
-#include "arm_compute/runtime/TensorAllocator.h"
-
-#include "boost_wrapper.h"
-
-#include <random>
-#include <string>
-
-using namespace arm_compute;
-using namespace arm_compute::test;
-using namespace arm_compute::test::validation;
-
-namespace
-{
-/** Compute CL mean and standard deviation function.
- *
- * @param[in] shape Shape of the input tensors.
- *
- * @return Computed mean and standard deviation.
- */
-std::pair<float, float> compute_mean_and_standard_deviation(const TensorShape &shape)
-{
-    // Create tensor
-    CLTensor src = create_tensor<CLTensor>(shape, DataType::U8);
-
-    // Create output variables
-    float mean    = 0.f;
-    float std_dev = 0.f;
-
-    // Create mean and standard deviation configure function
-    CLMeanStdDev mean_std_dev_image;
-    mean_std_dev_image.configure(&src, &mean, &std_dev);
-
-    // Allocate tensors
-    src.allocator()->allocate();
-
-    BOOST_TEST(!src.info()->is_resizable());
-
-    // Fill tensor
-    library->fill_tensor_uniform(CLAccessor(src), 0);
-
-    // Compute function
-    mean_std_dev_image.run();
-
-    return std::make_pair(mean, std_dev);
-}
-} // namespace
-
-#ifndef DOXYGEN_SKIP_THIS
-BOOST_AUTO_TEST_SUITE(CL)
-BOOST_AUTO_TEST_SUITE(MeanStdDev)
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly"))
-BOOST_DATA_TEST_CASE(Configuration, Small2DShapes() + Large2DShapes(), shape)
-{
-    // Create tensor
-    CLTensor src = create_tensor<CLTensor>(shape, DataType::U8);
-
-    // Create output variables
-    float mean    = 0.f;
-    float std_dev = 0.f;
-
-    BOOST_TEST(src.info()->is_resizable());
-
-    // Create mean and standard deviation configure function
-    CLMeanStdDev mean_std_dev_image;
-    mean_std_dev_image.configure(&src, &mean, &std_dev);
-
-    // Validate valid region
-    const ValidRegion valid_region = shape_to_valid_region(shape);
-    validate(src.info()->valid_region(), valid_region);
-
-    // Validate padding
-    const PaddingSize padding = PaddingCalculator(shape.x(), 8).required_padding();
-    validate(src.info()->padding(), padding);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
-BOOST_DATA_TEST_CASE(RunSmall, Small2DShapes(), shape)
-{
-    // Compute function
-    std::pair<float, float> output = compute_mean_and_standard_deviation(shape);
-
-    // Compute reference
-    std::pair<float, float> ref_output = Reference::compute_reference_mean_and_standard_deviation(shape);
-
-    // Validate output
-    validate(output.first, ref_output.first);
-    validate(output.second, ref_output.second, 0.f, 0.05f);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("nightly"))
-BOOST_DATA_TEST_CASE(RunLarge, Large2DShapes(), shape)
-{
-    // Compute function
-    std::pair<float, float> output = compute_mean_and_standard_deviation(shape);
-
-    // Compute reference
-    std::pair<float, float> ref_output = Reference::compute_reference_mean_and_standard_deviation(shape);
-
-    // Validate output
-    validate(output.first, ref_output.first, 0.f, 0.0005f);
-    validate(output.second, ref_output.second, 0.f, 0.05f);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/MeanStdDev.cpp b/tests/validation/NEON/MeanStdDev.cpp
deleted file mode 100644
index d39435f2b3..0000000000
--- a/tests/validation/NEON/MeanStdDev.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2017 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include "AssetsLibrary.h"
-#include "Globals.h"
-#include "NEON/Accessor.h"
-#include "PaddingCalculator.h"
-#include "TypePrinter.h"
-#include "Utils.h"
-#include "validation/Datasets.h"
-#include "validation/Reference.h"
-#include "validation/Validation.h"
-
-#include "arm_compute/core/Helpers.h"
-#include "arm_compute/core/Types.h"
-#include "arm_compute/runtime/NEON/functions/NEMeanStdDev.h"
-#include "arm_compute/runtime/Tensor.h"
-#include "arm_compute/runtime/TensorAllocator.h"
-
-#include "boost_wrapper.h"
-
-#include <random>
-#include <string>
-
-using namespace arm_compute;
-using namespace arm_compute::test;
-using namespace arm_compute::test::validation;
-
-namespace
-{
-/** Compute Neon mean and standard deviation function.
- *
- * @param[in] shape Shape of the input tensors.
- *
- * @return Computed mean and standard deviation.
- */
-std::pair<float, float> compute_mean_and_standard_deviation(const TensorShape &shape)
-{
-    // Create tensor
-    Tensor src = create_tensor<Tensor>(shape, DataType::U8);
-
-    // Create output variables
-    float mean    = 0.f;
-    float std_dev = 0.f;
-
-    // Create mean and standard deviation configure function
-    NEMeanStdDev mean_std_dev_image;
-    mean_std_dev_image.configure(&src, &mean, &std_dev);
-
-    // Allocate tensors
-    src.allocator()->allocate();
-
-    BOOST_TEST(!src.info()->is_resizable());
-
-    // Fill tensor
-    library->fill_tensor_uniform(Accessor(src), 0);
-
-    // Compute function
-    mean_std_dev_image.run();
-
-    return std::make_pair(mean, std_dev);
-}
-} // namespace
-
-#ifndef DOXYGEN_SKIP_THIS
-BOOST_AUTO_TEST_SUITE(NEON)
-BOOST_AUTO_TEST_SUITE(MeanStdDev)
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly"))
-BOOST_DATA_TEST_CASE(Configuration, Small2DShapes() + Large2DShapes(), shape)
-{
-    // Create tensor
-    Tensor src = create_tensor<Tensor>(shape, DataType::U8);
-
-    // Create output variables
-    float mean    = 0.f;
-    float std_dev = 0.f;
-
-    BOOST_TEST(src.info()->is_resizable());
-
-    // Create mean and standard deviation configure function
-    NEMeanStdDev mean_std_dev_image;
-    mean_std_dev_image.configure(&src, &mean, &std_dev);
-
-    // Validate valid region
-    const ValidRegion valid_region = shape_to_valid_region(shape);
-    validate(src.info()->valid_region(), valid_region);
-
-    // Validate padding
-    validate(src.info()->padding(), PaddingCalculator(shape.x(), 16).required_padding());
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
-BOOST_DATA_TEST_CASE(RunSmall, Small2DShapes(), shape)
-{
-    // Compute function
-    std::pair<float, float> output = compute_mean_and_standard_deviation(shape);
-
-    // Compute reference
-    std::pair<float, float> ref_output = Reference::compute_reference_mean_and_standard_deviation(shape);
-
-    // Validate output
-    validate(output.first, ref_output.first);
-    validate(output.second, ref_output.second, 0.f, 0.001f);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("nightly"))
-BOOST_DATA_TEST_CASE(RunLarge, Large2DShapes(), shape)
-{
-    // Compute function
-    std::pair<float, float> output = compute_mean_and_standard_deviation(shape);
-
-    // Compute reference
-    std::pair<float, float> ref_output = Reference::compute_reference_mean_and_standard_deviation(shape);
-
-    // Validate output
-    validate(output.first, ref_output.first, 0.f, 0.0001f);
-    validate(output.second, ref_output.second, 0.f, 0.01f);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/Reference.cpp b/tests/validation/Reference.cpp
index 6da92116da..a621fea8a9 100644
--- a/tests/validation/Reference.cpp
+++ b/tests/validation/Reference.cpp
@@ -106,24 +106,6 @@ KeyPointArray Reference::compute_reference_harris_corners(const TensorShape &sha
     return corners;
 }
 
-std::pair<float, float> Reference::compute_reference_mean_and_standard_deviation(const TensorShape &shape)
-{
-    // Create reference
-    RawTensor ref_src(shape, DataType::U8);
-
-    // Create output variables
-    float mean;
-    float std_dev;
-
-    // Fill reference
-    library->fill_tensor_uniform(ref_src, 0);
-
-    // Compute reference
-    ReferenceCPP::mean_and_standard_deviation(ref_src, mean, std_dev);
-
-    return std::make_pair(mean, std_dev);
-}
-
 RawTensor Reference::compute_reference_integral_image(const TensorShape &shape)
 {
     // Create reference
diff --git a/tests/validation/Reference.h b/tests/validation/Reference.h
index 430c42321f..698b60e96b 100644
--- a/tests/validation/Reference.h
+++ b/tests/validation/Reference.h
@@ -90,13 +90,6 @@ public:
     static void compute_reference_min_max_location(const TensorShape &shape, DataType dt_in, void *min, void *max, IArray<Coordinates2D> &min_loc, IArray<Coordinates2D> &max_loc,
                                                    uint32_t &min_count,
                                                    uint32_t &max_count);
-    /** Compute reference mean and standard deviation.
-     *
-     * @param[in] shape Shape of the input tensors.
-     *
-     * @return Computed mean and standard deviation.
-     */
-    static std::pair<float, float> compute_reference_mean_and_standard_deviation(const TensorShape &shape);
     /** Compute reference integral image.
      *
      * @param[in] shape Shape of the input and output tensors.
diff --git a/tests/validation/ReferenceCPP.cpp b/tests/validation/ReferenceCPP.cpp
index 4c831ebe0a..029f6586f5 100644
--- a/tests/validation/ReferenceCPP.cpp
+++ b/tests/validation/ReferenceCPP.cpp
@@ -111,14 +111,6 @@ void ReferenceCPP::absolute_difference(const RawTensor &src1, const RawTensor &s
     boost::apply_visitor(absolute_difference_visitor(), s1, s2, d);
 }
 
-// Mean and standard deviation
-void ReferenceCPP::mean_and_standard_deviation(const RawTensor &src, float &mean, float &std_dev)
-{
-    ARM_COMPUTE_ERROR_ON(src.data_type() != DataType::U8);
-    const Tensor<uint8_t> s(src.shape(), src.data_type(), src.fixed_point_position(), reinterpret_cast<const uint8_t *>(src.data()));
-    tensor_operations::mean_and_standard_deviation(s, mean, std_dev);
-}
-
 // Integral image
 void ReferenceCPP::integral_image(const RawTensor &src, RawTensor &dst)
 {
diff --git a/tests/validation/ReferenceCPP.h b/tests/validation/ReferenceCPP.h
index 96aade9705..fcc4da471d 100644
--- a/tests/validation/ReferenceCPP.h
+++ b/tests/validation/ReferenceCPP.h
@@ -94,13 +94,6 @@ public:
      * @param[out] max_count Number of maximum values found
      */
     static void min_max_location(const RawTensor &src, void *min, void *max, IArray<Coordinates2D> &min_loc, IArray<Coordinates2D> &max_loc, uint32_t &min_count, uint32_t &max_count);
-    /** Function to compute the mean and standard deviation of a tensor.
-     *
-     * @param[in]  src     Input tensor.
-     * @param[out] mean    Mean of the tensor.
-     * @param[out] std_dev Standard deviation of the tensor
-     */
-    static void mean_and_standard_deviation(const RawTensor &src, float &mean, float &std_dev);
     /** Function to compute the integral image of a tensor.
      *
      * @param[in]  src Input tensor.
diff --git a/tests/validation/TensorOperations.h b/tests/validation/TensorOperations.h
index f157671c18..b9ffa49544 100644
--- a/tests/validation/TensorOperations.h
+++ b/tests/validation/TensorOperations.h
@@ -472,29 +472,6 @@ void min_max_location(const Tensor<T1> &in, void *min, void *max, IArray<Coordin
     }
 }
 
-// Mean Standard Deviation
-template <typename T1>
-void mean_and_standard_deviation(const Tensor<T1> &in, float &mean, float &std_dev)
-{
-    int num_elements = in.num_elements();
-
-    // Calculate mean
-    mean = 0.f;
-    for(int i = 0; i < num_elements; ++i)
-    {
-        mean += in[i];
-    }
-    mean /= num_elements;
-
-    // Calculate standard deviation
-    std_dev = 0.f;
-    for(int i = 0; i < num_elements; ++i)
-    {
-        std_dev += (mean - in[i]) * (mean - in[i]);
-    }
-    std_dev = sqrt(std_dev / num_elements);
-}
-
 // Integral Image
 void integral_image(const Tensor<uint8_t> &in, Tensor<uint32_t> &out)
 {