FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Change to use tensor as underlying data structure. · feelsyt/TensorFlow.NET@39883ae · GitHub

/ TensorFlow.NET Public
forked from SciSharp/TensorFlow.NET

Commit 39883ae

Browse files
Oceania2018
committed
Change to use tensor as underlying data structure.
1 parent 71488b4 commit 39883ae

9 files changed

Lines changed: 50 additions & 46 deletions

File tree

‎src/TensorFlowNET.Core/Eager/EagerTensor.Creation.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public partial class EagerTensor
1010
public EagerTensor(SafeTensorHandleHandle handle)
1111
{
1212
_id = ops.uid();
13-
EagerTensorHandle = handle;
13+
_eagerTensorHandle = handle;
1414
Resolve();
1515
}
1616

@@ -59,20 +59,14 @@ public EagerTensor(byte[] bytes, TF_DataType dtype) : base(bytes, dtype)
5959
void NewEagerTensorHandle(IntPtr h)
6060
{
6161
_id = ops.uid();
62-
EagerTensorHandle = c_api.TFE_NewTensorHandle(h, tf.Status.Handle);
62+
_eagerTensorHandle = c_api.TFE_NewTensorHandle(h, tf.Status.Handle);
6363
tf.Status.Check(true);
64-
#if TRACK_TENSOR_LIFE
65-
print($"New EagerTensorHandle {EagerTensorHandle} {Id} From 0x{h.ToString("x16")}");
66-
#endif
6764
}
6865

6966
private void Resolve()
7067
{
71-
_handle = c_api.TFE_TensorHandleResolve(EagerTensorHandle, tf.Status.Handle);
68+
_handle = c_api.TFE_TensorHandleResolve(_eagerTensorHandle, tf.Status.Handle);
7269
tf.Status.Check(true);
73-
#if TRACK_TENSOR_LIFE
74-
print($"Take EagerTensorHandle {EagerTensorHandle} {Id} Resolving 0x{_handle.ToString("x16")}");
75-
#endif
7670
}
7771

7872
/// <summary>
@@ -104,7 +98,7 @@ void copy_handle_data(Tensor target_t)
10498
protected override void DisposeUnmanagedResources(IntPtr handle)
10599
{
106100
base.DisposeUnmanagedResources(handle);
107-
EagerTensorHandle.Dispose();
101+
_eagerTensorHandle.Dispose();
108102
}
109103
}
110104
}

‎src/TensorFlowNET.Core/Numpy/NDArray.Creation.cs‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,62 @@ public static NDArray Scalar<T>(T value) where T : unmanaged
2525
bool val => new NDArray(val),
2626
byte val => new NDArray(val),
2727
int val => new NDArray(val),
28+
long val => new NDArray(val),
2829
float val => new NDArray(val),
2930
double val => new NDArray(val),
3031
_ => throw new NotImplementedException("")
3132
};
3233

3334
void Init<T>(T value) where T : unmanaged
3435
{
35-
_tensor = new EagerTensor(value);
36+
_tensor = value switch
37+
{
38+
bool val => new Tensor(val),
39+
byte val => new Tensor(val),
40+
int val => new Tensor(val),
41+
long val => new Tensor(val),
42+
float val => new Tensor(val),
43+
double val => new Tensor(val),
44+
_ => throw new NotImplementedException("")
45+
};
3646
_tensor.SetReferencedByNDArray();
47+
48+
var _handle = c_api.TFE_NewTensorHandle(_tensor, tf.Status.Handle);
49+
_tensor.SetEagerTensorHandle(_handle);
3750
}
3851

3952
void Init(Array value, Shape? shape = null)
4053
{
41-
_tensor = new EagerTensor(value, shape ?? value.GetShape());
54+
_tensor = new Tensor(value, shape ?? value.GetShape());
4255
_tensor.SetReferencedByNDArray();
56+
57+
var _handle = c_api.TFE_NewTensorHandle(_tensor, tf.Status.Handle);
58+
_tensor.SetEagerTensorHandle(_handle);
4359
}
4460

4561
void Init(Shape shape, TF_DataType dtype = TF_DataType.TF_DOUBLE)
4662
{
47-
_tensor = new EagerTensor(shape, dtype: dtype);
63+
_tensor = new Tensor(shape, dtype: dtype);
4864
_tensor.SetReferencedByNDArray();
65+
66+
var _handle = c_api.TFE_NewTensorHandle(_tensor, tf.Status.Handle);
67+
_tensor.SetEagerTensorHandle(_handle);
4968
}
5069

