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

throwTypeError -> ThrowTypeError

Browse Source 
pyo -> Pyo
pyo_or_throw -> PyoOrThrow

PiperOrigin-RevId: 306876916
Change-Id: Idf846a2b13f93ab504ed277e229f473cf5a8605a
This commit is contained in:
Akshay Modi 2020-04-16 10:43:03 -07:00 committed by TensorFlower Gardener
parent 5c306c4d40
commit ffb230a4b7
12 changed files with 105 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper_pybind11.cc
View File

@ -55,82 +55,82 @@ PYBIND11_MODULE(_pywrap_tensorflow_interpreter_wrapper, m) {
py::class_<InterpreterWrapper>(m, "InterpreterWrapper") py::class_<InterpreterWrapper>(m, "InterpreterWrapper")
.def("AllocateTensors", .def("AllocateTensors",
[](InterpreterWrapper& self) { [](InterpreterWrapper& self) {
return tensorflow::pyo_or_throw(self.AllocateTensors()); return tensorflow::PyoOrThrow(self.AllocateTensors());
}) })
.def("Invoke", .def("Invoke",
[](InterpreterWrapper& self) { [](InterpreterWrapper& self) {
return tensorflow::pyo_or_throw(self.Invoke()); return tensorflow::PyoOrThrow(self.Invoke());
}) })
.def("InputIndices", .def("InputIndices",
[](const InterpreterWrapper& self) { [](const InterpreterWrapper& self) {
return tensorflow::pyo_or_throw(self.InputIndices()); return tensorflow::PyoOrThrow(self.InputIndices());
}) })
.def("OutputIndices", .def("OutputIndices",
[](InterpreterWrapper& self) { [](InterpreterWrapper& self) {
return tensorflow::pyo_or_throw(self.OutputIndices()); return tensorflow::PyoOrThrow(self.OutputIndices());
}) })
.def("ResizeInputTensor", .def("ResizeInputTensor",
[](InterpreterWrapper& self, int i, py::handle& value) { [](InterpreterWrapper& self, int i, py::handle& value) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
self.ResizeInputTensor(i, value.ptr())); self.ResizeInputTensor(i, value.ptr()));
}) })
.def("NumTensors", &InterpreterWrapper::NumTensors) .def("NumTensors", &InterpreterWrapper::NumTensors)
.def("TensorName", &InterpreterWrapper::TensorName) .def("TensorName", &InterpreterWrapper::TensorName)
.def("TensorType", .def("TensorType",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.TensorType(i)); return tensorflow::PyoOrThrow(self.TensorType(i));
}) })
.def("TensorSize", .def("TensorSize",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.TensorSize(i)); return tensorflow::PyoOrThrow(self.TensorSize(i));
}) })
.def("TensorSizeSignature", .def("TensorSizeSignature",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.TensorSizeSignature(i)); return tensorflow::PyoOrThrow(self.TensorSizeSignature(i));
}) })
.def("TensorSparsityParameters", .def("TensorSparsityParameters",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.TensorSparsityParameters(i)); return tensorflow::PyoOrThrow(self.TensorSparsityParameters(i));
}) })
.def( .def(
"TensorQuantization", "TensorQuantization",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.TensorQuantization(i)); return tensorflow::PyoOrThrow(self.TensorQuantization(i));
}, },
R"pbdoc( R"pbdoc(
Deprecated in favor of TensorQuantizationParameters. Deprecated in favor of TensorQuantizationParameters.
)pbdoc") )pbdoc")
.def("TensorQuantizationParameters", .def(
"TensorQuantizationParameters",
[](InterpreterWrapper& self, int i) { [](InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(self.TensorQuantizationParameters(i));
self.TensorQuantizationParameters(i));
}) })
.def("SetTensor", .def("SetTensor",
[](InterpreterWrapper& self, int i, py::handle& value) { [](InterpreterWrapper& self, int i, py::handle& value) {
return tensorflow::pyo_or_throw(self.SetTensor(i, value.ptr())); return tensorflow::PyoOrThrow(self.SetTensor(i, value.ptr()));
}) })
.def("GetTensor", .def("GetTensor",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.GetTensor(i)); return tensorflow::PyoOrThrow(self.GetTensor(i));
}) })
.def("ResetVariableTensors", .def("ResetVariableTensors",
[](InterpreterWrapper& self) { [](InterpreterWrapper& self) {
return tensorflow::pyo_or_throw(self.ResetVariableTensors()); return tensorflow::PyoOrThrow(self.ResetVariableTensors());
}) })
.def("NumNodes", &InterpreterWrapper::NumNodes) .def("NumNodes", &InterpreterWrapper::NumNodes)
.def("NodeName", &InterpreterWrapper::NodeName) .def("NodeName", &InterpreterWrapper::NodeName)
.def("NodeInputs", .def("NodeInputs",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.NodeInputs(i)); return tensorflow::PyoOrThrow(self.NodeInputs(i));
}) })
.def("NodeOutputs", .def("NodeOutputs",
[](const InterpreterWrapper& self, int i) { [](const InterpreterWrapper& self, int i) {
return tensorflow::pyo_or_throw(self.NodeOutputs(i)); return tensorflow::PyoOrThrow(self.NodeOutputs(i));
}) })
.def( .def(
"tensor", "tensor",
[](InterpreterWrapper& self, py::handle& base_object, int i) { [](InterpreterWrapper& self, py::handle& base_object, int i) {
return tensorflow::pyo_or_throw(self.tensor(base_object.ptr(), i)); return tensorflow::PyoOrThrow(self.tensor(base_object.ptr(), i));
}, },
R"pbdoc( R"pbdoc(
Returns a reference to tensor index i as a numpy array. The Returns a reference to tensor index i as a numpy array. The
@ -140,7 +140,7 @@ PYBIND11_MODULE(_pywrap_tensorflow_interpreter_wrapper, m) {
"ModifyGraphWithDelegate", "ModifyGraphWithDelegate",
// Address of the delegate is passed as an argument. // Address of the delegate is passed as an argument.
[](InterpreterWrapper& self, uintptr_t delegate_ptr) { [](InterpreterWrapper& self, uintptr_t delegate_ptr) {
return tensorflow::pyo_or_throw(self.ModifyGraphWithDelegate( return tensorflow::PyoOrThrow(self.ModifyGraphWithDelegate(
reinterpret_cast<TfLiteDelegate*>(delegate_ptr))); reinterpret_cast<TfLiteDelegate*>(delegate_ptr)));
}, },
R"pbdoc( R"pbdoc(

17
tensorflow/lite/python/optimize/calibration_wrapper_pybind11.cc
View File

@ -31,37 +31,36 @@ PYBIND11_MODULE(_pywrap_tensorflow_lite_calibration_wrapper, m) {
})) }))
.def("Prepare", .def("Prepare",
[](CalibrationWrapper& self, py::handle& input_shapes) { [](CalibrationWrapper& self, py::handle& input_shapes) {
return tensorflow::pyo_or_throw(self.Prepare(input_shapes.ptr())); return tensorflow::PyoOrThrow(self.Prepare(input_shapes.ptr()));
}) })
.def("Prepare", .def("Prepare",
[](CalibrationWrapper& self) { [](CalibrationWrapper& self) {
return tensorflow::pyo_or_throw(self.Prepare()); return tensorflow::PyoOrThrow(self.Prepare());
}) })
.def( .def("FeedTensor",
"FeedTensor",
[](CalibrationWrapper& self, py::handle& input_value) { [](CalibrationWrapper& self, py::handle& input_value) {
return tensorflow::pyo_or_throw(self.FeedTensor(input_value.ptr())); return tensorflow::PyoOrThrow(self.FeedTensor(input_value.ptr()));
}) })
.def("QuantizeModel", .def("QuantizeModel",
[](CalibrationWrapper& self, int input_py_type, int output_py_type, [](CalibrationWrapper& self, int input_py_type, int output_py_type,
bool allow_float, bool enable_mlir_quantizer) { bool allow_float, bool enable_mlir_quantizer) {
return tensorflow::pyo_or_throw(self.QuantizeModel( return tensorflow::PyoOrThrow(self.QuantizeModel(
input_py_type, output_py_type, allow_float)); input_py_type, output_py_type, allow_float));
}) })
.def("QuantizeModel", .def("QuantizeModel",
[](CalibrationWrapper& self, int input_py_type, int output_py_type, [](CalibrationWrapper& self, int input_py_type, int output_py_type,
bool allow_float) { bool allow_float) {
return tensorflow::pyo_or_throw(self.QuantizeModel( return tensorflow::PyoOrThrow(self.QuantizeModel(
input_py_type, output_py_type, allow_float)); input_py_type, output_py_type, allow_float));
}) })
.def("QuantizeModel", .def("QuantizeModel",
[](CalibrationWrapper& self, int input_py_type, int output_py_type, [](CalibrationWrapper& self, int input_py_type, int output_py_type,
bool allow_float, const char* operator_output_name) { bool allow_float, const char* operator_output_name) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
self.QuantizeModel(input_py_type, output_py_type, allow_float, self.QuantizeModel(input_py_type, output_py_type, allow_float,
operator_output_name)); operator_output_name));
}) })
.def("Calibrate", [](CalibrationWrapper& self) { .def("Calibrate", [](CalibrationWrapper& self) {
return tensorflow::pyo_or_throw(self.Calibrate()); return tensorflow::PyoOrThrow(self.Calibrate());
}); });
} }

