TensorFlow: fix more int -> size_t warnings

Vijay Vasudevan · Vijay Vasudevan · commit 632c90068a1e · 2016-01-26T13:20:24.000-08:00
Change: 113089380
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
@@ -630,43 +630,15 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-TENSORFLOW_ANDROID_SRCS = [
-    "//tensorflow/core:android_core_ops",
-    "//tensorflow/core:android_extended_ops",
-    "//tensorflow/core:android_srcs",
-]
-
-config_setting(
-    name = "android_32",
-    values = {
-        "crosstool_top": "//android_ndk_repository/toolchains/gcc_4_8:everything",
-    },
-)
-
-config_setting(
-    name = "android_64",
-    values = {
-        "crosstool_top": "//android_ndk_repository/toolchains/gcc_4_9:everything",
-    },
-)
-
-config_setting(
-    name = "android_bazel",
-    values = {
-        "crosstool_top": "//external:android/crosstool",
-    },
-)
-
 # Native library support for Android applications.
 # Should be built to target Android with flag --copt=-mfpu=neon.
 cc_library(
     name = "android_tensorflow_lib",
-    srcs = select({
-        ":android_32": TENSORFLOW_ANDROID_SRCS,
-        ":android_64": TENSORFLOW_ANDROID_SRCS,
-        ":android_bazel": TENSORFLOW_ANDROID_SRCS,
-        "//conditions:default": [],
-    }),
+    srcs = [
+        "//tensorflow/core:android_core_ops",
+        "//tensorflow/core:android_extended_ops",
+        "//tensorflow/core:android_srcs",
+    ],
     hdrs = [
         "framework/tensor.h",
         "platform/env.h",
diff --git a/tensorflow/core/common_runtime/constant_folding.cc b/tensorflow/core/common_runtime/constant_folding.cc
@@ -323,7 +323,7 @@ bool DoConstantFolding(const ConstantFoldingOptions& opts, Graph* graph) {
   }
   // Fetch the constant nodes and replace the corresponding nodes in the
   // original graph with those constants.
-  for (int c = 0; c < fetch_nodes.size(); ++c) {
+  for (size_t c = 0; c < fetch_nodes.size(); ++c) {
     Tensor output;
     bool is_dead;
     string tensor_name;
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc
@@ -166,7 +166,7 @@ void SetReferencedTensors(NodeExecStats* nt,
                           const TensorReferenceVector& tensors) {
   // be careful not to increment the reference count on any tensor
   // while recording the information
-  for (int i = 0; i < tensors.size(); ++i) {
+  for (size_t i = 0; i < tensors.size(); ++i) {
     AllocationDescription* description = nt->add_referenced_tensor();
     tensors.at(i).FillDescription(description);
   }
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
@@ -163,7 +163,7 @@ Status BuildInputArgIndex(const OpDef::ArgDef& arg_def,
   TF_RETURN_IF_ERROR(AddArgName(name_info, arg_def.name(),
                                 {true, arg_index, 0, is_type_list, dtypes}));
   // Creates dtypes.size() nodes in the gdef.
-  for (int i = 0; i < dtypes.size(); ++i) {
+  for (size_t i = 0; i < dtypes.size(); ++i) {
     TF_RETURN_IF_ERROR(AddArgName(name_info,
                                   strings::StrCat(arg_def.name(), ":", i),
                                   {true, arg_index, 0, false, {dtypes[i]}}));
diff --git a/tensorflow/core/framework/rendezvous.cc b/tensorflow/core/framework/rendezvous.cc
@@ -50,7 +50,7 @@ string Rendezvous::CreateKey(const string& src_device, uint64 src_incarnation,
 // the whole remaining string if "delim" is not found.  "*s" is advanced
 // past the string returned plus the delimiter (if found).
 static StringPiece ConsumeNextPart(StringPiece* s, char delim) {
-  for (int offset = 0; offset < s->size(); offset++) {
+  for (size_t offset = 0; offset < s->size(); offset++) {
     if ((*s)[offset] == delim) {
       StringPiece result(s->data(), offset);
       s->remove_prefix(offset + 1);  // +1: remove delim, as well
diff --git a/tensorflow/core/kernels/padding_fifo_queue.cc b/tensorflow/core/kernels/padding_fifo_queue.cc
@@ -179,7 +179,7 @@ void PaddingFIFOQueue::TryDequeueMany(int num_elements, OpKernelContext* ctx,
                   attempt->tuple.emplace_back(element);
                 }
 
-                for (int index = 0; index < tuples.size(); ++index) {
+                for (size_t index = 0; index < tuples.size(); ++index) {
                   for (int i = 0; i < num_components(); ++i) {
                     if (dynamic_shape[i]) {
                       // Slightly slower copy operation
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
@@ -311,7 +311,7 @@ class PyFuncOp : public AsyncOpKernel {
                                   " values, but expects to see ",
                                   ctx->num_outputs(), " values."),
           done);
-      for (int i = 0; i < call->out.size(); ++i) {
+      for (size_t i = 0; i < call->out.size(); ++i) {
         const auto& t = call->out[i];
         OP_REQUIRES_ASYNC(
             ctx, t.dtype() == output_type(i),

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ bool DoConstantFolding(const ConstantFoldingOptions& opts, Graph* graph) {`
`323`	`323`	`}`
`324`	`324`	`// Fetch the constant nodes and replace the corresponding nodes in the`
`325`	`325`	`// original graph with those constants.`
`326`		`- for (int c = 0; c < fetch_nodes.size(); ++c) {`
	`326`	`+ for (size_t c = 0; c < fetch_nodes.size(); ++c) {`
`327`	`327`	`Tensor output;`
`328`	`328`	`bool is_dead;`
`329`	`329`	`string tensor_name;`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ void SetReferencedTensors(NodeExecStats* nt,`
`166`	`166`	`const TensorReferenceVector& tensors) {`
`167`	`167`	`// be careful not to increment the reference count on any tensor`
`168`	`168`	`// while recording the information`
`169`		`- for (int i = 0; i < tensors.size(); ++i) {`
	`169`	`+ for (size_t i = 0; i < tensors.size(); ++i) {`
`170`	`170`	`AllocationDescription* description = nt->add_referenced_tensor();`
`171`	`171`	`tensors.at(i).FillDescription(description);`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ void PaddingFIFOQueue::TryDequeueMany(int num_elements, OpKernelContext* ctx,`
`179`	`179`	`attempt->tuple.emplace_back(element);`
`180`	`180`	`}`
`181`	`181`
`182`		`- for (int index = 0; index < tuples.size(); ++index) {`
	`182`	`+ for (size_t index = 0; index < tuples.size(); ++index) {`
`183`	`183`	`for (int i = 0; i < num_components(); ++i) {`
`184`	`184`	`if (dynamic_shape[i]) {`
`185`	`185`	`// Slightly slower copy operation`