aboutsummaryrefslogtreecommitdiff
path: root/tests/Utils.h
diff options
context:
space:
mode:
authorMoritz Pflanzer <moritz.pflanzer@arm.com>2017-06-29 14:51:57 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-09-17 14:15:39 +0100
commitd0ae8b8ac8a371fd552c46d4b3be3db8628a5ade (patch)
treee4b035d01add61c37fcbeaf38a6a54e550235d8f /tests/Utils.h
parent5cb4c42cb5d781a44409ebc97a408e1379ce182d (diff)
downloadComputeLibrary-d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade.tar.gz
COMPMID-417: Extract common toolchain support file
The support file is needed as Android toolchains are missing some C++11 functions. It further includes functions that have been introduced in C++14 but which we already need. Eventually the support file might become unnecessary if the Android compilers improve and we switch to C++14. Change-Id: Ib5ec506f1a17c78149c315ab2096b901b852c180 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79247 Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com> Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com> Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Diffstat (limited to 'tests/Utils.h')
-rw-r--r--tests/Utils.h277
1 files changed, 5 insertions, 272 deletions
diff --git a/tests/Utils.h b/tests/Utils.h
index 25023d46e6..3be046182a 100644
--- a/tests/Utils.h
+++ b/tests/Utils.h
@@ -27,8 +27,10 @@
#include "arm_compute/core/Coordinates.h"
#include "arm_compute/core/Error.h"
#include "arm_compute/core/FixedPoint.h"
+#include "arm_compute/core/TensorInfo.h"
#include "arm_compute/core/TensorShape.h"
#include "arm_compute/core/Types.h"
+#include "support/ToolchainSupport.h"
#include <cmath>
#include <cstddef>
@@ -46,230 +48,6 @@ namespace arm_compute
{
namespace test
{
-namespace cpp11
-{
-#ifdef __ANDROID__
-/** Convert integer and float values to string.
- *
- * @note This function implements the same behaviour as std::to_string. The
- * latter is missing in some Android toolchains.
- *
- * @param[in] value Value to be converted to string.
- *
- * @return String representation of @p value.
- */
-template <typename T, typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value, int>::type = 0>
-std::string to_string(T && value)
-{
- std::stringstream stream;
- stream << std::forward<T>(value);
- return stream.str();
-}
-
-/** Convert string values to integer.
- *
- * @note This function implements the same behaviour as std::stoi. The latter
- * is missing in some Android toolchains.
- *
- * @param[in] str String to be converted to int.
- *
- * @return Integer representation of @p str.
- */
-inline int stoi(const std::string &str)
-{
- std::stringstream stream(str);
- int value = 0;
- stream >> value;
- return value;
-}
-
-/** Convert string values to unsigned long.
- *
- * @note This function implements the same behaviour as std::stoul. The latter
- * is missing in some Android toolchains.
- *
- * @param[in] str String to be converted to unsigned long.
- *
- * @return Unsigned long representation of @p str.
- */
-inline unsigned long stoul(const std::string &str)
-{
- std::stringstream stream(str);
- unsigned long value = 0;
- stream >> value;
- return value;
-}
-
-/** Convert string values to float.
- *
- * @note This function implements the same behaviour as std::stof. The latter
- * is missing in some Android toolchains.
- *
- * @param[in] str String to be converted to float.
- *
- * @return Float representation of @p str.
- */
-inline float stof(const std::string &str)
-{
- std::stringstream stream(str);
- float value = 0.f;
- stream >> value;
- return value;
-}
-
-/** Round floating-point value with half value rounding away from zero.
- *
- * @note This function implements the same behaviour as std::round except that it doesn't
- * support Integral type. The latter is not in the namespace std in some Android toolchains.
- *
- * @param[in] value floating-point value to be rounded.
- *
- * @return Floating-point value of rounded @p value.
- */
-template <typename T, typename = typename std::enable_if<std::is_floating_point<T>::value>::type>
-inline T round(T value)
-{
- return ::round(value);
-}
-
-/** Truncate floating-point value.
- *
- * @note This function implements the same behaviour as std::truncate except that it doesn't
- * support Integral type. The latter is not in the namespace std in some Android toolchains.
- *
- * @param[in] value floating-point value to be truncated.
- *
- * @return Floating-point value of truncated @p value.
- */
-template <typename T, typename = typename std::enable_if<std::is_floating_point<T>::value>::type>
-inline T trunc(T value)
-{
- return ::trunc(value);
-}
-
-/** Composes a floating point value with the magnitude of @p x and the sign of @p y.
- *
- * @note This function implements the same behaviour as std::copysign except that it doesn't
- * support Integral type. The latter is not in the namespace std in some Android toolchains.
- *
- * @param[in] x value that contains the magnitued to be used in constructing the result.
- * @param[in] y value that contains the sign to be used in constructin the result.
- *
- * @return Floating-point value with magnitude of @p x and sign of @p y.
- */
-template <typename T, typename = typename std::enable_if<std::is_floating_point<T>::value>::type>
-inline T copysign(T x, T y)
-{
- return ::copysign(x, y);
-}
-#else
-/** Convert integer and float values to string.
- *
- * @note This function acts as a convenience wrapper around std::to_string. The
- * latter is missing in some Android toolchains.
- *
- * @param[in] value Value to be converted to string.
- *
- * @return String representation of @p value.
- */
-template <typename T>
-std::string to_string(T &&value)
-{
- return ::std::to_string(std::forward<T>(value));
-}
-
-/** Convert string values to integer.
- *
- * @note This function acts as a convenience wrapper around std::stoi. The
- * latter is missing in some Android toolchains.
- *
- * @param[in] args Arguments forwarded to std::stoi.
- *
- * @return Integer representation of input string.
- */
-template <typename... Ts>
-int stoi(Ts &&... args)
-{
- return ::std::stoi(std::forward<Ts>(args)...);
-}
-
-/** Convert string values to unsigned long.
- *
- * @note This function acts as a convenience wrapper around std::stoul. The
- * latter is missing in some Android toolchains.
- *
- * @param[in] args Arguments forwarded to std::stoul.
- *
- * @return Unsigned long representation of input string.
- */
-template <typename... Ts>
-int stoul(Ts &&... args)
-{
- return ::std::stoul(std::forward<Ts>(args)...);
-}
-
-/** Convert string values to float.
- *
- * @note This function acts as a convenience wrapper around std::stof. The
- * latter is missing in some Android toolchains.
- *
- * @param[in] args Arguments forwarded to std::stof.
- *
- * @return Float representation of input string.
- */
-template <typename... Ts>
-int stof(Ts &&... args)
-{
- return ::std::stof(std::forward<Ts>(args)...);
-}
-
-/** Round floating-point value with half value rounding away from zero.
- *
- * @note This function implements the same behaviour as std::round except that it doesn't
- * support Integral type. The latter is not in the namespace std in some Android toolchains.
- *
- * @param[in] value floating-point value to be rounded.
- *
- * @return Floating-point value of rounded @p value.
- */
-template <typename T, typename = typename std::enable_if<std::is_floating_point<T>::value>::type>
-inline T round(T value)
-{
- return std::round(value);
-}
-
-/** Truncate floating-point value.
- *
- * @note This function implements the same behaviour as std::truncate except that it doesn't
- * support Integral type. The latter is not in the namespace std in some Android toolchains.
- *
- * @param[in] value floating-point value to be truncated.
- *
- * @return Floating-point value of truncated @p value.
- */
-template <typename T, typename = typename std::enable_if<std::is_floating_point<T>::value>::type>
-inline T trunc(T value)
-{
- return std::trunc(value);
-}
-
-/** Composes a floating point value with the magnitude of @p x and the sign of @p y.
- *
- * @note This function implements the same behaviour as std::copysign except that it doesn't
- * support Integral type. The latter is not in the namespace std in some Android toolchains.
- *
- * @param[in] x value that contains the magnitued to be used in constructing the result.
- * @param[in] y value that contains the sign to be used in constructin the result.
- *
- * @return Floating-point value with magnitude of @p x and sign of @p y.
- */
-template <typename T, typename = typename std::enable_if<std::is_floating_point<T>::value>::type>
-inline T copysign(T x, T y)
-{
- return std::copysign(x, y);
-}
-#endif
-
/** Round floating-point value with half value rounding to positive infinity.
*
* @param[in] value floating-point value to be rounded.
@@ -301,58 +79,14 @@ inline T round_half_even(T value, T epsilon = std::numeric_limits<T>::epsilon())
// If 'ipart' is even then return 'ipart'
if(std::fmod(ipart, 2.f) < epsilon)
{
- return cpp11::copysign(ipart, value);
+ return support::cpp11::copysign(ipart, value);
}
// Else return the nearest even integer
- return cpp11::copysign(std::ceil(ipart + 0.5f), value);
+ return support::cpp11::copysign(std::ceil(ipart + 0.5f), value);
}
// Otherwise use the usual round to closest
- return cpp11::copysign(cpp11::round(positive_value), value);
+ return support::cpp11::copysign(support::cpp11::round(positive_value), value);
}
-} // namespace cpp11
-
-namespace cpp14
-{
-/** make_unqiue is missing in CPP11. Reimplement it according to the standard
- * proposal.
- */
-template <class T>
-struct _Unique_if
-{
- typedef std::unique_ptr<T> _Single_object;
-};
-
-template <class T>
-struct _Unique_if<T[]>
-{
- typedef std::unique_ptr<T[]> _Unknown_bound;
-};
-
-template <class T, size_t N>
-struct _Unique_if<T[N]>
-{
- typedef void _Known_bound;
-};
-
-template <class T, class... Args>
-typename _Unique_if<T>::_Single_object
-make_unique(Args &&... args)
-{
- return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-
-template <class T>
-typename _Unique_if<T>::_Unknown_bound
-make_unique(size_t n)
-{
- typedef typename std::remove_extent<T>::type U;
- return std::unique_ptr<T>(new U[n]());
-}
-
-template <class T, class... Args>
-typename _Unique_if<T>::_Known_bound
-make_unique(Args &&...) = delete;
-} // namespace cpp14
namespace traits
{
@@ -663,7 +397,6 @@ inline bool is_in_valid_region(const ValidRegion &valid_region, const Coordinate
}
return true;
}
-
} // namespace test
} // namespace arm_compute
#endif