Patch absl to work around nvcc bug on windows.

PiperOrigin-RevId: 236429734
This commit is contained in:
A. Unique TensorFlower 2019-03-01 22:52:18 -08:00 committed by TensorFlower Gardener
parent 0e18a225eb
commit 837e5feed2
4 changed files with 15 additions and 0 deletions

View File

@ -221,6 +221,7 @@ tensorflow/third_party/astor.BUILD
tensorflow/third_party/grpc/BUILD
tensorflow/third_party/curl.BUILD
tensorflow/third_party/arm_neon_2_x86_sse.BUILD
tensorflow/third_party/absl/BUILD
tensorflow/third_party/png.BUILD
tensorflow/third_party/googleapis.BUILD
tensorflow/third_party/mpi_collectives/BUILD

View File

@ -128,6 +128,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
tf_http_archive(
name = "com_google_absl",
build_file = clean_dep("//third_party:com_google_absl.BUILD"),
patch_file = clean_dep("//third_party/absl:absl-nvcc.patch"),
sha256 = "c19386566a66fc0389d7ec70c0ffc398f037844c92c694ea7bc687929202e4eb",
strip_prefix = "abseil-cpp-b312c3cb53a0aad75a85ac2bf57c4a614fbd48d4",
urls = [

0
third_party/absl/BUILD vendored Normal file
View File

13
third_party/absl/absl-nvcc.patch vendored Normal file
View File

@ -0,0 +1,13 @@
diff --git a/absl/base/config.h b/absl/base/config.h
index db4c453..83a3133 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -127,7 +127,7 @@
(!defined(__clang__) && defined(__GNUC__) && \
(__GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)) && \
(defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) || \
- defined(_MSC_VER)
+ (defined(_MSC_VER) && !defined(__NVCC__))
#define ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1
#define ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1
#endif