From 887c54728f713ec76ea486c94c25dfca791a10c1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 27 Feb 2018 19:09:38 -0800
Subject: [PATCH] Adopt Eigen::DenseIndex in lieu of int64 for a few variables
 (to appease compiler warnings/errors).

PiperOrigin-RevId: 187268113
---
 tensorflow/core/kernels/split_op.cc   | 8 ++++----
 tensorflow/core/kernels/split_v_op.cc | 4 ++--
 tensorflow/core/kernels/unpack_op.cc  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tensorflow/core/kernels/split_op.cc b/tensorflow/core/kernels/split_op.cc
index 1bc92a4f70..7cc3c532c9 100644
--- a/tensorflow/core/kernels/split_op.cc
+++ b/tensorflow/core/kernels/split_op.cc
@@ -231,10 +231,10 @@ class SplitOpCPU : public SplitOpBase<CPUDevice, T> {
     if (prefix_dim_size == 1) {
       auto input_reshaped =
           input.shaped<T, 2>({split_dim_size, suffix_dim_size});
-      auto make_sizes = [&](int64 split_size) {
+      auto make_sizes = [&](Eigen::DenseIndex split_size) {
         return Eigen::DSizes<Eigen::DenseIndex, 2>{split_size, suffix_dim_size};
       };
-      auto reshape_result = [&](Tensor* result, int64 split_size) {
+      auto reshape_result = [&](Tensor* result, Eigen::DenseIndex split_size) {
         return result->shaped<T, 2>({split_size, suffix_dim_size});
       };
       SplitOpCPUImpl<T, decltype(input_reshaped), 2>{}(
@@ -244,11 +244,11 @@ class SplitOpCPU : public SplitOpBase<CPUDevice, T> {
     } else {
       auto input_reshaped = input.shaped<T, 3>(
           {prefix_dim_size, split_dim_size, suffix_dim_size});
-      auto make_sizes = [&](int64 split_size) {
+      auto make_sizes = [&](Eigen::DenseIndex split_size) {
         return Eigen::DSizes<Eigen::DenseIndex, 3>{prefix_dim_size, split_size,
                                                    suffix_dim_size};
       };
-      auto reshape_result = [&](Tensor* result, int64 split_size) {
+      auto reshape_result = [&](Tensor* result, Eigen::DenseIndex split_size) {
         return result->shaped<T, 3>(
             {prefix_dim_size, split_size, suffix_dim_size});
       };
diff --git a/tensorflow/core/kernels/split_v_op.cc b/tensorflow/core/kernels/split_v_op.cc
index 51d96a17b3..0681ff1198 100644
--- a/tensorflow/core/kernels/split_v_op.cc
+++ b/tensorflow/core/kernels/split_v_op.cc
@@ -293,7 +293,7 @@ class SplitVOpCPU : public SplitVOpBase<CPUDevice, T, Tlen> {
     if (prefix_dim_size == 1) {
       auto input_reshaped =
           input.shaped<T, 2>({split_dim_size, suffix_dim_size});
-      auto make_sizes = [&](Tlen split_size) {
+      auto make_sizes = [&](Eigen::DenseIndex split_size) {
         return Eigen::DSizes<Eigen::DenseIndex, 2>{split_size, suffix_dim_size};
       };
       auto reshape_result = [&](Tensor* result, Tlen split_size) {
@@ -306,7 +306,7 @@ class SplitVOpCPU : public SplitVOpBase<CPUDevice, T, Tlen> {
     } else {
       auto input_reshaped = input.shaped<T, 3>(
           {prefix_dim_size, split_dim_size, suffix_dim_size});
-      auto make_sizes = [&](Tlen split_size) {
+      auto make_sizes = [&](Eigen::DenseIndex split_size) {
         return Eigen::DSizes<Eigen::DenseIndex, 3>{prefix_dim_size, split_size,
                                                    suffix_dim_size};
       };
diff --git a/tensorflow/core/kernels/unpack_op.cc b/tensorflow/core/kernels/unpack_op.cc
index 4376df34be..1e1647db5c 100644
--- a/tensorflow/core/kernels/unpack_op.cc
+++ b/tensorflow/core/kernels/unpack_op.cc
@@ -90,16 +90,16 @@ class UnpackOp : public OpKernel {
     }
 #endif  // TENSORFLOW_USE_SYCL
 
-    int64 before_dim = 1;
+    Eigen::DenseIndex before_dim = 1;
     for (int i = 0; i < axis; ++i) {
       before_dim *= input_shape.dim_size(i);
     }
 
-    int64 after_dim = 1;
+    Eigen::DenseIndex after_dim = 1;
     for (int i = axis + 1; i < input_shape.dims(); ++i) {
       after_dim *= input_shape.dim_size(i);
     }
-    const int64 axis_dim = input_shape.dim_size(axis);
+    const Eigen::DenseIndex axis_dim = input_shape.dim_size(axis);
 
     // Except for shape, unpack is a special case of split, so we reuse the
     // same computational kernels.
-- 
2.34.1