From 89fa3c5ed66a4e543ba01c31febf3edb417808d0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 14 Nov 2018 13:21:31 -0800
Subject: [PATCH] Updating Eigen to commit
 https://bitbucket.org/eigen/eigen/commits/af207140728002141ce3ff17f6f14cc159965f93.

PiperOrigin-RevId: 221498624
---
 tensorflow/workspace.bzl         |  9 +++---
 third_party/eigen_reshaped.patch | 48 --------------------------------
 2 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 third_party/eigen_reshaped.patch

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 29559927bb2..0c894c96348 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -134,12 +134,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
     tf_http_archive(
         name = "eigen_archive",
         build_file = clean_dep("//third_party:eigen.BUILD"),
-        patch_file = clean_dep("//third_party:eigen_reshaped.patch"),
-        sha256 = "d66cec3b54b3dfaa4666c1d49481a7197f93fc078cd53c54e2b4a8893a529c9f",
-        strip_prefix = "eigen-eigen-b4890dc6bc34",
+        sha256 = "1e045bef75e9b17d459b60cc30b34408f3fdab300c5053d3919d1a5921f3c86a",
+        strip_prefix = "eigen-eigen-af2071407280",
         urls = [
-            "https://mirror.bazel.build/bitbucket.org/eigen/eigen/get/b4890dc6bc34.tar.gz",
-            "https://bitbucket.org/eigen/eigen/get/b4890dc6bc34.tar.gz",
+            "https://mirror.bazel.build/bitbucket.org/eigen/eigen/get/af2071407280.tar.gz",
+            "https://bitbucket.org/eigen/eigen/get/af2071407280.tar.gz",
         ],
     )
 
diff --git a/third_party/eigen_reshaped.patch b/third_party/eigen_reshaped.patch
deleted file mode 100644
index 7acfdcf9fef..00000000000
--- a/third_party/eigen_reshaped.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/Eigen/src/Core/util/ReshapedHelper.h	(date 1541195478000)
-+++ b/Eigen/src/Core/util/ReshapedHelper.h	(date 1541195478000)
-@@ -39,6 +39,11 @@
-   return total/other;
- }
-
-+template<int Flags, int Order>
-+struct get_compiletime_reshape_order {
-+  enum { value = Order == AutoOrder ? Flags & RowMajorBit : Order };
-+};
-+
- }
-
- } // end namespace Eigen
---- a/Eigen/src/plugins/ReshapedMethods.h	(date 1541195254000)
-+++ b/Eigen/src/plugins/ReshapedMethods.h	(date 1541195254000)
-@@ -105,13 +105,13 @@
- inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived,
-                 internal::get_compiletime_reshape_size<NRowsType,NColsType,SizeAtCompileTime>::value,
-                 internal::get_compiletime_reshape_size<NColsType,NRowsType,SizeAtCompileTime>::value,
--                (Order==AutoOrder?Flags&RowMajorBit:Order)>
-+                internal::get_compiletime_reshape_order<Flags,Order>::value>
- reshaped(NRowsType nRows, NColsType nCols) EIGEN_RESHAPED_METHOD_CONST
- {
-   return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived,
-                   internal::get_compiletime_reshape_size<NRowsType,NColsType,SizeAtCompileTime>::value,
-                   internal::get_compiletime_reshape_size<NColsType,NRowsType,SizeAtCompileTime>::value,
--                  (Order==AutoOrder?Flags&RowMajorBit:Order)>
-+                  internal::get_compiletime_reshape_order<Flags,Order>::value>
-                 (derived(),
-                  internal::get_runtime_reshape_size(nRows,internal::get_runtime_value(nCols),size()),
-                  internal::get_runtime_reshape_size(nCols,internal::get_runtime_value(nRows),size()));
-@@ -128,11 +128,13 @@
-
- template<int Order>
- EIGEN_DEVICE_FUNC
--inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1, (Order==AutoOrder?Flags&RowMajorBit:Order)>
-+inline Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1,
-+                internal::get_compiletime_reshape_order<Flags,Order>::value>
- reshaped() EIGEN_RESHAPED_METHOD_CONST
- {
-   EIGEN_STATIC_ASSERT(Order==RowMajor || Order==ColMajor || Order==AutoOrder, INVALID_TEMPLATE_PARAMETER);
--  return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1, (Order==AutoOrder?Flags&RowMajorBit:Order)>
-+  return Reshaped<EIGEN_RESHAPED_METHOD_CONST Derived, SizeAtCompileTime, 1,
-+                  internal::get_compiletime_reshape_order<Flags,Order>::value>
-                 (derived(), size(), 1);
- }
- 
\ No newline at end of file