diff options
| author |  Dandelion Mané <dandelion@google.com> | 2017-03-10 14:43:23 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-03-10 15:18:15 -0800 |
| commit | 0386a01ad3beb28364599d82199be1c0837b3fa9 (patch) | |
| tree | 3a1d2ef947a7bf37286efc0e8ff760e0401ab319 /tensorflow/c | |
| parent | e73ceaebb209a1e577e7240fba41c692c89143d0 (diff) | |
Merge changes from github.
Change: 149800363
Diffstat (limited to 'tensorflow/c')
| -rw-r--r-- | tensorflow/c/c_api.cc | 6 | ||||
| -rw-r--r-- | tensorflow/c/c_api.h | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc index 02aba54e43..295777e897 100644 --- a/tensorflow/c/c_api.cc +++ b/tensorflow/c/c_api.cc @@ -1701,6 +1701,12 @@ void TF_ImportGraphDefOptionsAddInputMapping(TF_ImportGraphDefOptions* opts, opts->opts.input_map[TensorId(src_name, src_index)] = ToTensorId(dst); } +void TF_ImportGraphDefOptionsRemapControlDependency( + TF_ImportGraphDefOptions* opts, const char* src_name, TF_Operation* dst) { + opts->opts.input_map[TensorId(src_name, tensorflow::Graph::kControlSlot)] = + TensorId(dst->node.name(), tensorflow::Graph::kControlSlot); +} + extern void TF_ImportGraphDefOptionsAddControlDependency( TF_ImportGraphDefOptions* opts, TF_Operation* oper) { opts->opts.control_dependencies.push_back(oper->node.name()); diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h index 02ba0ac509..f837b68d76 100644 --- a/tensorflow/c/c_api.h +++ b/tensorflow/c/c_api.h @@ -810,6 +810,13 @@ extern void TF_ImportGraphDefOptionsAddInputMapping( TF_ImportGraphDefOptions* opts, const char* src_name, int src_index, TF_Output dst); +// Set any imported nodes with control input `src_name` to have that input +// replaced with `dst`. `src_name` refers to a node in the graph to be imported, +// `dst` references an operation already existing in the graph being imported +// into. +extern void TF_GraphImportGraphDefOptionsRemapControlDependency( + TF_ImportGraphDefOptions* opts, const char* src_name, TF_Operation* dst); + // Cause the imported graph to have a control dependency on `oper`. `oper` // should exist in the graph being imported into. extern void TF_ImportGraphDefOptionsAddControlDependency( |