aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <bsteiner@google.com>2017-11-29 12:56:52 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-11-29 13:00:41 -0800
commit037acadcfc5f2b96a2e9c1653f28131bb91858aa (patch)
treeb8440800111e79a27b595477a14a0dca3448458b
parent97da160010a47ba37afa1afca914038d3ab0ba55 (diff)
Deleted unused method arguments
PiperOrigin-RevId: 177350575
-rw-r--r--tensorflow/core/grappler/optimizers/constant_folding.cc25
-rw-r--r--tensorflow/core/grappler/optimizers/constant_folding.h6
2 files changed, 6 insertions, 25 deletions
diff --git a/tensorflow/core/grappler/optimizers/constant_folding.cc b/tensorflow/core/grappler/optimizers/constant_folding.cc
index 33a9dddba7..03eaa4a84a 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding.cc
+++ b/tensorflow/core/grappler/optimizers/constant_folding.cc
@@ -190,8 +190,7 @@ Status ConvertShapeToConstant(const string& op, const DataType& type,
return Status::OK();
}
-Status ConstantFolding::MaterializeShapes(const GrapplerItem& item,
- const GraphProperties& properties) {
+Status ConstantFolding::MaterializeShapes(const GraphProperties& properties) {
// We may add some nodes to the graph to encode control dependencies: there is
// no need to process these, so only iterate over the nodes of the input
// graph.
@@ -285,22 +284,6 @@ Status ConstantFolding::MaterializeShapes(const GrapplerItem& item,
return Status::OK();
}
-bool ShapesEqual(const TensorShapeProto& shape1,
- const TensorShapeProto& shape2) {
- if (shape1.unknown_rank() || shape2.unknown_rank()) {
- return false;
- }
- if (shape1.dim_size() != shape2.dim_size()) {
- return false;
- }
- for (int i = 0; i < shape1.dim_size(); ++i) {
- if (shape1.dim(i).size() != shape2.dim(i).size()) {
- return false;
- }
- }
- return true;
-}
-
namespace {
bool ExtractShape(const NodeDef& shape_node, const GraphProperties& properties,
BCast::Vec* shape, int64* min_id) {
@@ -504,7 +487,7 @@ Status ConstantFolding::MaterializeReductionIndices(
}
Status ConstantFolding::MaterializeConstants(
- const GrapplerItem& item, const GraphProperties& properties) {
+ const GraphProperties& properties) {
const int node_count = graph_.node_size();
for (int i = 0; i < node_count; ++i) {
NodeDef& node = *graph_.mutable_node(i);
@@ -1171,10 +1154,10 @@ Status ConstantFolding::RunOptimizationPass(Cluster* cluster,
// graph. That's because it's possible to feed a placeholder with a tensor
// of any shape, which could make the static information inconsistent with
// the shapes actually fed.
- TF_RETURN_IF_ERROR(MaterializeShapes(item, properties));
+ TF_RETURN_IF_ERROR(MaterializeShapes(properties));
}
if (opt_level_ == RewriterConfig::AGGRESSIVE && s.ok()) {
- TF_RETURN_IF_ERROR(MaterializeConstants(item, properties));
+ TF_RETURN_IF_ERROR(MaterializeConstants(properties));
}
TF_RETURN_IF_ERROR(FoldGraph(output));
diff --git a/tensorflow/core/grappler/optimizers/constant_folding.h b/tensorflow/core/grappler/optimizers/constant_folding.h
index f04f413c10..7c5db2a70f 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding.h
+++ b/tensorflow/core/grappler/optimizers/constant_folding.h
@@ -51,16 +51,14 @@ class ConstantFolding : public GraphOptimizer {
const GraphDef& optimize_output, double result) override;
private:
- Status MaterializeShapes(const GrapplerItem& item,
- const GraphProperties& properties);
+ Status MaterializeShapes(const GraphProperties& properties);
Status MaterializeBroadcastGradientArgs(const NodeDef& node,
const GraphProperties& properties);
Status MaterializeReductionIndices(NodeDef* node,
const GraphProperties& properties);
- Status MaterializeConstants(const GrapplerItem& item,
- const GraphProperties& properties);
+ Status MaterializeConstants(const GraphProperties& properties);
bool IsFoldable(const NodeDef& node) const;
Status EvaluateNode(const NodeDef& node,