Bugfix to bug created in previous TensorArray change:

TF_REGISTER_ALL_TYPES does not register complex types on android builds, but
matmul etc. require it; and use SetZero functor.  Reverted that change, and
cleaned up the TensorArray LockedRead to handle only numeric types with SetZero;
and then only call it when the size of the Tensor is > 0.
Change: 121546296

Author: ebrevdo

tensorflow/core/kernels/constant_op.cc

@@ -122,7 +122,16 @@ struct SetZeroFunctor<CPUDevice, T> {
 };
 
 #define DEFINE_SETZERO_CPU(T) template struct SetZeroFunctor<CPUDevice, T>;
-TF_CALL_ALL_TYPES(DEFINE_SETZERO_CPU)
+DEFINE_SETZERO_CPU(Eigen::half);
+DEFINE_SETZERO_CPU(float);
+DEFINE_SETZERO_CPU(double);
+DEFINE_SETZERO_CPU(uint8);
+DEFINE_SETZERO_CPU(int8);
+DEFINE_SETZERO_CPU(int16);
+DEFINE_SETZERO_CPU(int32);
+DEFINE_SETZERO_CPU(int64);
+DEFINE_SETZERO_CPU(complex64);
+DEFINE_SETZERO_CPU(complex128);
 #undef DEFINE_SETZERO_CPU
 
 }  // end namespace functor

tensorflow/core/kernels/tensor_array.cc

@@ -60,7 +60,7 @@ TF_CALL_GPU_NUMBER_TYPES(TENSOR_ARRAY_WRITE_OR_ADD_GPU);
   }
 
 #define TENSOR_ARRAY_SET_ZERO_CPU(T) TENSOR_ARRAY_SET_ZERO(CPUDevice, T)
-TF_CALL_ALL_TYPES(TENSOR_ARRAY_SET_ZERO_CPU)
+TF_CALL_NUMBER_TYPES(TENSOR_ARRAY_SET_ZERO_CPU)
 #undef TENSOR_ARRAY_SET_ZERO_CPU
 
 #if GOOGLE_CUDA

tensorflow/core/kernels/tensor_array.h

@@ -77,7 +77,7 @@ Status TensorSetZero(OpKernelContext* ctx, Tensor* value) {
   Status TensorSetZero<Device, T>(OpKernelContext * ctx, Tensor * value);
 
 #define TENSOR_ARRAY_SET_ZERO_CPU(T) TENSOR_ARRAY_SET_ZERO(CPUDevice, T)
-TF_CALL_ALL_TYPES(TENSOR_ARRAY_SET_ZERO_CPU)
+TF_CALL_NUMBER_TYPES(TENSOR_ARRAY_SET_ZERO_CPU)
 #undef TENSOR_ARRAY_SET_ZERO_CPU
 
 #if GOOGLE_CUDA
@@ -469,8 +469,10 @@ Status TensorArray::LockedRead(OpKernelContext* ctx, const int32 index,
     Tensor* tensor_t;
     TF_RETURN_IF_ERROR(
         ctx->allocate_persistent(dtype_, t.shape, &t.tensor, &tensor_t));
-    Status s = tensor_array::TensorSetZero<Device, T>(ctx, tensor_t);
-    if (!s.ok()) return s;
+    if (t.shape.num_elements() > 0) {
+      Status s = tensor_array::TensorSetZero<Device, T>(ctx, tensor_t);
+      if (!s.ok()) return s;
+    }
   }
 
   // Data is available inside the tensor, copy the reference over.