aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/framework/op.cc
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <nobody@tensorflow.org>2016-03-21 11:02:00 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-03-21 22:05:41 -0700
commit03993ff2aeab67694ec3e14fb6b02c50efd8b287 (patch)
treef60e9b3e283a593da997ed094f6d7968c9f7081d /tensorflow/core/framework/op.cc
parent481c4ba7a8cc0f9924eed7578502657420609988 (diff)
Apply selective registration to op registration, to remove the OpDefBuilder
calls. Move selective registration macros to their own file - this made it easier to #include <string.h> before the definition. Renamed SHOULD_REGISTER_OP to SHOULD_REGISTER_OP_KERNEL, and used SHOULD_REGISTER_OP for the new op.h filtering. Change: 117738751
Diffstat (limited to 'tensorflow/core/framework/op.cc')
-rw-r--r--tensorflow/core/framework/op.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/core/framework/op.cc b/tensorflow/core/framework/op.cc
index f90b0a555a..06d45a40d2 100644
--- a/tensorflow/core/framework/op.cc
+++ b/tensorflow/core/framework/op.cc
@@ -176,9 +176,10 @@ const OpDef* OpListOpRegistry::LookUp(const string& op_type_name,
// Other registration ---------------------------------------------------------
namespace register_op {
-OpDefBuilderReceiver::OpDefBuilderReceiver(const OpDefBuilder& builder) {
+OpDefBuilderReceiver::OpDefBuilderReceiver(
+ const OpDefBuilderWrapper<true>& wrapper) {
OpDef op_def;
- builder.Finalize(&op_def);
+ wrapper.builder().Finalize(&op_def);
OpRegistry::Global()->Register(op_def);
}
} // namespace register_op