From 18c47113bd2be90a85b6b0bbb1429b5f5ca46073 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Mon, 28 Jan 2019 11:40:39 -0800
Subject: [PATCH] Fix a number of warnings when building TF on Mac.
Mostly unused member variables.
PiperOrigin-RevId: 231259867
---
tensorflow/core/grappler/mutable_graph_view.cc | 4 ----
.../core/grappler/optimizers/dependency_optimizer.h | 4 +---
.../core/grappler/optimizers/pin_to_host_optimizer.h | 8 ++------
tensorflow/core/grappler/optimizers/remapper.h | 5 +----
tensorflow/core/grappler/optimizers/shape_optimizer.h | 8 ++------
tensorflow/core/platform/posix/env.cc | 4 ++--
tensorflow/core/util/strided_slice_op.cc | 2 +-
7 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/tensorflow/core/grappler/mutable_graph_view.cc b/tensorflow/core/grappler/mutable_graph_view.cc
index 724efcd21e3..d4f415ae7b9 100644
--- a/tensorflow/core/grappler/mutable_graph_view.cc
+++ b/tensorflow/core/grappler/mutable_graph_view.cc
@@ -52,10 +52,6 @@ bool IsTensorIdControlling(const TensorId& tensor_id) {
return tensor_id.index() == Graph::kControlSlot;
}
-bool IsOutputPortRegular(const MutableGraphView::OutputPort& port) {
- return port.port_id > Graph::kControlSlot;
-}
-
bool IsOutputPortControlling(const MutableGraphView::OutputPort& port) {
return port.port_id == Graph::kControlSlot;
}
diff --git a/tensorflow/core/grappler/optimizers/dependency_optimizer.h b/tensorflow/core/grappler/optimizers/dependency_optimizer.h
index 7b032673fb3..99021b955f2 100644
--- a/tensorflow/core/grappler/optimizers/dependency_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/dependency_optimizer.h
@@ -30,8 +30,7 @@ namespace grappler {
class DependencyOptimizer : public GraphOptimizer {
public:
DependencyOptimizer() {}
- explicit DependencyOptimizer(RewriterConfig::Toggle opt_level)
- : opt_level_(opt_level) {}
+ explicit DependencyOptimizer(RewriterConfig::Toggle opt_level) {}
~DependencyOptimizer() override {}
string name() const override { return "dependency_optimizer"; };
@@ -73,7 +72,6 @@ class DependencyOptimizer : public GraphOptimizer {
// single control edge.
void GroupCrossDeviceControlEdges();
- RewriterConfig::Toggle opt_level_;
bool fetch_nodes_known_;
std::unordered_set<string> nodes_to_preserve_;
std::unique_ptr<NodeMap> node_map_;
diff --git a/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.h b/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.h
index d557a03463f..44f26461c0e 100644
--- a/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.h
@@ -38,9 +38,8 @@ string TryFindHostDevice(const gtl::FlatSet<string>& devices,
// gpu->gpu->gpu may have been better/faster. We should probably fix this.
class PinToHostOptimizer : public GraphOptimizer {
public:
- PinToHostOptimizer() : opt_level_(RewriterConfig::DEFAULT) {}
- explicit PinToHostOptimizer(RewriterConfig::Toggle opt_level)
- : opt_level_(opt_level) {}
+ PinToHostOptimizer() {}
+ explicit PinToHostOptimizer(RewriterConfig::Toggle opt_level) {}
~PinToHostOptimizer() override {}
@@ -51,9 +50,6 @@ class PinToHostOptimizer : public GraphOptimizer {
void Feedback(Cluster* cluster, const GrapplerItem& item,
const GraphDef& optimized_graph, double result) override {}
-
- private:
- RewriterConfig::Toggle opt_level_;
};
} // end namespace grappler
diff --git a/tensorflow/core/grappler/optimizers/remapper.h b/tensorflow/core/grappler/optimizers/remapper.h
index c18413e4e72..804338f4d21 100644
--- a/tensorflow/core/grappler/optimizers/remapper.h
+++ b/tensorflow/core/grappler/optimizers/remapper.h
@@ -26,7 +26,7 @@ namespace grappler {
// nodes to decrease the amount of operations needed to perform a computation.
class Remapper : public GraphOptimizer {
public:
- explicit Remapper(RewriterConfig::Toggle opt_level) : opt_level_(opt_level) {}
+ explicit Remapper(RewriterConfig::Toggle opt_level) {}
~Remapper() override {}
@@ -37,9 +37,6 @@ class Remapper : public GraphOptimizer {
void Feedback(Cluster* cluster, const GrapplerItem& item,
const GraphDef& optimized_graph, double result) override;
-
- private:
- RewriterConfig::Toggle opt_level_;
};
} // end namespace grappler
diff --git a/tensorflow/core/grappler/optimizers/shape_optimizer.h b/tensorflow/core/grappler/optimizers/shape_optimizer.h
index b7f84a1e5db..d9c1fefb194 100644
--- a/tensorflow/core/grappler/optimizers/shape_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/shape_optimizer.h
@@ -30,9 +30,8 @@ namespace grappler {
// information.
class ShapeOptimizer : public GraphOptimizer {
public:
- ShapeOptimizer() : opt_level_(RewriterConfig::ON) {}
- explicit ShapeOptimizer(RewriterConfig::Toggle opt_level)
- : opt_level_(opt_level) {}
+ ShapeOptimizer() {}
+ explicit ShapeOptimizer(RewriterConfig::Toggle opt_level) {}
~ShapeOptimizer() override {}
@@ -43,9 +42,6 @@ class ShapeOptimizer : public GraphOptimizer {
void Feedback(Cluster* cluster, const GrapplerItem& item,
const GraphDef& optimized_graph, double result) override;
-
- private:
- RewriterConfig::Toggle opt_level_;
};
} // end namespace grappler
diff --git a/tensorflow/core/platform/posix/env.cc b/tensorflow/core/platform/posix/env.cc
index 4e9373616e3..b02b1f3f480 100644
--- a/tensorflow/core/platform/posix/env.cc
+++ b/tensorflow/core/platform/posix/env.cc
@@ -86,7 +86,7 @@ class PosixEnv : public Env {
return new StdThread(thread_options, name, fn);
}
- int32 GetCurrentThreadId() {
+ int32 GetCurrentThreadId() override {
#ifdef __APPLE__
uint64_t tid64;
pthread_threadid_np(nullptr, &tid64);
@@ -101,7 +101,7 @@ class PosixEnv : public Env {
#endif
}
- bool GetCurrentThreadName(string* name) {
+ bool GetCurrentThreadName(string* name) override {
#ifdef __ANDROID__
return false;
#else
diff --git a/tensorflow/core/util/strided_slice_op.cc b/tensorflow/core/util/strided_slice_op.cc
index 9db35da6a2e..0df810abd00 100644
--- a/tensorflow/core/util/strided_slice_op.cc
+++ b/tensorflow/core/util/strided_slice_op.cc
@@ -272,7 +272,7 @@ Status ValidateStridedSliceOp(
const std::array<int64, 2> valid_range = {
{stride_i > 0 ? 0 : -1, stride_i > 0 ? dim_i : dim_i - 1}};
- auto canonical = [stride_i, i, dim_i, masks, valid_range](int64 x, int c) {
+ auto canonical = [stride_i, dim_i, masks, valid_range](int64 x, int c) {
if (masks[c]) {
return stride_i > 0 ? valid_range[c] : valid_range[(c + 1) & 1];
} else {