diff options
| -rw-r--r-- | tests/TypePrinter.h | 72 | ||||
| -rw-r--r-- | tests/datasets/OpticalFlowDataset.h | 1 | ||||
| -rw-r--r-- | tests/framework/datasets/ContainerDataset.h | 1 | ||||
| -rw-r--r-- | utils/TypePrinter.h | 49 |
4 files changed, 78 insertions, 45 deletions
diff --git a/tests/TypePrinter.h b/tests/TypePrinter.h new file mode 100644 index 0000000000..4ba7f5f198 --- /dev/null +++ b/tests/TypePrinter.h @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2017-2018 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. + */ +#ifndef __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ +#define __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ + +#include "tests/Types.h" + +namespace arm_compute +{ +/** Formatted output of the GradientDimension type. + * + * @param[out] os Output stream + * @param[in] dim Type to output + * + * @return Modified output stream. + */ +inline ::std::ostream &operator<<(::std::ostream &os, const GradientDimension &dim) +{ + switch(dim) + { + case GradientDimension::GRAD_X: + os << "GRAD_X"; + break; + case GradientDimension::GRAD_Y: + os << "GRAD_Y"; + break; + case GradientDimension::GRAD_XY: + os << "GRAD_XY"; + break; + default: + ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); + } + + return os; +} + +/** Formatted output of the GradientDimension type. + * + * @param[in] type Type to output + * + * @return Formatted string. + */ +inline std::string to_string(const arm_compute::GradientDimension &type) +{ + std::stringstream str; + str << type; + return str.str(); +} + +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ */ diff --git a/tests/datasets/OpticalFlowDataset.h b/tests/datasets/OpticalFlowDataset.h index 9e247206f8..00b148777d 100644 --- a/tests/datasets/OpticalFlowDataset.h +++ b/tests/datasets/OpticalFlowDataset.h @@ -24,6 +24,7 @@ #ifndef ARM_COMPUTE_TEST_OPTICAL_FLOW_DATASET #define ARM_COMPUTE_TEST_OPTICAL_FLOW_DATASET +#include "tests/TypePrinter.h" #include "tests/validation/Helpers.h" #include "utils/TypePrinter.h" diff --git a/tests/framework/datasets/ContainerDataset.h b/tests/framework/datasets/ContainerDataset.h index 8dfd2164c7..20af8a4dac 100644 --- a/tests/framework/datasets/ContainerDataset.h +++ b/tests/framework/datasets/ContainerDataset.h @@ -26,6 +26,7 @@ #include "Dataset.h" #include "support/ToolchainSupport.h" +#include "tests/TypePrinter.h" #include <string> #include <tuple> diff --git a/utils/TypePrinter.h b/utils/TypePrinter.h index 5d57dda201..1d881f8c06 100644 --- a/utils/TypePrinter.h +++ b/utils/TypePrinter.h @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ -#define __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ +#ifndef __ARM_COMPUTE_TYPE_PRINTER_H__ +#define __ARM_COMPUTE_TYPE_PRINTER_H__ #include "arm_compute/core/CL/CLTypes.h" #include "arm_compute/core/CPP/CPPTypes.h" @@ -35,8 +35,6 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Types.h" -#include "tests/Types.h" - #include <ostream> #include <sstream> #include <string> @@ -1342,46 +1340,6 @@ inline std::string to_string(const arm_compute::MagnitudeType &type) return str.str(); } -/** Formatted output of the GradientDimension type. - * - * @param[out] os Output stream - * @param[in] dim Type to output - * - * @return Modified output stream. - */ -inline ::std::ostream &operator<<(::std::ostream &os, const GradientDimension &dim) -{ - switch(dim) - { - case GradientDimension::GRAD_X: - os << "GRAD_X"; - break; - case GradientDimension::GRAD_Y: - os << "GRAD_Y"; - break; - case GradientDimension::GRAD_XY: - os << "GRAD_XY"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -/** Formatted output of the GradientDimension type. - * - * @param[in] type Type to output - * - * @return Formatted string. - */ -inline std::string to_string(const arm_compute::GradientDimension &type) -{ - std::stringstream str; - str << type; - return str.str(); -} - /** Formatted output of the HOGNormType type. * * @param[out] os Output stream @@ -1789,4 +1747,5 @@ inline std::string to_string(const T &val) } } // namespace arm_compute -#endif /* __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ */ + +#endif /* __ARM_COMPUTE_TYPE_PRINTER_H__ */ |