frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use c10 math constants consistently in Math.h (#91967)

Browse Source 
On MSVC the `M_` constants are hidden behind the `USE_MATH_DEFINES` macro, so
it's better to avoid them in headers otherwise the include order can break
compilation.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/91967
Approved by: https://github.com/malfet
This commit is contained in:
Peter Bell
2023-01-11 17:34:24 +00:00
committed by PyTorch MergeBot
parent c7a22bb7c7
commit 8acf0e62d0
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aten/src/ATen/native/Math.h
View File

@ -2169,7 +2169,7 @@ calc_erfcx(T x)
*/
template <typename T>
static inline C10_HOST_DEVICE T calc_log_ndtr(T x) {
T t = x * M_SQRT1_2;
T t = x * c10::frac_sqrt_2<T>;
if (x < T{-1.0}) {
return std::log(calc_erfcx(-t) / 2) - t * t;
} else {
@ -2295,7 +2295,7 @@ static inline C10_HOST_DEVICE T airy_ai_forward(T x) {
agd = agd * (z * z) + AGD[index];
}
T t = T(-2.0) * x * std::sqrt(-x) / T(3.0) + T(0.25) * M_PI;
T t = T(-2.0) * x * std::sqrt(-x) / T(3.0) + T(0.25) * c10::pi<T>;
return T(5.64189583547756286948e-01) / std::sqrt(std::sqrt(-x)) * (std::sin(t) * (T(1.0) + z * z * afn / afd) - std::cos(t) * (z * agn / agd));
}

3
c10/util/MathConstants.cpp
View File

@ -11,3 +11,6 @@
#include <math.h>
static_assert(M_PI == c10::pi<double>, "c10::pi<double> must be equal to M_PI");
static_assert(
M_SQRT1_2 == c10::frac_sqrt_2<double>,
"c10::frac_sqrt_2<double> must be equal to M_SQRT1_2");

8
c10/util/MathConstants.h
View File

@ -32,6 +32,11 @@ C10_HOST_DEVICE inline constexpr T frac_1_sqrt_pi() {
return static_cast<T>(0.564189583547756286948079451560772);
}
template <typename T>
C10_HOST_DEVICE inline constexpr T frac_sqrt_2() {
return static_cast<T>(0.707106781186547524400844362104849);
}
template <typename T>
C10_HOST_DEVICE inline constexpr T frac_sqrt_3() {
return static_cast<T>(0.577350269189625764509148780501957);
@ -103,6 +108,9 @@ constexpr T frac_1_pi = c10::detail::frac_1_pi<T>();
template <typename T>
constexpr T frac_1_sqrt_pi = c10::detail::frac_1_sqrt_pi<T>();
template <typename T>
constexpr T frac_sqrt_2 = c10::detail::frac_sqrt_2<T>();
template <typename T>
constexpr T frac_sqrt_3 = c10::detail::frac_sqrt_3<T>();