From ed1a6dbc1c15d864f2bff43afbbb08bb3e562d5c Mon Sep 17 00:00:00 2001 From: hanjun996 Date: Thu, 18 Jun 2020 21:26:04 +0800 Subject: [PATCH] sync change of tdt --- mindspore/ccsrc/CMakeLists.txt | 2 +- mindspore/ccsrc/utils/context/ms_context.cc | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 48a3f5d65e..4184d29281 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -131,7 +131,7 @@ if (ENABLE_GE) else () target_link_libraries(mindspore ge_client) endif () - target_link_libraries(mindspore graph tsdclient) + target_link_libraries(mindspore graph tsdclient datatransfer) endif() if (ENABLE_D) diff --git a/mindspore/ccsrc/utils/context/ms_context.cc b/mindspore/ccsrc/utils/context/ms_context.cc index aa6fe1157e..0aacf2d2a1 100644 --- a/mindspore/ccsrc/utils/context/ms_context.cc +++ b/mindspore/ccsrc/utils/context/ms_context.cc @@ -177,14 +177,21 @@ bool MsContext::OpenTsd() { } MS_LOG(INFO) << "Device id = " << device_id << ", rank size = " << rank_size << "."; - +#if (defined(ENABLE_TDTQUE) && defined(ENABLE_GE)) + int32_t initStatus = tdt::TdtHostInit(device_id); + if (initStatus != TDT_OK_CODE) { + MS_LOG(EXCEPTION) << "Init tsd failed, status = " << initStatus << "."; + return false; + } + tdt_print_ = std::thread(TensorPrint()); +#endif TDT_StatusT status = tdt::TsdClient::GetInstance()->Open(device_id, rank_size); if (status != TDT_OK) { MS_LOG(EXCEPTION) << "Device " << device_id << " is occupied, open tsd failed, status = " << status << "."; return false; } tsd_ref_++; -#ifdef ENABLE_TDTQUE +#if (defined(ENABLE_TDTQUE) && !defined(ENABLE_GE)) int32_t initStatus = tdt::TdtHostInit(device_id); if (initStatus != TDT_OK_CODE) { MS_LOG(EXCEPTION) << "Init tsd failed, status = " << initStatus << ".";