2
tensorflow/lite/python/optimize/sparsification_wrapper_pybind11.cc
View File

@ -30,6 +30,6 @@ PYBIND11_MODULE(_pywrap_tensorflow_lite_sparsification_wrapper, m) {
return ::SparsificationWrapper::CreateWrapperCPPFromBuffer(data.ptr()); return ::SparsificationWrapper::CreateWrapperCPPFromBuffer(data.ptr());
})) }))
.def("SparsifyModel", [](SparsificationWrapper& self) { .def("SparsifyModel", [](SparsificationWrapper& self) {
return tensorflow::pyo_or_throw(self.SparsifyModel()); return tensorflow::PyoOrThrow(self.SparsifyModel());
}); });
} }

2
tensorflow/lite/testing/string_util_wrapper.cc
View File

@ -28,7 +28,7 @@ PYBIND11_MODULE(_pywrap_string_util, m) {
m.def( m.def(
"SerializeAsHexString", "SerializeAsHexString",
[](py::handle& string_tensor) { [](py::handle& string_tensor) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
tflite::testing::python::SerializeAsHexString(string_tensor.ptr())); tflite::testing::python::SerializeAsHexString(string_tensor.ptr()));
}, },
R"pbdoc( R"pbdoc(

18
tensorflow/python/client/tf_session_wrapper.cc
View File

@ -377,7 +377,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
auto result = tensorflow::TF_TryEvaluateConstant_wrapper( auto result = tensorflow::TF_TryEvaluateConstant_wrapper(
graph, output, status.get()); graph, output, status.get());
tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get()); tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get());
return tensorflow::pyo_or_throw(result); return tensorflow::PyoOrThrow(result);
}); });
m.def("ExtendSession", [](TF_Session* session) { m.def("ExtendSession", [](TF_Session* session) {
@ -459,7 +459,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
PyList_SET_ITEM(result, i, py_outputs.at(i)); PyList_SET_ITEM(result, i, py_outputs.at(i));
} }
return tensorflow::pyo_or_throw(result); return tensorflow::PyoOrThrow(result);
}); });
// Do not release GIL. // Do not release GIL.
@ -509,7 +509,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
PyList_SET_ITEM(result, i, py_outputs.at(i)); PyList_SET_ITEM(result, i, py_outputs.at(i));
} }
return tensorflow::pyo_or_throw(result); return tensorflow::PyoOrThrow(result);
}); });
// Do not release GIL. // Do not release GIL.
@ -540,7 +540,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
// Return out_values // Return out_values
py::list py_list; py::list py_list;
for (size_t i = 0; i < out_values.size(); ++i) { for (size_t i = 0; i < out_values.size(); ++i) {
py::object obj = tensorflow::pyo(out_values.at(i)); py::object obj = tensorflow::Pyo(out_values.at(i));
py_list.append(obj); py_list.append(obj);
} }
return py_list; return py_list;
@ -610,7 +610,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
// bool. // bool.
// Acquire GIL for returning output returning. // Acquire GIL for returning output returning.
pybind11::gil_scoped_acquire acquire; pybind11::gil_scoped_acquire acquire;
return tensorflow::pyo(PyLong_FromLongLong(value)); return tensorflow::Pyo(PyLong_FromLongLong(value));
}); });
m.def("TF_SetAttrValueProto", [](TF_OperationDescription* desc, m.def("TF_SetAttrValueProto", [](TF_OperationDescription* desc,
@ -667,7 +667,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
m.def("TF_NewBuffer", TF_NewBuffer, py::return_value_policy::reference); m.def("TF_NewBuffer", TF_NewBuffer, py::return_value_policy::reference);
m.def("TF_GetBuffer", [](TF_Buffer* buf) { m.def("TF_GetBuffer", [](TF_Buffer* buf) {
TF_Buffer buffer = TF_GetBuffer(buf); TF_Buffer buffer = TF_GetBuffer(buf);
return tensorflow::pyo_or_throw(PyBytes_FromStringAndSize( return tensorflow::PyoOrThrow(PyBytes_FromStringAndSize(
reinterpret_cast<const char*>(buffer.data), buffer.length)); reinterpret_cast<const char*>(buffer.data), buffer.length));
}); });
m.def("TF_DeleteBuffer", &TF_DeleteBuffer); m.def("TF_DeleteBuffer", &TF_DeleteBuffer);
@ -713,7 +713,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
m.def("TF_GetOpList", [](TF_Library* lib_handle) { m.def("TF_GetOpList", [](TF_Library* lib_handle) {
TF_Buffer output_buffer = TF_GetOpList(lib_handle); TF_Buffer output_buffer = TF_GetOpList(lib_handle);
return tensorflow::pyo_or_throw(PyBytes_FromStringAndSize( return tensorflow::PyoOrThrow(PyBytes_FromStringAndSize(
reinterpret_cast<const char*>(output_buffer.data), reinterpret_cast<const char*>(output_buffer.data),
output_buffer.length)); output_buffer.length));
}); });
@ -790,7 +790,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
// Returns a (TF_Operation*, int pos) tuple. // Returns a (TF_Operation*, int pos) tuple.
py::tuple result_tuple = py::make_tuple( py::tuple result_tuple = py::make_tuple(
py::cast(output), tensorflow::pyo(PyLong_FromSize_t(pos))); py::cast(output), tensorflow::Pyo(PyLong_FromSize_t(pos)));
return result_tuple; return result_tuple;
}, },
py::return_value_policy::reference); py::return_value_policy::reference);
@ -1094,7 +1094,7 @@ PYBIND11_MODULE(_pywrap_tf_session, m) {
py::gil_scoped_release release; py::gil_scoped_release release;
TF_OperationGetAttrBool(oper, attr_name, &value, status.get()); TF_OperationGetAttrBool(oper, attr_name, &value, status.get());
tensorflow::MaybeRaiseRegisteredFromTFStatusWithGIL(status.get()); tensorflow::MaybeRaiseRegisteredFromTFStatusWithGIL(status.get());
return tensorflow::pyo(PyBool_FromLong(value)); return tensorflow::Pyo(PyBool_FromLong(value));
}); });
m.def("TF_NewStatus", TF_NewStatus, py::return_value_policy::reference); m.def("TF_NewStatus", TF_NewStatus, py::return_value_policy::reference);

