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

Fix TensorInterface memory leak

Browse Source 
TensorInterface was incorrectly being allocated on the heap during
tensor creation.

PiperOrigin-RevId: 304738402
Change-Id: Ieff39a948b169cdc060f40d15db673175437759d
This commit is contained in:
Gaurav Jain 2020-04-03 19:51:12 -07:00 committed by TensorFlower Gardener
parent 56199e9c9b
commit 4566db3d97
2 changed files with 8 additions and 9 deletions
tensorflow/python
debug
BUILD
lib/core
py_seq_tensor.cc

1
tensorflow/python/debug/BUILD
View File

@ -1485,6 +1485,5 @@ sh_test(
],
tags = [
"no_windows",
"noasan", # TODO(b/153204233) Re-enable after fixing memory leak.
],
)

16
tensorflow/python/lib/core/py_seq_tensor.cc
View File

@ -680,8 +680,8 @@ typedef Converter<bool> BoolConverter;
// The two may share underlying storage so changes to one may reflect in the
// other.
TFE_TensorHandle* NumpyToTFE_TensorHandle(TFE_Context* ctx, PyObject* obj) {
tensorflow::Tensor t;
tensorflow::Status status = tensorflow::NdarrayToTensor(obj, &t);
tensorflow::Tensor tensor;
tensorflow::Status status = tensorflow::NdarrayToTensor(obj, &tensor);
if (!status.ok()) {
PyErr_SetString(PyExc_ValueError,
tensorflow::strings::StrCat(
@ -691,8 +691,8 @@ TFE_TensorHandle* NumpyToTFE_TensorHandle(TFE_Context* ctx, PyObject* obj) {
return nullptr;
}
return new TFE_TensorHandle{
ctx->context->CreateLocalHandle(new TensorInterface(std::move(t)))};
TensorInterface t(std::move(tensor));
return new TFE_TensorHandle{ctx->context->CreateLocalHandle(&t)};
}
} // namespace
@ -874,10 +874,10 @@ TFE_TensorHandle* PySeqToTFE_TensorHandle(TFE_Context* ctx, PyObject* obj,
case DT_INVALID: // Only occurs for empty tensors.
{
Tensor t(requested_dtype == DT_INVALID ? DT_FLOAT : requested_dtype,
TensorShape(state.inferred_shape));
return new TFE_TensorHandle{
ctx->context->CreateLocalHandle(new TensorInterface(std::move(t)))};
Tensor tensor(requested_dtype == DT_INVALID ? DT_FLOAT : requested_dtype,
TensorShape(state.inferred_shape));
TensorInterface t(std::move(tensor));
return new TFE_TensorHandle{ctx->context->CreateLocalHandle(&t)};
}
default: