From d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Thu, 29 Jun 2017 14:51:57 +0100 Subject: 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 Tested-by: Kaizen Reviewed-by: Pablo Tello --- tests/Utils.h | 277 ++-------------------------------------------------------- 1 file changed, 5 insertions(+), 272 deletions(-) (limited to 'tests/Utils.h') 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 #include @@ -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 ::type>::value, int>::type = 0> -std::string to_string(T && value) -{ - std::stringstream stream; - stream << std::forward(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 ::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 ::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 ::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 -std::string to_string(T &&value) -{ - return ::std::to_string(std::forward(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 -int stoi(Ts &&... args) -{ - return ::std::stoi(std::forward(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 -int stoul(Ts &&... args) -{ - return ::std::stoul(std::forward(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 -int stof(Ts &&... args) -{ - return ::std::stof(std::forward(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 ::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 ::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 ::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::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 -struct _Unique_if -{ - typedef std::unique_ptr _Single_object; -}; - -template -struct _Unique_if -{ - typedef std::unique_ptr _Unknown_bound; -}; - -template -struct _Unique_if -{ - typedef void _Known_bound; -}; - -template -typename _Unique_if::_Single_object -make_unique(Args &&... args) -{ - return std::unique_ptr(new T(std::forward(args)...)); -} - -template -typename _Unique_if::_Unknown_bound -make_unique(size_t n) -{ - typedef typename std::remove_extent::type U; - return std::unique_ptr(new U[n]()); -} - -template -typename _Unique_if::_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 -- cgit v1.2.1