diff options
author | A. Unique TensorFlower <gardener@tensorflow.org> | 2017-01-17 17:17:41 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-01-17 17:25:46 -0800 |
commit | 59f813b67613d81347703a854a3b1aab62be8a3c (patch) | |
tree | 351231a0516fab39ed5bb554b3d197bff8c80430 /tensorflow/cc/client | |
parent | 79d5b37f807e8593a16781f50e27a11555968921 (diff) |
Migrate to new namespace for Input, Output, etc. in the C++ API.
Change: 144776821
Diffstat (limited to 'tensorflow/cc/client')
-rw-r--r-- | tensorflow/cc/client/client_session.cc | 12 | ||||
-rw-r--r-- | tensorflow/cc/client/client_session.h | 22 |
2 files changed, 15 insertions, 19 deletions
diff --git a/tensorflow/cc/client/client_session.cc b/tensorflow/cc/client/client_session.cc index 5a98deb259..b407d3ab03 100644 --- a/tensorflow/cc/client/client_session.cc +++ b/tensorflow/cc/client/client_session.cc @@ -45,20 +45,20 @@ SessionOptions ClientSession::MakeDefaultSessionOptions( return options; } -Status ClientSession::Run(const std::vector<ops::Output>& fetch_outputs, +Status ClientSession::Run(const std::vector<Output>& fetch_outputs, std::vector<Tensor>* outputs) const { return Run(FeedType{}, fetch_outputs, {}, outputs); } Status ClientSession::Run(const FeedType& inputs, - const std::vector<ops::Output>& fetch_outputs, + const std::vector<Output>& fetch_outputs, std::vector<Tensor>* outputs) const { return Run(inputs, fetch_outputs, {}, outputs); } Status ClientSession::Run(const FeedType& inputs, - const std::vector<ops::Output>& fetch_outputs, - const std::vector<ops::Operation>& run_outputs, + const std::vector<Output>& fetch_outputs, + const std::vector<Operation>& run_outputs, std::vector<Tensor>* outputs) const { return Run(RunOptions(), inputs, fetch_outputs, run_outputs, outputs, nullptr); @@ -77,8 +77,8 @@ Status ClientSession::MaybeExtendGraph() const { } Status ClientSession::Run(const RunOptions& run_options, const FeedType& inputs, - const std::vector<ops::Output>& fetch_outputs, - const std::vector<ops::Operation>& run_outputs, + const std::vector<Output>& fetch_outputs, + const std::vector<Operation>& run_outputs, std::vector<Tensor>* outputs, RunMetadata* run_metadata) const { std::vector<std::pair<string, Tensor>> feeds; diff --git a/tensorflow/cc/client/client_session.h b/tensorflow/cc/client/client_session.h index a55d9a5a59..28ff3ec964 100644 --- a/tensorflow/cc/client/client_session.h +++ b/tensorflow/cc/client/client_session.h @@ -50,11 +50,9 @@ class ClientSession { /// A data type to represent feeds to a Run call. /// /// This is a map of `Output` objects returned by op-constructors to the value - /// to feed them with. See `ops::Input::Initializer` for details on what can - /// be used as feed values. - typedef std::unordered_map<ops::Output, ops::Input::Initializer, - ops::OutputHash> - FeedType; + /// to feed them with. See `Input::Initializer` for details on what can be + /// used as feed values. + typedef std::unordered_map<Output, Input::Initializer, OutputHash> FeedType; /// Create a new session to evaluate the graph contained in `scope` by /// connecting to the TensorFlow runtime specified by `target`. @@ -69,25 +67,23 @@ class ClientSession { /// Evaluate the tensors in `fetch_outputs`. The values are returned as /// `Tensor` objects in `outputs`. The number and order of `outputs` will /// match `fetch_outputs`. - Status Run(const std::vector<ops::Output>& fetch_outputs, + Status Run(const std::vector<Output>& fetch_outputs, std::vector<Tensor>* outputs) const; /// Same as above, but use the mapping in `inputs` as feeds. - Status Run(const FeedType& inputs, - const std::vector<ops::Output>& fetch_outputs, + Status Run(const FeedType& inputs, const std::vector<Output>& fetch_outputs, std::vector<Tensor>* outputs) const; /// Same as above. Additionally runs the operations ins `run_outputs`. - Status Run(const FeedType& inputs, - const std::vector<ops::Output>& fetch_outputs, - const std::vector<ops::Operation>& run_outputs, + Status Run(const FeedType& inputs, const std::vector<Output>& fetch_outputs, + const std::vector<Operation>& run_outputs, std::vector<Tensor>* outputs) const; /// Use `run_options` to turn on performance profiling. `run_metadata`, if not /// null, is filled in with the profiling results. Status Run(const RunOptions& run_options, const FeedType& inputs, - const std::vector<ops::Output>& fetch_outputs, - const std::vector<ops::Operation>& run_outputs, + const std::vector<Output>& fetch_outputs, + const std::vector<Operation>& run_outputs, std::vector<Tensor>* outputs, RunMetadata* run_metadata) const; // TODO(keveman): Add support for partial run. |