5170
void Init(Tensor value, Shape? shape = null)
5271
{
5372
if (shape is not null)
54-
_tensor = tf.reshape(value, shape);
73+
_tensor = new Tensor(value.TensorDataPointer, shape, value.dtype);
5574
else
5675
_tensor = value;
5776

5877
if (_tensor.TensorDataPointer == IntPtr.Zero)
5978
_tensor = tf.get_default_session().eval(_tensor);
6079

6180
_tensor.SetReferencedByNDArray();
81+
82+
var _handle = c_api.TFE_NewTensorHandle(_tensor, tf.Status.Handle);
83+
_tensor.SetEagerTensorHandle(_handle);
6284
}
6385
}
6486
}

‎src/TensorFlowNET.Core/Numpy/NDArray.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Tensorflow.NumPy
88
{
9-
public partial class NDArray
9+
public partial class NDArray : DisposableObject
1010
{
1111
Tensor _tensor;
1212
public TF_DataType dtype => _tensor.dtype;
@@ -58,5 +58,11 @@ public override string ToString()
5858
{
5959
return tensor_util.to_numpy_string(_tensor);
6060
}
61+
62+
protected override void DisposeUnmanagedResources(IntPtr handle)
63+
{
64+
_tensor.EagerTensorHandle.Dispose();
65+
_tensor.Dispose();
66+
}
6167
}
6268
}

‎src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ public Tensor(IntPtr handle)
5353
/// <param name="data_ptr">Pointer to unmanaged, fixed or pinned memory which the caller owns</param>
5454
/// <param name="shape">Tensor shape</param>
5555
/// <param name="dType">TF data type</param>
56-
/// <param name="num_bytes">Size of the tensor in memory</param>
57-
public Tensor(IntPtr data_ptr, long[] shape, TF_DataType dType, int num_bytes)
56+
public unsafe Tensor(IntPtr data_ptr, Shape shape, TF_DataType dtype)
5857
{
59-
_handle = TF_NewTensor(dType, dims: shape, num_dims: shape.Length, data: data_ptr, len: (ulong)num_bytes);
58+
_handle = TF_NewTensor(shape, dtype, data: data_ptr.ToPointer());
6059
isCreatedInGraphMode = !tf.executing_eagerly();
6160
}
6261

‎src/TensorFlowNET.Core/Tensors/Tensor.cs‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ public partial class Tensor : DisposableObject,
8989
/// </summary>
9090
public object Tag { get; set; }
9191

92+
protected SafeTensorHandleHandle _eagerTensorHandle;
9293
/// <summary>
9394
/// TFE_TensorHandle
9495
/// </summary>
95-
public SafeTensorHandleHandle EagerTensorHandle { get; set; }
96+
public SafeTensorHandleHandle EagerTensorHandle => _eagerTensorHandle;
9697

9798
protected bool isReferencedByNDArray;
9899
public bool IsReferencedByNDArray => isReferencedByNDArray;
@@ -212,6 +213,7 @@ public TF_Output _as_tf_output()
212213
}
213214

214215
public void SetReferencedByNDArray() => isReferencedByNDArray = true;
216+
public void SetEagerTensorHandle(SafeTensorHandleHandle handle) => _eagerTensorHandle = handle;
215217

216218
public Tensor MaybeMove()
217219
{
@@ -254,30 +256,16 @@ public override string ToString()
254256
}
255257
}
256258