2
tensorflow/python/eager/custom_device_testutil.cc
View File

@ -64,7 +64,7 @@ PYBIND11_MODULE(custom_device_testutil, m) {
PyCapsule_New(device, "TFE_CustomDevice", &CallDelete_Device)); PyCapsule_New(device, "TFE_CustomDevice", &CallDelete_Device));
tensorflow::Safe_PyObjectPtr device_info_capsule(PyCapsule_New( tensorflow::Safe_PyObjectPtr device_info_capsule(PyCapsule_New(
device_info, "TFE_CustomDevice_DeviceInfo", &CallDelete_DeviceInfo)); device_info, "TFE_CustomDevice_DeviceInfo", &CallDelete_DeviceInfo));
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
PyTuple_Pack(4, device_capsule.get(), device_info_capsule.get(), PyTuple_Pack(4, device_capsule.get(), device_info_capsule.get(),
arrived_capsule.get(), executed_capsule.get())); arrived_capsule.get(), executed_capsule.get()));
}); });

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

@ -41,21 +41,21 @@ namespace tensorflow {
// Convert PyObject* to py::object with no error handling. // Convert PyObject* to py::object with no error handling.
inline py::object pyo(PyObject* ptr) { inline py::object Pyo(PyObject* ptr) {
return py::reinterpret_steal<py::object>(ptr); return py::reinterpret_steal<py::object>(ptr);
} }
// Raise an exception if the PyErrOccurred flag is set or else return the Python // Raise an exception if the PyErrOccurred flag is set or else return the Python
// object. // object.
inline py::object pyo_or_throw(PyObject* ptr) { inline py::object PyoOrThrow(PyObject* ptr) {
if (PyErr_Occurred() || ptr == nullptr) { if (PyErr_Occurred() || ptr == nullptr) {
throw py::error_already_set(); throw py::error_already_set();
} }
return pyo(ptr); return Pyo(ptr);
} }
void throwTypeError(const char* error_message) { 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();
} }

6
tensorflow/python/lite/toco_python_api_wrapper.cc
View File

@ -26,7 +26,7 @@ PYBIND11_MODULE(_pywrap_toco_api, m) {
py::object toco_flags_proto_txt_raw, py::object input_contents_txt_raw, py::object toco_flags_proto_txt_raw, py::object input_contents_txt_raw,
bool extended_return, py::object debug_info_txt_raw, bool extended_return, py::object debug_info_txt_raw,
bool enable_mlir_converter) { bool enable_mlir_converter) {
return tensorflow::pyo_or_throw(toco::TocoConvert( return tensorflow::PyoOrThrow(toco::TocoConvert(
model_flags_proto_txt_raw.ptr(), toco_flags_proto_txt_raw.ptr(), model_flags_proto_txt_raw.ptr(), toco_flags_proto_txt_raw.ptr(),
input_contents_txt_raw.ptr(), extended_return, input_contents_txt_raw.ptr(), extended_return,
debug_info_txt_raw.ptr(), enable_mlir_converter)); debug_info_txt_raw.ptr(), enable_mlir_converter));
@ -49,7 +49,7 @@ PYBIND11_MODULE(_pywrap_toco_api, m) {
m.def( m.def(
"TocoGetPotentiallySupportedOps", "TocoGetPotentiallySupportedOps",
[]() { []() {
return tensorflow::pyo_or_throw(toco::TocoGetPotentiallySupportedOps()); return tensorflow::PyoOrThrow(toco::TocoGetPotentiallySupportedOps());
}, },
R"pbdoc( R"pbdoc(
Returns a list of names of all ops potentially supported by tflite. Returns a list of names of all ops potentially supported by tflite.
@ -57,7 +57,7 @@ PYBIND11_MODULE(_pywrap_toco_api, m) {
m.def( m.def(
"ExperimentalMlirQuantizeModel", "ExperimentalMlirQuantizeModel",
[](py::object input_contents_txt_raw, bool fully_quantize) { [](py::object input_contents_txt_raw, bool fully_quantize) {
return tensorflow::pyo_or_throw(toco::MlirQuantizeModel( return tensorflow::PyoOrThrow(toco::MlirQuantizeModel(
input_contents_txt_raw.ptr(), fully_quantize)); input_contents_txt_raw.ptr(), fully_quantize));
}, },
py::arg("input_contents_txt_raw"), py::arg("fully_quantize") = true, py::arg("input_contents_txt_raw"), py::arg("fully_quantize") = true,

82
tensorflow/python/tfe_wrapper.cc
View File

@ -110,14 +110,14 @@ TFE_InputTensorHandles InputTFE_InputTensorHandles(
TFE_InputTensorHandles input_tensor_handles; TFE_InputTensorHandles input_tensor_handles;
if (input_tensors.ptr() != Py_None) { if (input_tensors.ptr() != Py_None) {
if (!PyList_Check(input_tensors.ptr())) { if (!PyList_Check(input_tensors.ptr())) {
tensorflow::throwTypeError("must provide a list of Tensors as inputs"); tensorflow::ThrowTypeError("must provide a list of Tensors as inputs");
} }
Py_ssize_t len = PyList_Size(input_tensors.ptr()); Py_ssize_t len = PyList_Size(input_tensors.ptr());
input_tensor_handles.resize(len); input_tensor_handles.resize(len);
for (Py_ssize_t i = 0; i < len; ++i) { for (Py_ssize_t i = 0; i < len; ++i) {
PyObject* elem = PyList_GetItem(input_tensors.ptr(), i); PyObject* elem = PyList_GetItem(input_tensors.ptr(), i);
if (!elem) { if (!elem) {
tensorflow::throwTypeError("Input Tensor does not exist."); tensorflow::ThrowTypeError("Input Tensor does not exist.");
} }
if (EagerTensor_CheckExact(elem)) { if (EagerTensor_CheckExact(elem)) {
(input_tensor_handles)[i] = EagerTensor_Handle(elem); (input_tensor_handles)[i] = EagerTensor_Handle(elem);
@ -139,7 +139,7 @@ TFE_InputTensorHandles InputTFE_InputTensorHandles(
} else { } else {
// This is a subclass of EagerTensor that we don't support. // This is a subclass of EagerTensor that we don't support.
PyErr_Clear(); PyErr_Clear();
tensorflow::throwTypeError( tensorflow::ThrowTypeError(
tensorflow::strings::StrCat( tensorflow::strings::StrCat(
"Saw an object that is an instance of a strict subclass of " "Saw an object that is an instance of a strict subclass of "
"EagerTensor, which is not supported. Item ", "EagerTensor, which is not supported. Item ",
@ -151,7 +151,7 @@ TFE_InputTensorHandles InputTFE_InputTensorHandles(
// tensor. // tensor.
tensorflow::Safe_PyObjectPtr name_attr( tensorflow::Safe_PyObjectPtr name_attr(
PyObject_GetAttrString(elem, "name")); PyObject_GetAttrString(elem, "name"));
tensorflow::throwTypeError( tensorflow::ThrowTypeError(
tensorflow::strings::StrCat( tensorflow::strings::StrCat(
"An op outside of the function building code is being passed\n" "An op outside of the function building code is being passed\n"
"a \"Graph\" tensor. It is possible to have Graph tensors\n" "a \"Graph\" tensor. It is possible to have Graph tensors\n"
@ -166,7 +166,7 @@ TFE_InputTensorHandles InputTFE_InputTensorHandles(
name_attr ? TFE_GetPythonString(name_attr.get()) : "<unknown>") name_attr ? TFE_GetPythonString(name_attr.get()) : "<unknown>")
.c_str()); .c_str());
} else { } else {
tensorflow::throwTypeError( tensorflow::ThrowTypeError(
tensorflow::strings::StrCat( tensorflow::strings::StrCat(
"provided list of inputs contains objects other " "provided list of inputs contains objects other "
"than 'EagerTensor'. Item ", "than 'EagerTensor'. Item ",
@ -234,7 +234,7 @@ py::object TFE_Py_ExecuteCancelable_wrapper(
PyList_SetItem(output_list, i, output); PyList_SetItem(output_list, i, output);
} }
tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get()); tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get());
return tensorflow::pyo_or_throw(output_list); return tensorflow::PyoOrThrow(output_list);
} }
static py::object TF_ListPhysicalDevices() { static py::object TF_ListPhysicalDevices() {
@ -253,7 +253,7 @@ static py::object TF_ListPhysicalDevices() {
PyList_SetItem(result, i, dev_obj); PyList_SetItem(result, i, dev_obj);
++i; ++i;
} }
return tensorflow::pyo_or_throw(result); return tensorflow::PyoOrThrow(result);
} }
static py::object TFE_ClearScalarCache() { static py::object TFE_ClearScalarCache() {
@ -323,10 +323,10 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
py::class_<TF_Function> TF_Function_class(m, "TF_Function"); py::class_<TF_Function> TF_Function_class(m, "TF_Function");
m.def("TFE_Py_RegisterExceptionClass", [](const py::handle& e) { m.def("TFE_Py_RegisterExceptionClass", [](const py::handle& e) {
return tensorflow::pyo_or_throw(TFE_Py_RegisterExceptionClass(e.ptr())); return tensorflow::PyoOrThrow(TFE_Py_RegisterExceptionClass(e.ptr()));
}); });
m.def("TFE_Py_RegisterFallbackExceptionClass", [](const py::handle& e) { m.def("TFE_Py_RegisterFallbackExceptionClass", [](const py::handle& e) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_RegisterFallbackExceptionClass(e.ptr())); TFE_Py_RegisterFallbackExceptionClass(e.ptr()));
}); });
@ -347,7 +347,7 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
tensorflow::make_safe(TF_NewStatus()); tensorflow::make_safe(TF_NewStatus());
TFE_Context* context = TFE_NewContext(opts, status.get()); TFE_Context* context = TFE_NewContext(opts, status.get());
tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get()); tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get());
return tensorflow::pyo_or_throw(tensorflow::OutputTFE_Context(context)); return tensorflow::PyoOrThrow(tensorflow::OutputTFE_Context(context));
}, },
py::return_value_policy::reference); py::return_value_policy::reference);
m.def("TFE_DeleteContext", [](py::handle& o) { m.def("TFE_DeleteContext", [](py::handle& o) {
@ -540,19 +540,19 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
if (*is_list == 1) { if (*is_list == 1) {
PyObject* list = PyList_New(1); PyObject* list = PyList_New(1);
PyList_SetItem(list, 0, output_pyo); PyList_SetItem(list, 0, output_pyo);
return tensorflow::pyo_or_throw(list); return tensorflow::PyoOrThrow(list);
} }
return tensorflow::pyo_or_throw(output_pyo); return tensorflow::PyoOrThrow(output_pyo);
}); });
m.def("TFE_Py_InitEagerTensor", [](const py::handle& o) { m.def("TFE_Py_InitEagerTensor", [](const py::handle& o) {
return tensorflow::pyo_or_throw(TFE_Py_InitEagerTensor(o.ptr())); return tensorflow::PyoOrThrow(TFE_Py_InitEagerTensor(o.ptr()));
}); });
m.def("TFE_Py_SetEagerTensorProfiler", &TFE_Py_SetEagerTensorProfiler); m.def("TFE_Py_SetEagerTensorProfiler", &TFE_Py_SetEagerTensorProfiler);
m.def("TFE_Py_RegisterJVPFunction", [](const py::handle& o) { m.def("TFE_Py_RegisterJVPFunction", [](const py::handle& o) {
return tensorflow::pyo_or_throw(TFE_Py_RegisterJVPFunction(o.ptr())); return tensorflow::PyoOrThrow(TFE_Py_RegisterJVPFunction(o.ptr()));
}); });
m.def("TFE_Py_RegisterGradientFunction", [](const py::handle& o) { m.def("TFE_Py_RegisterGradientFunction", [](const py::handle& o) {
return tensorflow::pyo_or_throw(TFE_Py_RegisterGradientFunction(o.ptr())); return tensorflow::PyoOrThrow(TFE_Py_RegisterGradientFunction(o.ptr()));
}); });
m.def("TFE_Py_Execute", m.def("TFE_Py_Execute",
[](const py::handle& context, const char* device_name, [](const py::handle& context, const char* device_name,
@ -574,22 +574,22 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
}); });
m.def("TFE_Py_FastPathExecute", [](const py::args args) { m.def("TFE_Py_FastPathExecute", [](const py::args args) {
// TFE_Py_FastPathExecute requires error checking prior to returning. // TFE_Py_FastPathExecute requires error checking prior to returning.
return tensorflow::pyo_or_throw(TFE_Py_FastPathExecute_C(args.ptr())); return tensorflow::PyoOrThrow(TFE_Py_FastPathExecute_C(args.ptr()));
}); });
m.def("TFE_Py_RecordGradient", m.def("TFE_Py_RecordGradient",
[](const py::handle& op_name, const py::handle& inputs, [](const py::handle& op_name, const py::handle& inputs,
const py::handle& attrs, const py::handle& results, const py::handle& attrs, const py::handle& results,
const py::handle& forward_pass_name_scope) { const py::handle& forward_pass_name_scope) {
return tensorflow::pyo_or_throw(TFE_Py_RecordGradient( return tensorflow::PyoOrThrow(TFE_Py_RecordGradient(
op_name.ptr(), inputs.ptr(), attrs.ptr(), results.ptr(), op_name.ptr(), inputs.ptr(), attrs.ptr(), results.ptr(),
forward_pass_name_scope.ptr())); forward_pass_name_scope.ptr()));
}); });
m.def("TFE_Py_UID", []() { return tensorflow::pyo_or_throw(TFE_Py_UID()); }); m.def("TFE_Py_UID", []() { return tensorflow::PyoOrThrow(TFE_Py_UID()); });
// TFE_Py_Tape Logic // TFE_Py_Tape Logic
m.def("TFE_Py_TapeSetNew", [](const py::handle& persistent, m.def("TFE_Py_TapeSetNew", [](const py::handle& persistent,
const py::handle& watch_accessed_variables) { const py::handle& watch_accessed_variables) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_TapeSetNew(persistent.ptr(), watch_accessed_variables.ptr())); TFE_Py_TapeSetNew(persistent.ptr(), watch_accessed_variables.ptr()));
}); });
m.def("TFE_Py_TapeSetAdd", m.def("TFE_Py_TapeSetAdd",
@ -599,15 +599,15 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
m.def("TFE_Py_TapeSetStopOnThread", &TFE_Py_TapeSetStopOnThread); m.def("TFE_Py_TapeSetStopOnThread", &TFE_Py_TapeSetStopOnThread);
m.def("TFE_Py_TapeSetRestartOnThread", &TFE_Py_TapeSetRestartOnThread); m.def("TFE_Py_TapeSetRestartOnThread", &TFE_Py_TapeSetRestartOnThread);
m.def("TFE_Py_TapeSetIsStopped", m.def("TFE_Py_TapeSetIsStopped",
[]() { return tensorflow::pyo_or_throw(TFE_Py_TapeSetIsStopped()); }); []() { return tensorflow::PyoOrThrow(TFE_Py_TapeSetIsStopped()); });
m.def("TFE_Py_TapeSetIsEmpty", m.def("TFE_Py_TapeSetIsEmpty",
[]() { return tensorflow::pyo_or_throw(TFE_Py_TapeSetIsEmpty()); }); []() { return tensorflow::PyoOrThrow(TFE_Py_TapeSetIsEmpty()); });
m.def("TFE_Py_TapeSetShouldRecordBackprop", [](const py::handle& tensors) { m.def("TFE_Py_TapeSetShouldRecordBackprop", [](const py::handle& tensors) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_TapeSetShouldRecordBackprop(tensors.ptr())); TFE_Py_TapeSetShouldRecordBackprop(tensors.ptr()));
}); });
m.def("TFE_Py_TapeSetPossibleGradientTypes", [](const py::handle& tensors) { m.def("TFE_Py_TapeSetPossibleGradientTypes", [](const py::handle& tensors) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_TapeSetPossibleGradientTypes(tensors.ptr())); TFE_Py_TapeSetPossibleGradientTypes(tensors.ptr()));
}); });
m.def("TFE_Py_TapeSetDeleteTrace", &TFE_Py_TapeSetDeleteTrace); m.def("TFE_Py_TapeSetDeleteTrace", &TFE_Py_TapeSetDeleteTrace);
@ -615,7 +615,7 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
[](const py::handle& op_type, const py::handle& output_tensors, [](const py::handle& op_type, const py::handle& output_tensors,
const py::handle& input_tensors, const py::handle& backward_function, const py::handle& input_tensors, const py::handle& backward_function,
const py::handle& forward_function) { const py::handle& forward_function) {
return tensorflow::pyo_or_throw(TFE_Py_TapeSetRecordOperation( return tensorflow::PyoOrThrow(TFE_Py_TapeSetRecordOperation(
op_type.ptr(), output_tensors.ptr(), input_tensors.ptr(), op_type.ptr(), output_tensors.ptr(), input_tensors.ptr(),
backward_function.ptr(), forward_function.ptr())); backward_function.ptr(), forward_function.ptr()));
}); });
@ -623,16 +623,16 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
"TFE_Py_TapeSetRecordOperationBackprop", "TFE_Py_TapeSetRecordOperationBackprop",
[](const py::handle& op_type, const py::handle& output_tensors, [](const py::handle& op_type, const py::handle& output_tensors,
const py::handle& input_tensors, const py::handle& backward_function) { const py::handle& input_tensors, const py::handle& backward_function) {
return tensorflow::pyo_or_throw(TFE_Py_TapeSetRecordOperationBackprop( return tensorflow::PyoOrThrow(TFE_Py_TapeSetRecordOperationBackprop(
op_type.ptr(), output_tensors.ptr(), input_tensors.ptr(), op_type.ptr(), output_tensors.ptr(), input_tensors.ptr(),
backward_function.ptr())); backward_function.ptr()));
}); });
m.def("TFE_Py_TapeSetRecordOperationForwardprop", m.def(
"TFE_Py_TapeSetRecordOperationForwardprop",
[](const py::handle& op_type, const py::handle& output_tensors, [](const py::handle& op_type, const py::handle& output_tensors,
const py::handle& input_tensors, const py::handle& backward_function, const py::handle& input_tensors, const py::handle& backward_function,
const py::handle& forwardprop_output_indices) { const py::handle& forwardprop_output_indices) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(TFE_Py_TapeSetRecordOperationForwardprop(
TFE_Py_TapeSetRecordOperationForwardprop(
op_type.ptr(), output_tensors.ptr(), input_tensors.ptr(), op_type.ptr(), output_tensors.ptr(), input_tensors.ptr(),
backward_function.ptr(), forwardprop_output_indices.ptr())); backward_function.ptr(), forwardprop_output_indices.ptr()));
}); });
@ -647,7 +647,7 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
tape.ptr(), target.ptr(), sources.ptr(), output_gradients.ptr(), tape.ptr(), target.ptr(), sources.ptr(), output_gradients.ptr(),
sources_raw.ptr(), unconnected_gradients.ptr(), status.get()); sources_raw.ptr(), unconnected_gradients.ptr(), status.get());
tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get()); tensorflow::MaybeRaiseRegisteredFromTFStatus(status.get());
return tensorflow::pyo_or_throw(output); return tensorflow::PyoOrThrow(output);
}); });
m.def("TFE_Py_TapeVariableAccessed", [](const py::handle& variable) { m.def("TFE_Py_TapeVariableAccessed", [](const py::handle& variable) {
@ -662,15 +662,15 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
TFE_Py_TapeWatchVariable(tape.ptr(), variable.ptr()); TFE_Py_TapeWatchVariable(tape.ptr(), variable.ptr());
}); });
m.def("TFE_Py_TapeWatchedVariables", [](const py::handle& tape) { m.def("TFE_Py_TapeWatchedVariables", [](const py::handle& tape) {
return tensorflow::pyo_or_throw(TFE_Py_TapeWatchedVariables(tape.ptr())); return tensorflow::PyoOrThrow(TFE_Py_TapeWatchedVariables(tape.ptr()));
}); });
m.def("TFE_Py_ForwardAccumulatorNew", []() { m.def("TFE_Py_ForwardAccumulatorNew", []() {
return tensorflow::pyo_or_throw(TFE_Py_ForwardAccumulatorNew()); return tensorflow::PyoOrThrow(TFE_Py_ForwardAccumulatorNew());
}); });
m.def("TFE_Py_ForwardAccumulatorSetAdd", [](const py::handle& accumulator) { m.def("TFE_Py_ForwardAccumulatorSetAdd", [](const py::handle& accumulator) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_ForwardAccumulatorSetAdd(accumulator.ptr())); TFE_Py_ForwardAccumulatorSetAdd(accumulator.ptr()));
}); });
m.def("TFE_Py_ForwardAccumulatorSetRemove", m.def("TFE_Py_ForwardAccumulatorSetRemove",
@ -686,17 +686,17 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
}); });
m.def("TFE_Py_ForwardAccumulatorJVP", m.def("TFE_Py_ForwardAccumulatorJVP",
[](const py::handle& accumulator, const py::handle& tensor) { [](const py::handle& accumulator, const py::handle& tensor) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_ForwardAccumulatorJVP(accumulator.ptr(), tensor.ptr())); TFE_Py_ForwardAccumulatorJVP(accumulator.ptr(), tensor.ptr()));
}); });
m.def("TFE_Py_ForwardAccumulatorPushState", []() { m.def("TFE_Py_ForwardAccumulatorPushState", []() {
return tensorflow::pyo_or_throw(TFE_Py_ForwardAccumulatorPushState()); return tensorflow::PyoOrThrow(TFE_Py_ForwardAccumulatorPushState());
}); });
m.def("TFE_Py_ForwardAccumulatorPopState", []() { m.def("TFE_Py_ForwardAccumulatorPopState", []() {
return tensorflow::pyo_or_throw(TFE_Py_ForwardAccumulatorPopState()); return tensorflow::PyoOrThrow(TFE_Py_ForwardAccumulatorPopState());
}); });
m.def("TFE_Py_PackJVPs", [](const py::handle& tensors) { m.def("TFE_Py_PackJVPs", [](const py::handle& tensors) {
return tensorflow::pyo_or_throw(TFE_Py_PackJVPs(tensors.ptr())); return tensorflow::PyoOrThrow(TFE_Py_PackJVPs(tensors.ptr()));
}); });
// TFE_ContextOptions Logic // TFE_ContextOptions Logic
@ -726,30 +726,30 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
// TFE_Py_TensorShape Logic // TFE_Py_TensorShape Logic
m.def("TFE_Py_TensorShapeSlice", m.def("TFE_Py_TensorShapeSlice",
[](const py::handle& tensors, int slice_dim) { [](const py::handle& tensors, int slice_dim) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_TensorShapeSlice(tensors.ptr(), slice_dim)); TFE_Py_TensorShapeSlice(tensors.ptr(), slice_dim));
}); });
m.def("TFE_Py_TensorShapeOnDevice", [](const py::handle& tensors, m.def("TFE_Py_TensorShapeOnDevice", [](const py::handle& tensors,
int slice_dim) { int slice_dim) {
return tensorflow::pyo_or_throw(TFE_Py_TensorShapeOnDevice(tensors.ptr())); return tensorflow::PyoOrThrow(TFE_Py_TensorShapeOnDevice(tensors.ptr()));
}); });
m.def("TFE_Py_EnableInteractivePythonLogging", m.def("TFE_Py_EnableInteractivePythonLogging",
&TFE_Py_EnableInteractivePythonLogging); &TFE_Py_EnableInteractivePythonLogging);
// Additional Context Logic // Additional Context Logic
m.def("TFE_Py_SetEagerContext", [](const py::handle& o) { m.def("TFE_Py_SetEagerContext", [](const py::handle& o) {
return tensorflow::pyo_or_throw(TFE_Py_SetEagerContext(o.ptr())); return tensorflow::PyoOrThrow(TFE_Py_SetEagerContext(o.ptr()));
}); });
m.def("TFE_ContextStartStep", [](py::handle& o) { m.def("TFE_ContextStartStep", [](py::handle& o) {
TFE_ContextStartStep(tensorflow::InputTFE_Context(o.ptr())); TFE_ContextStartStep(tensorflow::InputTFE_Context(o.ptr()));
}); });
m.def("TFE_ContextEndStep", &TFE_ContextEndStep); m.def("TFE_ContextEndStep", &TFE_ContextEndStep);
m.def("TFE_Py_RegisterVSpace", [](const py::handle& o) { m.def("TFE_Py_RegisterVSpace", [](const py::handle& o) {
return tensorflow::pyo_or_throw(TFE_Py_RegisterVSpace(o.ptr())); return tensorflow::PyoOrThrow(TFE_Py_RegisterVSpace(o.ptr()));
}); });
m.def("TFE_Py_EncodeArg", m.def("TFE_Py_EncodeArg",
[](const py::handle& o, bool include_tensor_ranks_only) { [](const py::handle& o, bool include_tensor_ranks_only) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
TFE_Py_EncodeArg(o.ptr(), include_tensor_ranks_only)); TFE_Py_EncodeArg(o.ptr(), include_tensor_ranks_only));
}); });
m.def("TFE_EnableCollectiveOps", [](const py::handle& ctx, py::str proto) { m.def("TFE_EnableCollectiveOps", [](const py::handle& ctx, py::str proto) {

2
tensorflow/python/training/quantize_training_wrapper.cc
View File

@ -41,7 +41,7 @@ static PyObject* DoQuantizeTrainingOnGraphDefHelper(const string& input_graph,
PYBIND11_MODULE(_pywrap_quantize_training, m) { PYBIND11_MODULE(_pywrap_quantize_training, m) {
m.def("DoQuantizeTrainingOnGraphDefHelper", m.def("DoQuantizeTrainingOnGraphDefHelper",
[](const py::object input_graph, int num_bits) { [](const py::object input_graph, int num_bits) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
tensorflow::DoQuantizeTrainingOnGraphDefHelper( tensorflow::DoQuantizeTrainingOnGraphDefHelper(
input_graph.cast<std::string>(), num_bits)); input_graph.cast<std::string>(), num_bits));
}); });

2
tensorflow/python/util/py_checkpoint_reader_wrapper.cc
View File

@ -112,7 +112,7 @@ static py::object CheckpointReader_GetTensor(
tensorflow::MaybeRaiseFromStatus( tensorflow::MaybeRaiseFromStatus(
tensorflow::TensorToNdarray(*tensor, &py_obj)); tensorflow::TensorToNdarray(*tensor, &py_obj));
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
PyArray_Return(reinterpret_cast<PyArrayObject*>(py_obj))); PyArray_Return(reinterpret_cast<PyArrayObject*>(py_obj)));
} }

10
tensorflow/python/util/util_wrapper.cc
View File

@ -27,7 +27,7 @@ PYBIND11_MODULE(_pywrap_utils, m) {
)pbdoc"; )pbdoc";
m.def("RegisterType", m.def("RegisterType",
[](const py::handle& type_name, const py::handle& type) { [](const py::handle& type_name, const py::handle& type) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
tensorflow::swig::RegisterType(type_name.ptr(), type.ptr())); tensorflow::swig::RegisterType(type_name.ptr(), type.ptr()));
}); });
m.def( m.def(
@ -116,7 +116,7 @@ PYBIND11_MODULE(_pywrap_utils, m) {
m.def( m.def(
"IsNamedtuple", "IsNamedtuple",
[](const py::handle& o, bool strict) { [](const py::handle& o, bool strict) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
tensorflow::swig::IsNamedtuple(o.ptr(), strict)); tensorflow::swig::IsNamedtuple(o.ptr(), strict));
}, },
R"pbdoc( R"pbdoc(
@ -197,7 +197,7 @@ PYBIND11_MODULE(_pywrap_utils, m) {
m.def( m.def(
"SameNamedtuples", "SameNamedtuples",
[](const py::handle& o1, const py::handle& o2) { [](const py::handle& o1, const py::handle& o2) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
tensorflow::swig::SameNamedtuples(o1.ptr(), o2.ptr())); tensorflow::swig::SameNamedtuples(o1.ptr(), o2.ptr()));
}, },
R"pbdoc( R"pbdoc(
@ -220,7 +220,7 @@ PYBIND11_MODULE(_pywrap_utils, m) {
m.def( m.def(
"Flatten", "Flatten",
[](const py::handle& o, bool expand_composites) { [](const py::handle& o, bool expand_composites) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
tensorflow::swig::Flatten(o.ptr(), expand_composites)); tensorflow::swig::Flatten(o.ptr(), expand_composites));
}, },
R"pbdoc( R"pbdoc(
@ -280,7 +280,7 @@ PYBIND11_MODULE(_pywrap_utils, m) {
m.def( m.def(
"FlattenForData", "FlattenForData",
[](const py::handle& o) { [](const py::handle& o) {
return tensorflow::pyo_or_throw( return tensorflow::PyoOrThrow(
tensorflow::swig::FlattenForData(o.ptr())); tensorflow::swig::FlattenForData(o.ptr()));
}, },
R"pbdoc( R"pbdoc(