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

Update tfe_wrapper.cc

This commit is contained in:
Jinjing Zhou 2020-07-02 15:35:28 +08:00 committed by GitHub
parent 8cdfc53a63
commit 10ba65efab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/python/tfe_wrapper.cc
View File

@ -1169,13 +1169,9 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
PyCapsule_SetName(pycapsule.ptr(), "used_dltensor"); PyCapsule_SetName(pycapsule.ptr(), "used_dltensor");
PyCapsule_SetDestructor(pycapsule.ptr(), nullptr); PyCapsule_SetDestructor(pycapsule.ptr(), nullptr);
<<<<<<< HEAD
return py::handle(EagerTensorFromHandle(thandle));
=======
PyObject* pyhandle = EagerTensorFromHandle(thandle); PyObject* pyhandle = EagerTensorFromHandle(thandle);
return tensorflow::PyoOrThrow(pyhandle); return tensorflow::PyoOrThrow(pyhandle);
>>>>>>> ce9b1295b5... fix
}); });
m.def("TFE_Py_RegisterCustomDevice", [](const py::handle& context, m.def("TFE_Py_RegisterCustomDevice", [](const py::handle& context,