experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid crash in C API and log error.

Browse Source 
PiperOrigin-RevId: 314592831
Change-Id: I182a27286b9f31a9c53cf80d4ccfa83849faa205
This commit is contained in:
Christian Sigg 2020-06-03 13:26:09 -07:00 committed by TensorFlower Gardener
parent e19e2d29d5
commit f672ee2564
2 changed files with 7 additions and 3 deletions
tensorflow
c
c_api.cc
core/common_runtime
session.cc

7
tensorflow/c/c_api.cc
View File

@ -589,14 +589,16 @@ void TF_DeleteDeviceList(TF_DeviceList* list) { delete list; }
TF_DeviceList* TF_SessionListDevices(TF_Session* session, TF_Status* status) {
TF_DeviceList* response = new TF_DeviceList;
status->status = session->session->ListDevices(&response->response);
if (session && session->session)
status->status = session->session->ListDevices(&response->response);
return response;
}
TF_DeviceList* TF_DeprecatedSessionListDevices(TF_DeprecatedSession* session,
TF_Status* status) {
TF_DeviceList* response = new TF_DeviceList;
status->status = session->session->ListDevices(&response->response);
if (session && session->session)
status->status = session->session->ListDevices(&response->response);
return response;
}
@ -2178,6 +2180,7 @@ TF_Session* TF_NewSession(TF_Graph* graph, const TF_SessionOptions* opt,
}
return new_session;
} else {
LOG(ERROR) << status->status;
DCHECK_EQ(nullptr, session);
return nullptr;
}

3
tensorflow/core/common_runtime/session.cc
View File

@ -78,7 +78,7 @@ Status NewSession(const SessionOptions& options, Session** out_session) {
Status s = SessionFactory::GetFactory(options, &factory);
if (!s.ok()) {
*out_session = nullptr;
LOG(ERROR) << s;
LOG(ERROR) << "Failed to get session factory: " << s;
return s;
}
// Starts exporting metrics through a platform-specific monitoring API (if
@ -88,6 +88,7 @@ Status NewSession(const SessionOptions& options, Session** out_session) {
s = factory->NewSession(options, out_session);
if (!s.ok()) {
*out_session = nullptr;
LOG(ERROR) << "Failed to create session: " << s;
}
return s;
}