Merge changes from github.

Change: 149800363

3 files changed, 23 insertions, 23 deletions

diff --git a/third_party/curl.BUILD b/third_party/curl.BUILD
index 557c2885eb..43f6599acc 100644
--- a/third_party/curl.BUILD
+++ b/third_party/curl.BUILD
@@ -204,13 +204,13 @@ cc_library(
         "lib/wildcard.h",
         "lib/x509asn1.h",
     ] + select({
-        "@//tensorflow:darwin": [
+        "@%ws%//tensorflow:darwin": [
             "lib/vtls/darwinssl.c",
         ],
-        "@//tensorflow:ios": [
+        "@%ws%//tensorflow:ios": [
             "lib/vtls/darwinssl.c",
         ],
-        "@//tensorflow:windows": [
+        "@%ws%//tensorflow:windows": [
             "lib/asyn-thread.c",
             "lib/inet_ntop.c",
             "lib/system_win32.c",
@@ -231,7 +231,7 @@ cc_library(
         "include/curl/typecheck-gcc.h",
     ],
     copts = select({
-        "@//tensorflow:windows": [
+        "@%ws%//tensorflow:windows": [
             "/I%prefix%/curl/lib",
             "/DHAVE_CONFIG_H",
             "/DCURL_DISABLE_FTP",
@@ -255,10 +255,10 @@ cc_library(
             "-Wno-string-plus-int",
         ],
     }) + select({
-        "@//tensorflow:darwin": [
+        "@%ws%//tensorflow:darwin": [
             "-fno-constant-cfstrings",
         ],
-        "@//tensorflow:windows": [
+        "@%ws%//tensorflow:windows": [
             # See curl.h for discussion of write size and Windows
             "/DCURL_MAX_WRITE_SIZE=16384",
         ],
@@ -268,17 +268,17 @@ cc_library(
     }),
     includes = ["include"],
     linkopts = select({
-        "@//tensorflow:android": [
+        "@%ws%//tensorflow:android": [
             "-pie",
         ],
-        "@//tensorflow:darwin": [
+        "@%ws%//tensorflow:darwin": [
             "-Wl,-framework",
             "-Wl,CoreFoundation",
             "-Wl,-framework",
             "-Wl,Security",
         ],
-        "@//tensorflow:ios": [],
-        "@//tensorflow:windows": [
+        "@%ws%//tensorflow:ios": [],
+        "@%ws%//tensorflow:windows": [
             "ws2_32.lib",
         ],
         "//conditions:default": [
@@ -289,8 +289,8 @@ cc_library(
     deps = [
         "@zlib_archive//:zlib",
     ] + select({
-        "@//tensorflow:ios": [],
-        "@//tensorflow:windows": [],
+        "@%ws%//tensorflow:ios": [],
+        "@%ws%//tensorflow:windows": [],
         "//conditions:default": [
             "@boringssl//:ssl",
         ],
@@ -386,7 +386,7 @@ cc_binary(
         "src/tool_xattr.h",
     ],
     copts = select({
-        "@//tensorflow:windows": [
+        "@%ws%//tensorflow:windows": [
             "/I%prefix%/curl/lib",
             "/DHAVE_CONFIG_H",
             "/DCURL_DISABLE_LIBCURL_OPTION",
diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint b/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
index b0a73aac79..eb604d38b1 100644
--- a/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
+++ b/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
@@ -31,7 +31,7 @@
 #include "src/FixedPoint/FixedPointTypes.h"
 
 // Use optimized implementations whenever available
-#ifdef EIGEN_VECTORIZE_AVX512
+#if defined (EIGEN_VECTORIZE_AVX512DQ) || defined (EIGEN_VECTORIZE_AVX512BW)
 #include "src/FixedPoint/PacketMathAVX512.h"
 #include "src/FixedPoint/TypeCastingAVX512.h"
 
diff --git a/third_party/gmock.BUILD b/third_party/gmock.BUILD
index 501e322529..b800cac954 100644
--- a/third_party/gmock.BUILD
+++ b/third_party/gmock.BUILD
@@ -9,19 +9,19 @@ exports_files(["LICENSE"])
 cc_library(
     name = "gtest",
     srcs = [
-        "gtest/src/gtest-all.cc",
-        "src/gmock-all.cc",
+        "googlemock/src/gmock-all.cc",
+        "googletest/src/gtest-all.cc",
     ],
     hdrs = glob([
         "**/*.h",
-        "gtest/src/*.cc",
-        "src/*.cc",
+        "googletest/src/*.cc",
+        "googlemock/src/*.cc",
     ]),
     includes = [
-        ".",
-        "gtest",
-        "gtest/include",
-        "include",
+        "googlemock",
+        "googlemock/include",
+        "googletest",
+        "googletest/include",
     ],
     linkopts = ["-pthread"],
     visibility = ["//visibility:public"],
@@ -29,7 +29,7 @@ cc_library(
 
 cc_library(
     name = "gtest_main",
-    srcs = ["src/gmock_main.cc"],
+    srcs = ["googlemock/src/gmock_main.cc"],
     linkopts = ["-pthread"],
     visibility = ["//visibility:public"],
     deps = [":gtest"],