From 61f1a53cbf47c550ccdf49c9b69734ff1573ed8a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 19 Dec 2019 21:20:22 -0800
Subject: [PATCH] Remove unused variables.
PiperOrigin-RevId: 286517146
Change-Id: Ic9566fe02ef33f3156d744fdd6fe8f9036a3a5fb
---
.../core/common_runtime/eager/mkl_eager_op_rewrite.cc | 1 -
tensorflow/core/common_runtime/function_test.cc | 1 -
tensorflow/core/common_runtime/function_threadpool_test.cc | 1 -
tensorflow/core/distributed_runtime/rpc/grpc_testlib.cc | 1 -
tensorflow/core/distributed_runtime/session_mgr.cc | 1 -
tensorflow/core/framework/resource_mgr.cc | 1 -
tensorflow/core/graph/mkl_layout_pass.cc | 1 -
tensorflow/core/grappler/optimizers/constant_folding.cc | 1 -
tensorflow/core/grappler/optimizers/data/auto_shard.cc | 1 -
tensorflow/core/kernels/data/dataset_test_base.cc | 1 -
.../core/kernels/data/experimental/snapshot_dataset_op.cc | 1 -
tensorflow/core/kernels/gpu_utils.cc | 1 -
.../core/kernels/hexagon/hexagon_graph_execution_test.cc | 2 --
tensorflow/core/kernels/mkl_conv_ops.cc | 2 --
tensorflow/core/kernels/non_max_suppression_op.cc | 1 -
.../core/kernels/remote_fused_graph_execute_utils_test.cc | 1 -
tensorflow/core/kernels/sparse/sparse_mat_mul_op.cc | 2 --
tensorflow/core/ops/boosted_trees_ops.cc | 2 --
tensorflow/core/platform/cloud/retrying_file_system_test.cc | 6 ------
tensorflow/core/profiler/internal/tfprof_show.cc | 1 -
tensorflow/core/util/device_name_utils_test.cc | 2 --
21 files changed, 31 deletions(-)
diff --git a/tensorflow/core/common_runtime/eager/mkl_eager_op_rewrite.cc b/tensorflow/core/common_runtime/eager/mkl_eager_op_rewrite.cc
index 44d72fc503e..0a912b1c3ef 100644
--- a/tensorflow/core/common_runtime/eager/mkl_eager_op_rewrite.cc
+++ b/tensorflow/core/common_runtime/eager/mkl_eager_op_rewrite.cc
@@ -127,7 +127,6 @@ Status MklEagerOpRewrite::SetupNewOp(
}
// Copy all attributes to the new op.
- string name;
const NodeDef& orig_ndef = orig_op->MutableAttrs()->BuildNodeDef();
AttrSlice attr_list(orig_ndef);
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index 89e4daa50b3..c1247190d2d 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -275,7 +275,6 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
opts.runner = nullptr;
}
Notification done;
- std::vector<Tensor> out;
Status status;
flr->Run(opts, handle, frame, [&status, &done](const Status& s) {
status = s;
diff --git a/tensorflow/core/common_runtime/function_threadpool_test.cc b/tensorflow/core/common_runtime/function_threadpool_test.cc
index 8f31cda9310..719834193be 100644
--- a/tensorflow/core/common_runtime/function_threadpool_test.cc
+++ b/tensorflow/core/common_runtime/function_threadpool_test.cc
@@ -171,7 +171,6 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
opts.runner = nullptr;
}
Notification done;
- std::vector<Tensor> out;
Status status;
flr->Run(opts, handle, frame, [&status, &done](const Status& s) {
status = s;
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_testlib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_testlib.cc
index 9b118ce8363..7ffff94e2da 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_testlib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_testlib.cc
@@ -80,7 +80,6 @@ Status TestCluster::MakeTestCluster(const string& binary_path,
std::unique_ptr<GrpcSession> session;
TF_RETURN_IF_ERROR(GrpcSession::Create(options_copy, &session));
- std::vector<DeviceAttributes> device_attributes;
TF_RETURN_IF_ERROR(session->ListDevices(&ret->devices_));
*out_cluster = std::move(ret);
diff --git a/tensorflow/core/distributed_runtime/session_mgr.cc b/tensorflow/core/distributed_runtime/session_mgr.cc
index d6fb07fd0cd..e2151e068f6 100644
--- a/tensorflow/core/distributed_runtime/session_mgr.cc
+++ b/tensorflow/core/distributed_runtime/session_mgr.cc
@@ -199,7 +199,6 @@ Status SessionMgr::UpdateSession(
}
protobuf::RepeatedPtrField<DeviceAttributes> added_cluster_device_attrs_pb(
added_cluster_device_attrs.begin(), added_cluster_device_attrs.end());
- std::unique_ptr<DeviceMgr> remote_devices;
AsRemoteDevices(worker_env_->env, added_cluster_device_attrs_pb, nullptr,
&added_remote_devices);
diff --git a/tensorflow/core/framework/resource_mgr.cc b/tensorflow/core/framework/resource_mgr.cc
index 34ef6e694d3..67fc398f82d 100644
--- a/tensorflow/core/framework/resource_mgr.cc
+++ b/tensorflow/core/framework/resource_mgr.cc
@@ -38,7 +38,6 @@ ResourceHandle MakeResourceHandle(
const std::vector<DtypeAndPartialTensorShape>& dtypes_and_shapes) {
ResourceHandle result;
result.set_device(device.name());
- string actual_container;
result.set_container(container);
if (name == ResourceHandle::ANONYMOUS_NAME) {
result.set_name(strings::StrCat("_AnonymousVar", current_id_.fetch_add(1)));
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 6f2a90dcbd6..551193262e2 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -1486,7 +1486,6 @@ rinfo_.push_back({csinfo_.tanh_grad,
// false otherwise.
static bool FusedMatMulRewrite(const Node* n) {
bool trans_a;
- std::vector<string> fused_ops;
// Do not rewrite with transpose attribute because reorder has performance
// impact.
diff --git a/tensorflow/core/grappler/optimizers/constant_folding.cc b/tensorflow/core/grappler/optimizers/constant_folding.cc
index b18c7c54747..8324f403b46 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding.cc
+++ b/tensorflow/core/grappler/optimizers/constant_folding.cc
@@ -3594,7 +3594,6 @@ bool ConstantFolding::MergeConcat(bool use_shape_info,
protobuf::RepeatedPtrField<string> parent_inputs;
parent_inputs.Swap(parent->mutable_input());
- std::vector<string> ctrl_output;
// TODO(rmlarsen): IF the child occurs more than once, is it beneficial to
// collapse it into the parent multiple times? Probably not.
for (const auto& input : parent_inputs) {
diff --git a/tensorflow/core/grappler/optimizers/data/auto_shard.cc b/tensorflow/core/grappler/optimizers/data/auto_shard.cc
index bcc8feb0517..7ed80a1056b 100644
--- a/tensorflow/core/grappler/optimizers/data/auto_shard.cc
+++ b/tensorflow/core/grappler/optimizers/data/auto_shard.cc
@@ -396,7 +396,6 @@ Status OptimizeGraph(const GrapplerItem& item, int64 num_workers, int64 index,
MutableGraphView graph(output);
FunctionLibraryDefinition flib(OpRegistry::Global(), item.graph.library());
- NodeDef target_node;
absl::flat_hash_set<string> nodes_to_delete;
NodeDef* sink_node;
diff --git a/tensorflow/core/kernels/data/dataset_test_base.cc b/tensorflow/core/kernels/data/dataset_test_base.cc
index 09846291ea9..ce194a87a3c 100644
--- a/tensorflow/core/kernels/data/dataset_test_base.cc
+++ b/tensorflow/core/kernels/data/dataset_test_base.cc
@@ -426,7 +426,6 @@ Status DatasetOpsTestBase::CreateOpKernelContext(
params->op_kernel = kernel;
params->resource_manager = resource_mgr_.get();
params->runner = &runner_;
- checkpoint::TensorSliceReaderCacheWrapper slice_reader_cache_wrapper;
slice_reader_cache_ =
absl::make_unique<checkpoint::TensorSliceReaderCacheWrapper>();
params->slice_reader_cache = slice_reader_cache_.get();
diff --git a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
index b2df8aa7db8..c3d120df65a 100644
--- a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
+++ b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
@@ -298,7 +298,6 @@ Status ReadMetadataFile(const string& hash_dir,
Status DumpDatasetGraph(const std::string& path, uint64 hash,
const GraphDef& graph) {
- std::unique_ptr<WritableFile> file;
std::string hash_hex =
strings::StrCat(strings::Hex(hash, strings::kZeroPad16));
std::string graph_file =
diff --git a/tensorflow/core/kernels/gpu_utils.cc b/tensorflow/core/kernels/gpu_utils.cc
index 4681c624eb4..52676f64245 100644
--- a/tensorflow/core/kernels/gpu_utils.cc
+++ b/tensorflow/core/kernels/gpu_utils.cc
@@ -40,7 +40,6 @@ se::DeviceMemoryBase WrapRedzoneBestEffort(se::RedzoneAllocator* rz_allocator,
if (RedzoneCheckDisabled()) {
return buffer;
}
- se::DeviceMemoryBase output_tensor;
auto output_rz_or = rz_allocator->AllocateBytes(buffer.size());
if (!output_rz_or.ok()) {
static std::once_flag rz_allocation_failure_logged;
diff --git a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
index 690d13c4e65..7a6924e2ebf 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
@@ -548,7 +548,6 @@ TEST(GraphTransferer, DISABLED_CheckShapeInferencePerformance) {
inputs.emplace_back("Mul", Tensor(DT_FLOAT, {1, WIDTH, HEIGHT, DEPTH}));
std::vector<string> output_node_names = {"softmax"};
- RemoteFusedGraphExecuteUtils::TensorShapeMap output_tensor_info0;
GraphTransferer gt0;
gt0.EnableStrictCheckMode(false);
ClockCycleProfiler prof0;
@@ -568,7 +567,6 @@ TEST(GraphTransferer, DISABLED_CheckShapeInferencePerformance) {
LOG(INFO) << "(0) node count: " << gfi0.node_info_size() << ", "
<< gfi0.const_node_info_size();
- RemoteFusedGraphExecuteUtils::TensorShapeMap output_tensor_info1;
GraphTransferer gt1;
gt1.EnableStrictCheckMode(true);
ClockCycleProfiler prof1;
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index e7543411b62..6615efd4d56 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -1591,8 +1591,6 @@ class MklQuantizedConv2DOp
const float* min_filter = min_filter_vector.flat<float>().data();
const float* max_filter = max_filter_vector.flat<float>().data();
- std::vector<mkldnn::primitive> net;
-
const float int_const_scale_limit =
(std::is_same<Tinput, quint8>::value) ? 255.0 * 127.0 : 127.0 * 127.0;
// Re-scale bias if either of following 2 conditions are met:
diff --git a/tensorflow/core/kernels/non_max_suppression_op.cc b/tensorflow/core/kernels/non_max_suppression_op.cc
index ff48bd5f836..f9dd7c69a8a 100644
--- a/tensorflow/core/kernels/non_max_suppression_op.cc
+++ b/tensorflow/core/kernels/non_max_suppression_op.cc
@@ -368,7 +368,6 @@ void BatchedNonMaxSuppressionOp(
}
std::vector<int> selected;
- std::vector<float> selected_boxes;
Candidate next_candidate;
std::sort(candidate_vector.begin(), candidate_vector.end(), cmp);
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
index 44251e6ff8e..a55ea394bd7 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
@@ -87,7 +87,6 @@ class FuseRemoteGraphMultipleAddOpsTest : public ::testing::Test {
Status FuseByInOut() {
// Feed output shapes and types
- RemoteFusedGraphExecuteUtils::TensorShapeMap tensor_shape_map;
GraphDef graph_def_with_shapetype = graph_def_;
TF_RETURN_IF_ERROR(RemoteFusedGraphExecuteUtils::BuildAndAddTensorShapes(
input_tensors_, /*dry_run_inference*/ true, &graph_def_with_shapetype));
diff --git a/tensorflow/core/kernels/sparse/sparse_mat_mul_op.cc b/tensorflow/core/kernels/sparse/sparse_mat_mul_op.cc
index 53f9fbff377..a03d60ed155 100644
--- a/tensorflow/core/kernels/sparse/sparse_mat_mul_op.cc
+++ b/tensorflow/core/kernels/sparse/sparse_mat_mul_op.cc
@@ -369,8 +369,6 @@ class CSRSparseMatMulGPUOp : public OpKernel {
CSRSparseMatrix c;
Tensor c_row_ptrs;
- Tensor c_col_inds;
- Tensor c_values;
// TODO(ebrevdo): Re-enable transposing within the GEMM kernel when cuSparse
// stops spitting out CUSPARSE_STATUS_INTERNAL_ERROR values for transposes.
diff --git a/tensorflow/core/ops/boosted_trees_ops.cc b/tensorflow/core/ops/boosted_trees_ops.cc
index d028ceb7e6d..80de75d7fc5 100644
--- a/tensorflow/core/ops/boosted_trees_ops.cc
+++ b/tensorflow/core/ops/boosted_trees_ops.cc
@@ -395,7 +395,6 @@ REGISTER_OP("BoostedTreesPredict")
int num_bucketized_features;
TF_RETURN_IF_ERROR(
c->GetAttr("num_bucketized_features", &num_bucketized_features));
- shape_inference::ShapeHandle unused_input;
shape_inference::DimensionHandle batch_size = c->Dim(c->input(1), 0);
for (int i = 0; i < num_bucketized_features; ++i) {
TF_RETURN_IF_ERROR(
@@ -425,7 +424,6 @@ REGISTER_OP("BoostedTreesExampleDebugOutputs")
int num_bucketized_features;
TF_RETURN_IF_ERROR(
c->GetAttr("num_bucketized_features", &num_bucketized_features));
- shape_inference::ShapeHandle unused_input;
shape_inference::DimensionHandle batch_dim = c->Dim(c->input(1), 0);
for (int i = 0; i < num_bucketized_features; ++i) {
TF_RETURN_IF_ERROR(
diff --git a/tensorflow/core/platform/cloud/retrying_file_system_test.cc b/tensorflow/core/platform/cloud/retrying_file_system_test.cc
index 1df371a6080..b48831ab238 100644
--- a/tensorflow/core/platform/cloud/retrying_file_system_test.cc
+++ b/tensorflow/core/platform/cloud/retrying_file_system_test.cc
@@ -525,7 +525,6 @@ TEST(RetryingFileSystemTest, DeleteFile_SuccessWith2ndTry) {
RetryingFileSystem<MockFileSystem> fs(
std::move(base_fs), RetryConfig(0 /* init_delay_time_us */));
- std::vector<string> result;
TF_EXPECT_OK(fs.DeleteFile("gs://path/file.txt"));
}
@@ -536,7 +535,6 @@ TEST(RetryingFileSystemTest, DeleteFile_AllRetriesFailed) {
RetryingFileSystem<MockFileSystem> fs(
std::move(base_fs), RetryConfig(0 /* init_delay_time_us */));
- std::vector<string> result;
const auto& status = fs.DeleteFile("gs://path/file.txt");
EXPECT_TRUE(absl::StrContains(status.error_message(), "Retriable error #10"))
<< status;
@@ -551,7 +549,6 @@ TEST(RetryingFileSystemTest, CreateDir_SuccessWith2ndTry) {
RetryingFileSystem<MockFileSystem> fs(
std::move(base_fs), RetryConfig(0 /* init_delay_time_us */));
- std::vector<string> result;
TF_EXPECT_OK(fs.CreateDir("gs://path/newdir"));
}
@@ -562,7 +559,6 @@ TEST(RetryingFileSystemTest, CreateDir_AllRetriesFailed) {
RetryingFileSystem<MockFileSystem> fs(
std::move(base_fs), RetryConfig(0 /* init_delay_time_us */));
- std::vector<string> result;
const auto& status = fs.CreateDir("gs://path/newdir");
EXPECT_TRUE(absl::StrContains(status.error_message(), "Retriable error #10"))
<< status;
@@ -577,7 +573,6 @@ TEST(RetryingFileSystemTest, DeleteDir_SuccessWith2ndTry) {
RetryingFileSystem<MockFileSystem> fs(
std::move(base_fs), RetryConfig(0 /* init_delay_time_us */));
- std::vector<string> result;
TF_EXPECT_OK(fs.DeleteDir("gs://path/dir"));
}
@@ -588,7 +583,6 @@ TEST(RetryingFileSystemTest, DeleteDir_AllRetriesFailed) {
RetryingFileSystem<MockFileSystem> fs(
std::move(base_fs), RetryConfig(0 /* init_delay_time_us */));
- std::vector<string> result;
const auto& status = fs.DeleteDir("gs://path/dir");
EXPECT_TRUE(absl::StrContains(status.error_message(), "Retriable error #10"))
<< status;
diff --git a/tensorflow/core/profiler/internal/tfprof_show.cc b/tensorflow/core/profiler/internal/tfprof_show.cc
index e7a5b03a558..5d57c1bba41 100644
--- a/tensorflow/core/profiler/internal/tfprof_show.cc
+++ b/tensorflow/core/profiler/internal/tfprof_show.cc
@@ -170,7 +170,6 @@ string TFShow::FormatNode(ShowNode* node, const Options& opts) const {
}
info.push_back(fops);
}
- std::vector<string> attrs;
if (opts.select.find(kShown[0]) != opts.select.end()) {
info.push_back(FormatNodeMemory(node, node->proto().requested_bytes(),
node->proto().total_requested_bytes()));
diff --git a/tensorflow/core/util/device_name_utils_test.cc b/tensorflow/core/util/device_name_utils_test.cc
index 49bce7a82fc..24657ae1d95 100644
--- a/tensorflow/core/util/device_name_utils_test.cc
+++ b/tensorflow/core/util/device_name_utils_test.cc
@@ -426,8 +426,6 @@ static void MergeOverrideHelper(const string& target, const string& name,
}
TEST(DeviceNameUtilsTest, MergeDevNames) {
- DeviceNameUtils::ParsedName target;
-
// Idempotence tests.
MergeDevNamesHelper("", "", "");
MergeDevNamesHelper("/job:foo/replica:1/task:2/cpu:1",