Merge pull request tensorflow#28620 from adamjrichter:master

PiperOrigin-RevId: 248230390

Author: tensorflower-gardener

tensorflow/core/kernels/eigen_backward_spatial_convolutions.h

@@ -366,8 +366,8 @@ SpatialConvolutionBackwardKernel(
                       YOU_MADE_A_PROGRAMMING_MISTAKE);
 
   // stride and in_stride cannot both be larger than 1
-  eigen_assert(!(row_stride > 1 && row_in_stride > 1) &&
-               !(col_stride > 1 && col_in_stride > 1));
+  eigen_assert(!(row_stride > 1 && row_in_stride > 1));
+  eigen_assert(!(col_stride > 1 && col_in_stride > 1));
 
   static const bool isColMajor = (internal::traits<Input>::Layout == ColMajor);
 

tensorflow/core/util/gpu_device_functions.h

@@ -459,7 +459,8 @@ __host__ __device__ inline std::complex<double> CudaLdg(
 template <typename T>
 __global__ void SetZero(const int count, T* ptr) {
   // Check that the grid is one dimensional and index doesn't overflow.
-  assert(blockDim.y == 1 && blockDim.z == 1);
+  assert(blockDim.y == 1);
+  assert(blockDim.z == 1);
   assert(blockDim.x * gridDim.x / blockDim.x == gridDim.x);
   for (int i : CudaGridRangeX(count)) {
     ptr[i] = T(0);
@@ -470,7 +471,8 @@ __global__ void SetZero(const int count, T* ptr) {
 template <typename T>
 __global__ void SetToValue(const int count, T* ptr, T value) {
   // Check that the grid is one dimensional and index doesn't overflow.
-  assert(blockDim.y == 1 && blockDim.z == 1);
+  assert(blockDim.y == 1);
+  assert(blockDim.z == 1);
   assert(blockDim.x * gridDim.x / blockDim.x == gridDim.x);
   for (int i : CudaGridRangeX(count)) {
     ptr[i] = value;