257-
/// <summary>
258-
/// Dispose any managed resources.
259-
/// </summary>
260-
/// <remarks>Equivalent to what you would perform inside <see cref="DisposableObject.Dispose"/></remarks>
261-
protected override void DisposeManagedResources()
262-
{
263-
264-
}
265-
266259
[SuppressMessage("ReSharper", "ConvertIfStatementToSwitchStatement")]
267260
protected override void DisposeUnmanagedResources(IntPtr handle)
268261
{
269-
#if TRACK_TENSOR_LIFE
270-
print($"Delete Tensor 0x{handle.ToString("x16")} {AllocationType} Data: 0x{TensorDataPointer.ToString("x16")}");
271-
#endif
272262
if (dtype == TF_DataType.TF_STRING)
273263
{
274264
long size = 1;
275265
foreach (var s in TensorShape.dims)
276266
size *= s;
277267
var tstr = TensorDataPointer;
278-
#if TRACK_TENSOR_LIFE
279-
print($"Delete TString 0x{handle.ToString("x16")} {AllocationType} Data: 0x{tstr.ToString("x16")}");
280-
#endif
268+
281269
for (int i = 0; i < size; i++)
282270
{
283271
c_api.TF_StringDealloc(tstr);

‎src/TensorFlowNET.Core/Tensors/c_api.tensor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public partial class c_api
101101
[MethodImpl(MethodImplOptions.AggressiveInlining)]
102102
public static unsafe IntPtr TF_NewTensor(TF_DataType dataType, long[] dims, int num_dims, IntPtr data, ulong len)
103103
{
104-
return c_api.TF_NewTensor(dataType, dims, num_dims, data, len, EmptyDeallocator, DeallocatorArgs.Empty);
104+
return TF_NewTensor(dataType, dims, num_dims, data, len, EmptyDeallocator, DeallocatorArgs.Empty);
105105
}
106106

107107
public static unsafe IntPtr TF_NewTensor(Shape shape, TF_DataType dtype, void* data)

‎src/TensorFlowNET.Core/Tensors/constant_op.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static Tensor _constant_impl(object value,
101101
return op.outputs[0];
102102
}
103103

104-
private static Tensor _eager_reshape(EagerTensor tensor, int[] shape, Context ctx)
104+
private static Tensor _eager_reshape(Tensor tensor, int[] shape, Context ctx)
105105
{
106106
var attr_t = tensor.dtype.as_datatype_enum();
107107
var dims_t = convert_to_eager_tensor(shape, ctx, dtypes.int32);
@@ -111,7 +111,7 @@ private static Tensor _eager_reshape(EagerTensor tensor, int[] shape, Context ct
111111
return result[0];
112112
}
113113

114-
private static Tensor _eager_fill(int[] dims, EagerTensor value, Context ctx)
114+
private static Tensor _eager_fill(int[] dims, Tensor value, Context ctx)
115115
{
116116
var attr_t = value.dtype.as_datatype_enum();
117117
var dims_t = convert_to_eager_tensor(dims, ctx, dtypes.int32);
@@ -121,7 +121,7 @@ private static Tensor _eager_fill(int[] dims, EagerTensor value, Context ctx)
121121
return result[0];
122122
}
123123

124-
private static EagerTensor convert_to_eager_tensor(object value, Context ctx, TF_DataType dtype = TF_DataType.DtInvalid)
124+
private static Tensor convert_to_eager_tensor(object value, Context ctx, TF_DataType dtype = TF_DataType.DtInvalid)
125125
{
126126
ctx.ensure_initialized();
127127
// convert data type
@@ -161,7 +161,7 @@ value is NDArray nd &&
161161
case EagerTensor val:
162162
return val;
163163
case NDArray val:
164-
return (EagerTensor)val;
164+
return val;
165165
case Shape val:
166166
return new EagerTensor(val.dims, new Shape(val.ndim));
167167
case TensorShape val:

‎test/TensorFlowNET.Native.UnitTest/Tensors/TensorTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public unsafe void TensorFromFixed()
1818
var span = new Span<float>(array, 100, 500);
1919
fixed (float* ptr = &MemoryMarshal.GetReference(span))
2020
{
21-
using (var t = new Tensor((IntPtr)ptr, new long[] { span.Length }, tf.float32, 4 * span.Length))
21+
using (var t = new Tensor((IntPtr)ptr, new long[] { span.Length }, tf.float32))
2222
{
2323
Assert.IsFalse(t.IsDisposed);
2424
Assert.AreEqual(2000, (int)t.bytesize);
@@ -27,7 +27,7 @@ public unsafe void TensorFromFixed()
2727

2828
fixed (float* ptr = &array[0])
2929
{
30-
using (var t = new Tensor((IntPtr)ptr, new long[] { array.Length }, tf.float32, 4 * array.Length))
30+
using (var t = new Tensor((IntPtr)ptr, new long[] { array.Length }, tf.float32))
3131
{
3232
Assert.IsFalse(t.IsDisposed);
3333
Assert.AreEqual(4000, (int)t.bytesize);

‎test/TensorFlowNET.UnitTest/EagerModeTestBase.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ public void TestInit()
1414
tf.Context.ensure_initialized();
1515
}
1616

17-
[TestCleanup]
18-
public void TestClean()
19-
{
20-
}
21-
2217
public bool Equal(float[] f1, float[] f2)
2318
{
2419
bool ret = false;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL