Skip to content

Don't dealloc strings if the TensorBuffer is shared (#357) #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2021
Merged

Don't dealloc strings if the TensorBuffer is shared (#357) #358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4d12ce
Don't dealloc strings if the TensorBuffer is shared (#357)
brychcy Jul 30, 2021
829fda7
run mvn spotless:apply
brychcy Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 89 additions & 71 deletions ...re/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/AbstractTF_Tensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
Copyright 2019 The TensorFlow Authors. All Rights Reserved.
Copyright 2019 The TensorFlow Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
=======================================================================
*/
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
=======================================================================
*/

package org.tensorflow.internal.c_api;

Expand All @@ -25,83 +25,101 @@
import static org.tensorflow.internal.c_api.global.tensorflow.TF_TString_Init;
import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorData;
import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorElementCount;
import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorMaybeMove;
import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorType;

import org.bytedeco.javacpp.Pointer;
import org.bytedeco.javacpp.annotation.Properties;

@Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class)
public abstract class AbstractTF_Tensor extends Pointer {
protected static class DeleteDeallocator extends TF_Tensor implements Pointer.Deallocator {
DeleteDeallocator(TF_Tensor s) { super(s); }
@Override public void deallocate() {
if (!isNull()) {
if (TF_TensorType(this) == TF_STRING) {
// we need to deallocate the strings themselves before deallocating the tensor memory
long n = TF_TensorElementCount(this);
TF_TString data = new TF_TString(TF_TensorData(this));
for (int i = 0; i < n; i++) {
TF_TString_Dealloc(data.position(i));
}
}
TF_DeleteTensor(this);
protected static class DeleteDeallocator extends TF_Tensor implements Pointer.Deallocator {
DeleteDeallocator(TF_Tensor s) {
super(s);
}

@Override
public void deallocate() {
if (!isNull()) {
if (TF_TensorType(this) == TF_STRING) {
TF_Tensor moved = TF_TensorMaybeMove(this);
if (moved != null) {
// we need to deallocate the strings themselves before deallocating the tensor memory
long n = TF_TensorElementCount(moved);
TF_TString data = new TF_TString(TF_TensorData(moved));
for (int i = 0; i < n; i++) {
TF_TString_Dealloc(data.position(i));
}
setNull();
TF_DeleteTensor(moved);
} else {
// TensorBuffer is shared, leave contained strings alone.
TF_DeleteTensor(this);
}
} else {
TF_DeleteTensor(this);
}
}
setNull();
}
}

/** TensorFlow crashes if we don't pass it a deallocator, so... */
protected static Deallocator_Pointer_long_Pointer dummyDeallocator = new Deallocator_Pointer_long_Pointer() {
@Override public void call(Pointer data, long len, Pointer arg) { }
}.retainReference();
/** TensorFlow crashes if we don't pass it a deallocator, so... */
protected static Deallocator_Pointer_long_Pointer dummyDeallocator =
new Deallocator_Pointer_long_Pointer() {
@Override
public void call(Pointer data, long len, Pointer arg) {}
}.retainReference();

/** A reference to prevent deallocation. */
protected Pointer pointer;
/** A reference to prevent deallocation. */
protected Pointer pointer;

public AbstractTF_Tensor(Pointer p) { super(p); }
public AbstractTF_Tensor(Pointer p) {
super(p);
}

/**
* Calls TF_NewTensor(), and registers a deallocator.
* @return TF_Tensor created. Do not call TF_DeleteTensor() on it.
*/
public static TF_Tensor newTensor(int dtype, long[] dims, Pointer data) {
TF_Tensor t = TF_NewTensor(dtype, dims, dims.length, data, data.limit(), dummyDeallocator, null);
if (t != null) {
t.pointer = data;
t.deallocator(new DeleteDeallocator(t));
}
return t;
/**
* Calls TF_NewTensor(), and registers a deallocator.
*
* @return TF_Tensor created. Do not call TF_DeleteTensor() on it.
*/
public static TF_Tensor newTensor(int dtype, long[] dims, Pointer data) {
TF_Tensor t =
TF_NewTensor(dtype, dims, dims.length, data, data.limit(), dummyDeallocator, null);
if (t != null) {
t.pointer = data;
t.deallocator(new DeleteDeallocator(t));
}
return t;
}

/**
* Calls TF_AllocateTensor(), and registers a deallocator.
* @return TF_Tensor created. Do not call TF_DeleteTensor() on it.
*/
public static TF_Tensor allocateTensor(int dtype, long[] dims, long length) {
TF_Tensor t = TF_AllocateTensor(dtype, dims, dims.length, length);
if (t != null) {
if (TF_TensorType(t) == TF_STRING) {
// we need to initialize the strings themselves after allocating the tensor memory
long n = TF_TensorElementCount(t);
TF_TString data = new TF_TString(TF_TensorData(t));
for (int i = 0; i < n; i++) {
TF_TString_Init(data.position(i));
}
}
t.deallocator(new DeleteDeallocator(t));
/**
* Calls TF_AllocateTensor(), and registers a deallocator.
*
* @return TF_Tensor created. Do not call TF_DeleteTensor() on it.
*/
public static TF_Tensor allocateTensor(int dtype, long[] dims, long length) {
TF_Tensor t = TF_AllocateTensor(dtype, dims, dims.length, length);
if (t != null) {
if (TF_TensorType(t) == TF_STRING) {
// we need to initialize the strings themselves after allocating the tensor memory
long n = TF_TensorElementCount(t);
TF_TString data = new TF_TString(TF_TensorData(t));
for (int i = 0; i < n; i++) {
TF_TString_Init(data.position(i));
}
return t;
}
t.deallocator(new DeleteDeallocator(t));
}
return t;
}

/** Registers a deallocator and returns this. */
public TF_Tensor withDeallocator() {
return (TF_Tensor)this.deallocator(new DeleteDeallocator((TF_Tensor)this));
}
/** Registers a deallocator and returns this. */
public TF_Tensor withDeallocator() {
return (TF_Tensor) this.deallocator(new DeleteDeallocator((TF_Tensor) this));
}

/**
* Calls the deallocator, if registered, otherwise has no effect.
*/
public void delete() {
deallocate();
}
/** Calls the deallocator, if registered, otherwise has no effect. */
public void delete() {
deallocate();
}
}