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

[NFC] Mark ThrowTypeError and ThrowValueError as [[noreturn]]

Browse Source 
PiperOrigin-RevId: 329770496
Change-Id: I1ddf9ee0d09fab221df6e168f10fe96e73273a07
This commit is contained in:
George Karpenkov 2020-09-02 12:57:17 -07:00 committed by TensorFlower Gardener
parent b30881b05c
commit 7dfd771df8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/python/lib/core/pybind11_lib.h
View File

@ -55,12 +55,12 @@ inline py::object PyoOrThrow(PyObject* ptr) {
return Pyo(ptr); return Pyo(ptr);
} }
void ThrowTypeError(const char* error_message) { [[noreturn]] void ThrowTypeError(const char* error_message) {
PyErr_SetString(PyExc_TypeError, error_message); PyErr_SetString(PyExc_TypeError, error_message);
throw pybind11::error_already_set(); throw pybind11::error_already_set();
} }
void ThrowValueError(const char* error_message) { [[noreturn]] void ThrowValueError(const char* error_message) {
PyErr_SetString(PyExc_ValueError, error_message); PyErr_SetString(PyExc_ValueError, error_message);
throw pybind11::error_already_set(); throw pybind11::error_already_set();
} }

2
tensorflow/python/tfe_wrapper.cc
View File

@ -400,7 +400,6 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
absl::StrFormat("No matching devices found for '%s'", device_name) absl::StrFormat("No matching devices found for '%s'", device_name)
.c_str()); .c_str());
} }
CHECK(matched_device);
tensorflow::AllocatorAttributes attrs; tensorflow::AllocatorAttributes attrs;
tensorflow::Allocator* allocator = matched_device->GetAllocator(attrs); tensorflow::Allocator* allocator = matched_device->GetAllocator(attrs);
@ -414,7 +413,6 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
absl::StrFormat("Allocator stats not available for device '%s'", absl::StrFormat("Allocator stats not available for device '%s'",
matched_device->name()) matched_device->name())
.c_str()); .c_str());
LOG(FATAL) << "Unreachable";
}); });
// XLA Eager Logic // XLA Eager Logic