diff options
Diffstat (limited to 'tensorflow/core/graph/graph_constructor.cc')
| -rw-r--r-- | tensorflow/core/graph/graph_constructor.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc index 2ee409768b..753cb260e5 100644 --- a/tensorflow/core/graph/graph_constructor.cc +++ b/tensorflow/core/graph/graph_constructor.cc @@ -68,8 +68,7 @@ class GraphConstructor { Options(const GraphConstructorOptions& in) // NOLINT(runtime/explicit) : allow_internal_ops(in.allow_internal_ops), expect_device_spec(in.expect_device_spec), - importing(false), - validate_colocation_constraints(false) {} + importing(false) {} Options(const ImportGraphDefOptions& in) // NOLINT(runtime/explicit) : allow_internal_ops(false), expect_device_spec(false), @@ -82,8 +81,7 @@ class GraphConstructor { control_dependencies(in.control_dependencies), return_tensors(in.return_tensors), return_nodes(in.return_nodes), - importing(true), - validate_colocation_constraints(in.validate_colocation_constraints) {} + importing(true) {} bool allow_internal_ops; bool expect_device_spec; @@ -105,7 +103,6 @@ class GraphConstructor { // applicable to ConvertGraphDefToGraph as well, so make an attempt to // remove this. bool importing; - bool validate_colocation_constraints; }; typedef gtl::ArraySlice<const NodeDef*> NodeDefSlice; @@ -495,8 +492,7 @@ Status GraphConstructor::InitFromEdges() { Status GraphConstructor::ValidateColocationConstraints( const NodeDef& node_def) { - if (!opts_.validate_colocation_constraints || !opts_.importing) - return Status::OK(); + if (!opts_.importing) return Status::OK(); const auto iter = node_def.attr().find(kColocationAttrName); if (iter == node_def.attr().end()) return Status::OK(); for (const string& c : iter->second.list().s()) { |