Automated rollback of change 130654153

Change: 130659785

5 files changed, 9 insertions, 37 deletions

diff --git a/tensorflow/core/kernels/pad_op.cc b/tensorflow/core/kernels/pad_op.cc
index 502edbf1ae..fc41bfc270 100644
--- a/tensorflow/core/kernels/pad_op.cc
+++ b/tensorflow/core/kernels/pad_op.cc
@@ -49,7 +49,7 @@ class PadOp : public OpKernel {
     const Tensor& in1 = context->input(1);
     const int dims = in0.dims();
     static const int kMinDims = 0;
-    static const int kMaxDims = 6;
+    static const int kMaxDims = 5;
     OP_REQUIRES(context, kMinDims <= dims && dims <= kMaxDims,
                 errors::Unimplemented("inputs rank not in [", kMinDims, ",",
                                       kMaxDims, "]: ", dims));
@@ -115,12 +115,9 @@ class PadOp : public OpKernel {
       case 5:
         Operate<5>(context, in0.tensor<T, 5>(), paddings, output);
         break;
-      case 6:
-        Operate<6>(context, in0.tensor<T, 6>(), paddings, output);
-        break;
       default:
         OP_REQUIRES(context, false,
-                    errors::InvalidArgument("Only ranks up to 6 supported: ",
+                    errors::InvalidArgument("Only ranks up to 5 supported: ",
                                             in0.shape().DebugString()));
     }
   }
@@ -169,8 +166,7 @@ namespace functor {
   DECLARE_GPU_SPEC(T, 2);    \
   DECLARE_GPU_SPEC(T, 3);    \
   DECLARE_GPU_SPEC(T, 4);    \
-  DECLARE_GPU_SPEC(T, 5);    \
-  DECLARE_GPU_SPEC(T, 6);
+  DECLARE_GPU_SPEC(T, 5);
 
 TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPECS);
 }  // namespace functor
diff --git a/tensorflow/core/kernels/pad_op_gpu.cu.cc b/tensorflow/core/kernels/pad_op_gpu.cu.cc
index f98631df17..69e3be0040 100644
--- a/tensorflow/core/kernels/pad_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/pad_op_gpu.cu.cc
@@ -32,8 +32,7 @@ typedef Eigen::GpuDevice GPUDevice;
   template struct functor::Pad<GPUDevice, T, 2>; \
   template struct functor::Pad<GPUDevice, T, 3>; \
   template struct functor::Pad<GPUDevice, T, 4>; \
-  template struct functor::Pad<GPUDevice, T, 5>; \
-  template struct functor::Pad<GPUDevice, T, 6>;
+  template struct functor::Pad<GPUDevice, T, 5>;
 
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 
diff --git a/tensorflow/core/kernels/tile_ops.cc b/tensorflow/core/kernels/tile_ops.cc
index d021544316..4b2d2fa589 100644
--- a/tensorflow/core/kernels/tile_ops.cc
+++ b/tensorflow/core/kernels/tile_ops.cc
@@ -138,8 +138,7 @@ class TileOp : public OpKernel {
   HANDLE_DIM(T, 2)     \
   HANDLE_DIM(T, 3)     \
   HANDLE_DIM(T, 4)     \
-  HANDLE_DIM(T, 5)     \
-  HANDLE_DIM(T, 6)
+  HANDLE_DIM(T, 5)
 
 #define HANDLE_TYPE_NAME(T) HANDLE_TYPE(DataTypeToEnum<T>::value)
 
@@ -216,8 +215,7 @@ inline void TileOp<Device>::HandleCase(
   HANDLE_CASE(device, T, dtype, 2);       \
   HANDLE_CASE(device, T, dtype, 3);       \
   HANDLE_CASE(device, T, dtype, 4);       \
-  HANDLE_CASE(device, T, dtype, 5);       \
-  HANDLE_CASE(device, T, dtype, 6);
+  HANDLE_CASE(device, T, dtype, 5);
 
 #define HANDLE_TYPE_NAME_CPU(T) \
   HANDLE_CASE_DIM(CPUDevice, T, DataTypeToEnum<T>::value);
@@ -309,8 +307,7 @@ class TileGradientOp : public OpKernel {
   HANDLE_DIM(T, 2)     \
   HANDLE_DIM(T, 3)     \
   HANDLE_DIM(T, 4)     \
-  HANDLE_DIM(T, 5)     \
-  HANDLE_DIM(T, 6)
+  HANDLE_DIM(T, 5)
 
 #define HANDLE_TYPE_NAME(T) HANDLE_TYPE(DataTypeToEnum<T>::value)
 
@@ -454,8 +451,7 @@ inline void TileGradientOp<Device>::HandleCase(
   HANDLE_CASE(device, T, dtype, 2);       \
   HANDLE_CASE(device, T, dtype, 3);       \
   HANDLE_CASE(device, T, dtype, 4);       \
-  HANDLE_CASE(device, T, dtype, 5);       \
-  HANDLE_CASE(device, T, dtype, 6);
+  HANDLE_CASE(device, T, dtype, 5);
 
 #define HANDLE_TYPE_NAME_CPU(T) \
   HANDLE_CASE_DIM(CPUDevice, T, DataTypeToEnum<T>::value);
diff --git a/tensorflow/core/kernels/tile_ops_cpu_impl_6.cc b/tensorflow/core/kernels/tile_ops_cpu_impl_6.cc
deleted file mode 100644
index 763c5a3c6c..0000000000
--- a/tensorflow/core/kernels/tile_ops_cpu_impl_6.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#define CPU_PROVIDED_IXDIM 6
-#include "tensorflow/core/kernels/tile_ops_cpu_impl.h"
-#undef CPU_PROVIDED_IXDIM
diff --git a/tensorflow/core/kernels/tile_ops_gpu.cu.cc b/tensorflow/core/kernels/tile_ops_gpu.cu.cc
index 6a83ad4b4f..787ffb4ea7 100644
--- a/tensorflow/core/kernels/tile_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/tile_ops_gpu.cu.cc
@@ -30,8 +30,7 @@ typedef Eigen::GpuDevice GPUDevice;
   DEFINE_DIM(T, 2)     \
   DEFINE_DIM(T, 3)     \
   DEFINE_DIM(T, 4)     \
-  DEFINE_DIM(T, 5)     \
-  DEFINE_DIM(T, 6)
+  DEFINE_DIM(T, 5)
 
 #define DEFINE_DIM(T, NDIM)                     \
   template struct Tile<GPUDevice, T, NDIM>;     \