From adc59d1aa4b19282ff02af4b684eb0ea2be00a3b Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@gmail.com>
Date: Wed, 20 Apr 2016 13:28:05 -0800
Subject: [PATCH] Rollback of: tensorflow: switch to eigen thread pool

This is first step of switching tensorflow to the new
non-blocking thread pool in eigen.

TESTED:
  - passed opensource_build
Change: 120376183
---
 tensorflow/core/BUILD                  | 2 --
 tensorflow/core/lib/core/threadpool.cc | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index cbd3f15d94e..080e8514475 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -642,7 +642,6 @@ cc_library(
         }),
     hdrs = ANDROID_TF_LITE_HDRS,
     copts = tf_copts() + ["-Os"],
-    defines = ["TENSORFLOW_USE_EIGEN_THREADPOOL"],
     tags = [
         "manual",
         "notap",
@@ -771,7 +770,6 @@ cc_library(
         "platform/tracing.h",
     ],
     copts = tf_copts(),
-    defines = ["TENSORFLOW_USE_EIGEN_THREADPOOL"],
     linkopts = ["-ldl"],
     deps = [
         ":protos_all_cc",
diff --git a/tensorflow/core/lib/core/threadpool.cc b/tensorflow/core/lib/core/threadpool.cc
index f88579418e4..f4e952826a6 100644
--- a/tensorflow/core/lib/core/threadpool.cc
+++ b/tensorflow/core/lib/core/threadpool.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #ifdef TENSORFLOW_USE_EIGEN_THREADPOOL
 #define EIGEN_USE_THREADS
+#define EIGEN_USE_CUSTOM_THREAD_POOL
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #else
 #include <deque>