diff options
| author |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-21 15:06:41 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-21 15:06:41 -0700 |
| commit | 08776e73286651617c0c07785ea1476bfabb962a (patch) | |
| tree | 6ee2394f53c52d053d778ecdb552a6fbaedbf41a | |
| parent | 2bb5db28f7303fbfb6ee6e99e46333f53901cfba (diff) | |
| parent | c8b376ac1e7fdb0297079c298eba939aeb252354 (diff) | |
Merge pull request #22084 from yongtang:09012018-mpi-StringPiece
PiperOrigin-RevId: 214048478
| -rw-r--r-- | tensorflow/contrib/mpi/mpi_rendezvous_mgr.cc | 6 | ||||
| -rw-r--r-- | tensorflow/contrib/mpi/mpi_rendezvous_mgr.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tensorflow/contrib/mpi/mpi_rendezvous_mgr.cc b/tensorflow/contrib/mpi/mpi_rendezvous_mgr.cc index 6a7f5efecd..b9967fe76d 100644 --- a/tensorflow/contrib/mpi/mpi_rendezvous_mgr.cc +++ b/tensorflow/contrib/mpi/mpi_rendezvous_mgr.cc @@ -136,8 +136,8 @@ void MPIRemoteRendezvous::RecvFromRemoteAsync( MPIRendezvousMgr* mgr = reinterpret_cast<MPIRendezvousMgr*>(this->rendezvous_mgr_); - mgr->QueueRequest(parsed.FullKey().ToString(), step_id_, - std::move(request_call), rendezvous_call); + mgr->QueueRequest(string(parsed.FullKey()), step_id_, std::move(request_call), + rendezvous_call); } MPIRemoteRendezvous::~MPIRemoteRendezvous() {} @@ -258,7 +258,7 @@ void MPIRendezvousMgr::AddRequest(RecvTensorRequest request, std::function<MPISendTensorCall*()> res = std::bind( send_cb, status, send_args, recv_args, val, is_dead, mpi_send_call); - SendQueueEntry req(parsed.FullKey().ToString().c_str(), std::move(res)); + SendQueueEntry req(string(parsed.FullKey()), std::move(res)); this->QueueSendRequest(req); diff --git a/tensorflow/contrib/mpi/mpi_rendezvous_mgr.h b/tensorflow/contrib/mpi/mpi_rendezvous_mgr.h index 5596601ddb..90140fcab3 100644 --- a/tensorflow/contrib/mpi/mpi_rendezvous_mgr.h +++ b/tensorflow/contrib/mpi/mpi_rendezvous_mgr.h @@ -71,7 +71,7 @@ class MPISendTensorCall { void Init(const Rendezvous::ParsedKey& parsed, const int64 step_id, const bool is_dead) { - mRes_.set_key(parsed.FullKey().ToString()); + mRes_.set_key(string(parsed.FullKey())); mRes_.set_step_id(step_id); mRes_.mutable_response()->set_is_dead(is_dead); mRes_.mutable_response()->set_send_start_micros( |