aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/graph/validate.cc
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2016-06-14 12:01:04 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-06-14 13:03:49 -0700
commit72cd0b00ebfa766dbb3e499fd06eb45ecb5b1df3 (patch)
tree61a22f996230d650dcb3fbb353fcacee1aa0d255 /tensorflow/core/graph/validate.cc
parent406c7d9a1175a43cc489b279a4e590ed60bd7511 (diff)
In C++ shape inference, support registering a shape inference function in OP
registration. Change op registration signature to return Status and return the registration data as an out parameter. Add a shape inference function and test for AddN. Support in function library needs to be expanded in a future change. Change: 124871850
Diffstat (limited to 'tensorflow/core/graph/validate.cc')
-rw-r--r--tensorflow/core/graph/validate.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/core/graph/validate.cc b/tensorflow/core/graph/validate.cc
index 21d9e25284..b5fbb5fa27 100644
--- a/tensorflow/core/graph/validate.cc
+++ b/tensorflow/core/graph/validate.cc
@@ -30,8 +30,8 @@ Status ValidateGraphDef(const GraphDef& graph_def,
const int version = graph_def.versions().producer();
for (const NodeDef& node_def : graph_def.node()) {
// Look up the OpDef for the node_def's op name.
- const OpDef* op_def = op_registry.LookUp(node_def.op(), &s);
- TF_RETURN_IF_ERROR(s);
+ const OpDef* op_def;
+ TF_RETURN_IF_ERROR(op_registry.LookUpOpDef(node_def.op(), &op_def));
TF_RETURN_IF_ERROR(ValidateNodeDef(node_def, *op_def));
TF_RETURN_IF_ERROR(CheckOpDeprecation(*op_def, version));
}