-
Notifications
You must be signed in to change notification settings - Fork 612
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[upstream_utils] Fix GCEM namespace usage and add hypot(x, y, z)
- Loading branch information
Showing
67 changed files
with
1,696 additions
and
229 deletions.
There are no files selected for viewing
1,232 changes: 1,086 additions & 146 deletions
1,232
upstream_utils/gcem_patches/0001-Call-std-functions-if-not-constant-evaluated.patch
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Tyler Veness <calcmogul@gmail.com> | ||
| Date: Sun, 3 Dec 2023 14:03:58 -0800 | ||
| Subject: [PATCH 2/2] Add hypot(x, y, z) | ||
|
|
||
| --- | ||
| include/gcem_incl/hypot.hpp | 85 +++++++++++++++++++++++++++++++++++-- | ||
| 1 file changed, 82 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/include/gcem_incl/hypot.hpp b/include/gcem_incl/hypot.hpp | ||
| index 00e10f899ace8f0da925fa9e46fa3f79f7e83aa0..13ea80c49d374c23434c1f9859bb6474184dc420 100644 | ||
| --- a/include/gcem_incl/hypot.hpp | ||
| +++ b/include/gcem_incl/hypot.hpp | ||
| @@ -27,6 +27,7 @@ | ||
| #ifndef _gcem_hypot_HPP | ||
| #define _gcem_hypot_HPP | ||
|
|
||
| +#include <algorithm> | ||
| #include <cmath> | ||
| #include <type_traits> | ||
|
|
||
| @@ -39,10 +40,29 @@ namespace internal | ||
| template<typename T> | ||
| constexpr | ||
| T | ||
| -hypot_compute(const T x, const T ydx) | ||
| +hypot_compute(const T x, const T y) | ||
| noexcept | ||
| { | ||
| - return abs(x) * sqrt( T(1) + (ydx * ydx) ); | ||
| + T a = std::max(abs(x), abs(y)); | ||
| + if (a) { | ||
| + return a * sqrt((x / a) * (x / a) + (y / a) * (y / a)); | ||
| + } else { | ||
| + return {}; | ||
| + } | ||
| +} | ||
| + | ||
| +template<typename T> | ||
| +constexpr | ||
| +T | ||
| +hypot_compute(const T x, const T y, const T z) | ||
| +noexcept | ||
| +{ | ||
| + T a = std::max({abs(x), abs(y), abs(z)}); | ||
| + if (a) { | ||
| + return a * sqrt((x / a) * (x / a) + (y / a) * (y / a) + (z / a) * (z / a)); | ||
| + } else { | ||
| + return {}; | ||
| + } | ||
| } | ||
|
|
||
| template<typename T> | ||
| @@ -62,7 +82,35 @@ noexcept | ||
| GCLIM<T>::min() > abs(y) ? \ | ||
| abs(x) : | ||
| // else | ||
| - hypot_compute(x, y/x) ); | ||
| + hypot_compute(x, y) ); | ||
| +} | ||
| + | ||
| +template<typename T> | ||
| +constexpr | ||
| +T | ||
| +hypot_vals_check(const T x, const T y, const T z) | ||
| +noexcept | ||
| +{ | ||
| + return( any_nan(x, y, z) ? \ | ||
| + GCLIM<T>::quiet_NaN() : | ||
| + // | ||
| + any_inf(x,y,z) ? \ | ||
| + GCLIM<T>::infinity() : | ||
| + // indistinguishable from zero or one | ||
| + GCLIM<T>::min() > abs(x) && GCLIM<T>::min() > abs(y) ? \ | ||
| + abs(z) : | ||
| + GCLIM<T>::min() > abs(x) && GCLIM<T>::min() > abs(z) ? \ | ||
| + abs(y) : | ||
| + GCLIM<T>::min() > abs(y) && GCLIM<T>::min() > abs(z) ? \ | ||
| + abs(x) : | ||
| + GCLIM<T>::min() > abs(x) ? \ | ||
| + hypot_vals_check(y, z) : | ||
| + GCLIM<T>::min() > abs(y) ? \ | ||
| + hypot_vals_check(x, z) : | ||
| + GCLIM<T>::min() > abs(z) ? \ | ||
| + hypot_vals_check(x, y) : | ||
| + // else | ||
| + hypot_compute(x, y, z) ); | ||
| } | ||
|
|
||
| template<typename T1, typename T2, typename TC = common_return_t<T1,T2>> | ||
| @@ -74,6 +122,15 @@ noexcept | ||
| return hypot_vals_check(static_cast<TC>(x),static_cast<TC>(y)); | ||
| } | ||
|
|
||
| +template<typename T1, typename T2, typename T3, typename TC = common_return_t<T1,T2,T3>> | ||
| +constexpr | ||
| +TC | ||
| +hypot_type_check(const T1 x, const T2 y, const T3 z) | ||
| +noexcept | ||
| +{ | ||
| + return hypot_vals_check(static_cast<TC>(x),static_cast<TC>(y),static_cast<TC>(z)); | ||
| +} | ||
| + | ||
| } | ||
|
|
||
| /** | ||
| @@ -97,6 +154,28 @@ noexcept | ||
| } | ||
| } | ||
|
|
||
| +/** | ||
| + * Compile-time Pythagorean addition function | ||
| + * | ||
| + * @param x a real-valued input. | ||
| + * @param y a real-valued input. | ||
| + * @param z a real-valued input. | ||
| + * @return Computes \f$ x \oplus y \oplus z = \sqrt{x^2 + y^2 + z^2} \f$. | ||
| + */ | ||
| + | ||
| +template<typename T1, typename T2, typename T3> | ||
| +constexpr | ||
| +common_return_t<T1,T2,T3> | ||
| +hypot(const T1 x, const T2 y, const T3 z) | ||
| +noexcept | ||
| +{ | ||
| + if (std::is_constant_evaluated()) { | ||
| + return internal::hypot_type_check(x,y,z); | ||
| + } else { | ||
| + return std::hypot(x, y, z); | ||
| + } | ||
| +} | ||
| + | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.