diff options
| author |  Xiaoqiang Zheng <zhengxq@google.com> | 2016-09-14 16:46:54 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-09-14 18:03:30 -0700 |
| commit | 9bf15ad4b1c6561078814291c85bfb5e2c9f439b (patch) | |
| tree | 20ca09a8dce64f2ff7a1c208b339157608cf1b97 | |
| parent | 6336f61e54bd6ad25c8fbdefee1a64551b22c6f9 (diff) | |
Automated rollback of change 133188906
Change: 133198980
| -rw-r--r-- | tensorflow/core/kernels/cwise_op_add.cc | 4 | ||||
| -rw-r--r-- | tensorflow/core/kernels/cwise_op_gpu_add.cu.cc | 2 | ||||
| -rw-r--r-- | tensorflow/python/kernel_tests/cwise_ops_test.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/tensorflow/core/kernels/cwise_op_add.cc b/tensorflow/core/kernels/cwise_op_add.cc index 9c9f42b25e..98609ad90a 100644 --- a/tensorflow/core/kernels/cwise_op_add.cc +++ b/tensorflow/core/kernels/cwise_op_add.cc @@ -19,8 +19,8 @@ namespace tensorflow { REGISTER10(BinaryOp, CPU, "Add", functor::add, float, Eigen::half, double, int32, int64, int8, int16, complex64, complex128, string); #if GOOGLE_CUDA -REGISTER6(BinaryOp, GPU, "Add", functor::add, float, Eigen::half, double, int64, - complex64, complex128); +REGISTER4(BinaryOp, GPU, "Add", functor::add, float, Eigen::half, double, + int64); // A special GPU kernel for int32. // TODO(b/25387198): Also enable int32 in device memory. This kernel diff --git a/tensorflow/core/kernels/cwise_op_gpu_add.cu.cc b/tensorflow/core/kernels/cwise_op_gpu_add.cu.cc index 5aaf2b5b4b..442ed452ed 100644 --- a/tensorflow/core/kernels/cwise_op_gpu_add.cu.cc +++ b/tensorflow/core/kernels/cwise_op_gpu_add.cu.cc @@ -19,7 +19,7 @@ limitations under the License. namespace tensorflow { namespace functor { -DEFINE_BINARY6(add, Eigen::half, float, double, int64, complex64, complex128); +DEFINE_BINARY4(add, Eigen::half, float, double, int64); } // namespace functor } // namespace tensorflow diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py index 5fbd92423b..428e60ecf5 100644 --- a/tensorflow/python/kernel_tests/cwise_ops_test.py +++ b/tensorflow/python/kernel_tests/cwise_ops_test.py @@ -725,7 +725,6 @@ class BinaryOpTest(tf.test.TestCase): self._compareCpu(x, y, np.subtract, _SUB) self._compareCpu(x, y, np.multiply, _MUL) self._compareCpu(x, y + 0.1, np.true_divide, _TRUEDIV) - self._compareGpu(x, y, np.add, tf.add) def testComplex128Basic(self): x = np.complex(1, 1) * np.linspace(-10, 10, 6).reshape(1, 3, 2).astype( @@ -740,7 +739,6 @@ class BinaryOpTest(tf.test.TestCase): self._compareCpu(x, y, np.subtract, _SUB) self._compareCpu(x, y, np.multiply, _MUL) self._compareCpu(x, y + 0.1, np.true_divide, _TRUEDIV) - self._compareGpu(x, y, np.add, tf.add) def testStringComparison(self): x = np.array([["abc", "bh"], ["c", ""]]) |