From 9badef2f3f124508dfd0679f67851c27b9a7bcb8 Mon Sep 17 00:00:00 2001
From: Artem Belevich <tra@google.com>
Date: Fri, 20 Dec 2019 14:37:39 -0800
Subject: [PATCH] Define _USE_MATH_DEFINES for windows builds.
PiperOrigin-RevId: 286642121
Change-Id: I8ec228fd768df5b20a11cdc63fcf219d6ab24de7
---
.bazelrc | 4 ++++
tensorflow/cc/gradients/math_grad.cc | 1 -
tensorflow/compiler/xla/client/lib/math.cc | 4 +---
tensorflow/core/lib/random/random_distributions.h | 3 ---
tensorflow/core/lib/random/random_distributions_test.cc | 2 +-
tensorflow/lite/experimental/microfrontend/lib/window_util.c | 2 --
tensorflow/tensorflow.bzl | 2 ++
7 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/.bazelrc b/.bazelrc
index 9aca8b4261e..7beb93e4207 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -160,6 +160,10 @@ build:c++17 --cxxopt=-std=c++1z
build:c++17 --cxxopt=-stdlib=libc++
build:c++1z --config=c++17
+# Tensorflow uses M_* math constants that only get defined by MSVC headers if
+# _USE_MATH_DEFINES is defined.
+build:windows --copt=/D_USE_MATH_DEFINES
+
# Default paths for TF_SYSTEM_LIBS
build --define=PREFIX=/usr
build --define=LIBDIR=$(PREFIX)/lib
diff --git a/tensorflow/cc/gradients/math_grad.cc b/tensorflow/cc/gradients/math_grad.cc
index b3c1e6a913a..f67c6f91d6c 100644
--- a/tensorflow/cc/gradients/math_grad.cc
+++ b/tensorflow/cc/gradients/math_grad.cc
@@ -13,7 +13,6 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#define _USE_MATH_DEFINES
#include <cmath>
#include "tensorflow/cc/ops/array_ops_internal.h"
diff --git a/tensorflow/compiler/xla/client/lib/math.cc b/tensorflow/compiler/xla/client/lib/math.cc
index 989968b5cbc..81c3a874f4e 100644
--- a/tensorflow/compiler/xla/client/lib/math.cc
+++ b/tensorflow/compiler/xla/client/lib/math.cc
@@ -15,9 +15,7 @@ limitations under the License.
#include "tensorflow/compiler/xla/client/lib/math.h"
-// This macro is required to make MSVC defines math constants in math.h
-#define _USE_MATH_DEFINES
-#include <math.h>
+#include <cmath>
#include "tensorflow/compiler/xla/client/lib/arithmetic.h"
#include "tensorflow/compiler/xla/client/lib/constants.h"
diff --git a/tensorflow/core/lib/random/random_distributions.h b/tensorflow/core/lib/random/random_distributions.h
index 6fb6babe7ec..6f40816aedb 100644
--- a/tensorflow/core/lib/random/random_distributions.h
+++ b/tensorflow/core/lib/random/random_distributions.h
@@ -18,10 +18,7 @@ limitations under the License.
#include <string.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
#include <cmath>
-#undef _USE_MATH_DEFINES
#include <algorithm>
#include <type_traits>
diff --git a/tensorflow/core/lib/random/random_distributions_test.cc b/tensorflow/core/lib/random/random_distributions_test.cc
index 8868672a10a..a4973160182 100644
--- a/tensorflow/core/lib/random/random_distributions_test.cc
+++ b/tensorflow/core/lib/random/random_distributions_test.cc
@@ -15,8 +15,8 @@ limitations under the License.
#include "tensorflow/core/lib/random/random_distributions.h"
-#include <math.h>
#include <algorithm>
+#include <cmath>
#include <functional>
#include <numeric>
#include <unordered_map>
diff --git a/tensorflow/lite/experimental/microfrontend/lib/window_util.c b/tensorflow/lite/experimental/microfrontend/lib/window_util.c
index 3e544f5dd38..eee6e7b56ef 100644
--- a/tensorflow/lite/experimental/microfrontend/lib/window_util.c
+++ b/tensorflow/lite/experimental/microfrontend/lib/window_util.c
@@ -14,8 +14,6 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/lite/experimental/microfrontend/lib/window_util.h"
-// This macro is required to make MSVC defines math constants in math.h
-#define _USE_MATH_DEFINES
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 048a6ebcd50..740f24ec4a4 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -263,6 +263,8 @@ def get_win_copts(is_external = False):
# "/EHs-c-",
"/wd4577",
"/DNOGDI",
+ # Also see build:windows lines in tensorflow/opensource_only/.bazelrc
+ # where we set some other options globally.
]
if is_external:
return WINDOWS_COPTS + ["/UTF_COMPILE_LIBRARY"]