Prevent TensorFlow from crashing when attempting to reduce an empty t…

…ensor on GPU Change: 120505517
sachinravi14 · Apr 22, 2016 · f4e8318 · f4e8318
1 parent bcf3dcb
commit f4e8318
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/eigen.BUILD b/eigen.BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-archive_dir = "eigen-eigen-0823d98fdde7"
+archive_dir = "eigen-eigen-ffa59a39ffb9"
 
 cc_library(
     name = "eigen",

diff --git a/tensorflow/contrib/cmake/external/eigen.cmake b/tensorflow/contrib/cmake/external/eigen.cmake
@@ -7,7 +7,7 @@
 
 include (ExternalProject)
 
-set(eigen_archive_hash "0823d98fdde7")
+set(eigen_archive_hash "ffa59a39ffb9")
 
 set(eigen_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -16,7 +16,7 @@ set(eigen_INCLUDE_DIRS
     ${tensorflow_source_dir}/third_party/eigen3
 )
 set(eigen_URL https://bitbucket.org/eigen/eigen/get/${eigen_archive_hash}.tar.gz)
-set(eigen_HASH SHA256=bbb8504e2fbb02937bb4efba4631f2344cd898a4fcee2cf4e7f22542de9aeb52)
+set(eigen_HASH SHA256=ccca47fe6528a97bcec26c733908114bbfb701c5d818d095820da94b158ef8e1)
 set(eigen_BUILD ${CMAKE_CURRENT_BINARY_DIR}/eigen/src/eigen)
 set(eigen_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/eigen/install)
 

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
@@ -13,8 +13,8 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
 
   native.new_http_archive(
     name = "eigen_archive",
-    url = "https://bitbucket.org/eigen/eigen/get/0823d98fdde7.tar.gz",
-    sha256 = "bbb8504e2fbb02937bb4efba4631f2344cd898a4fcee2cf4e7f22542de9aeb52",
+    url = "https://bitbucket.org/eigen/eigen/get/ffa59a39ffb9.tar.gz",
+    sha256 = "ccca47fe6528a97bcec26c733908114bbfb701c5d818d095820da94b158ef8e1",
     build_file = path_prefix + "eigen.BUILD",
   )
 

diff --git a/third_party/eigen3/Eigen/Cholesky b/third_party/eigen3/Eigen/Cholesky
@@ -1 +1 @@
-#include "eigen-eigen-0823d98fdde7/Eigen/Cholesky"
+#include "eigen-eigen-ffa59a39ffb9/Eigen/Cholesky"
diff --git a/third_party/eigen3/Eigen/Core b/third_party/eigen3/Eigen/Core
@@ -1 +1 @@
-#include "eigen-eigen-0823d98fdde7/Eigen/Core"
+#include "eigen-eigen-ffa59a39ffb9/Eigen/Core"
diff --git a/third_party/eigen3/Eigen/Eigenvalues b/third_party/eigen3/Eigen/Eigenvalues
@@ -1 +1 @@
-#include "eigen-eigen-0823d98fdde7/Eigen/Eigenvalues"
+#include "eigen-eigen-ffa59a39ffb9/Eigen/Eigenvalues"
diff --git a/third_party/eigen3/Eigen/LU b/third_party/eigen3/Eigen/LU
@@ -1 +1 @@
-#include "eigen-eigen-0823d98fdde7/Eigen/LU"
+#include "eigen-eigen-ffa59a39ffb9/Eigen/LU"
diff --git a/third_party/eigen3/Eigen/QR b/third_party/eigen3/Eigen/QR
@@ -1 +1 @@
-#include "eigen-eigen-0823d98fdde7/Eigen/QR"
+#include "eigen-eigen-ffa59a39ffb9/Eigen/QR"
diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
@@ -1 +1 @@
-#include "eigen-eigen-0823d98fdde7/unsupported/Eigen/CXX11/Tensor"
+#include "eigen-eigen-ffa59a39ffb9/unsupported/Eigen/CXX11/Tensor"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#include "eigen-eigen-0823d98fdde7/Eigen/Cholesky"
		#include "eigen-eigen-ffa59a39ffb9/Eigen/Cholesky"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#include "eigen-eigen-0823d98fdde7/unsupported/Eigen/CXX11/Tensor"
		#include "eigen-eigen-ffa59a39ffb9/unsupported/Eigen/CXX11/Tensor"