Skip to content

Commit ab00204

Browse files
committed
Fix memory leak in 2.13 only
1 parent 9c1d43f commit ab00204

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

backends/src/main/scala/ORTModelBackend213.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class ORTModelBackend(onnxBytes: Array[Byte])
9393
session,
9494
inputTensors,
9595
allNodeNamesAndDims._1,
96-
allNodeNamesAndDims._2,
9796
allNodeNamesAndDims._3
9897
)
9998
// val outputPointer = out.get(0).GetTensorMutableDataFloat().capacity(inputs.GetTensorTypeAndShapeInfo().GetElementCount());

backends/src/main/scala/ORTOperatorBackend213.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ trait ORTOperatorBackend extends OpToONNXBytesConverter with AutoCloseable {
3131
def runModel(
3232
sess: Session,
3333
input_tensor_values: Array[Value],
34-
inputNames: PointerPointer[BytePointer],
35-
nodeDims: Array[LongPointer],
34+
inputNames: PointerPointer[BytePointer],
3635
outputNames: PointerPointer[BytePointer]
3736
) = {
3837

@@ -393,8 +392,8 @@ trait ORTOperatorBackend extends OpToONNXBytesConverter with AutoCloseable {
393392
inputs._9.asInstanceOf[Option[Tensor[_]]]
394393
).flatten
395394

396-
val inputDimsAndValues: Array[Tuple2[LongPointer, Value]] =
397-
inputArr.map(x => (new LongPointer(), getTensor(x)))
395+
val inputDimsAndValues: Array[Value] =
396+
inputArr.map(x => getTensor(x))
398397

399398
/*
400399
(0 until 9).map{i =>
@@ -414,9 +413,8 @@ trait ORTOperatorBackend extends OpToONNXBytesConverter with AutoCloseable {
414413
//println(tens._2(0))
415414
val output = runModel(
416415
sess,
417-
inputDimsAndValues.map(_._2),
416+
inputDimsAndValues,
418417
input_node_names,
419-
inputDimsAndValues.map(_._1),
420418
output_node_names
421419
)
422420

core/src/main/scala/OpToONNXBytesConverter213.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.bytedeco.javacpp.BytePointer
1212

1313
trait OpToONNXBytesConverter extends AutoCloseable {
1414

15-
private val scope = new PointerScope()
15+
// private val scope = new PointerScope()
1616

1717
protected def opToNode[
1818
T: ClassTag,
@@ -35,7 +35,7 @@ trait OpToONNXBytesConverter extends AutoCloseable {
3535
// implicit evT: (UNil TypeOr Float16 TypeOr Float TypeOr Double TypeOr UByte TypeOr UShort TypeOr UInt TypeOr ULong TypeOr Byte TypeOr Short TypeOr Int TypeOr Long TypeOr Float16 TypeOr Float TypeOr Double TypeOr String TypeOr Boolean TypeOr Complex[
3636
// Float] TypeOr Complex[Double])#check[T])
3737
: NodeProto = {
38-
val node = (new NodeProto).New()
38+
val node = new NodeProto
3939

4040
node.set_name(name)
4141
node.set_op_type(opName)
@@ -256,7 +256,7 @@ trait OpToONNXBytesConverter extends AutoCloseable {
256256
}
257257

258258
override def close(): Unit = {
259-
scope.close
259+
// scope.close
260260
}
261261

262262
}

0 commit comments

Comments
 (0)