Skip to content

Commit fa37f07

Browse files
Oceania2018Oceania2018
committed
override dtype and shape
1 parent a0cc473 commit fa37f07

15 files changed

Lines changed: 83 additions & 76 deletions

‎src/TensorFlowNET.Core/Device/c_api.device.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public partial class c_api
6767
/// <param name="status">TF_Status*</param>
6868
/// <returns>TFE_TensorHandle*</returns>
6969
[DllImport(TensorFlowLibName)]
70-
public static extern SafeTensorHandleHandle TFE_TensorHandleCopyToDevice(SafeTensorHandleHandle h, SafeContextHandle ctx, string device_name, SafeStatusHandle status);
70+
public static extern SafeEagerTensorHandle TFE_TensorHandleCopyToDevice(SafeEagerTensorHandle h, SafeContextHandle ctx, string device_name, SafeStatusHandle status);
7171

7272
/// <summary>
7373
/// Retrieves the full name of the device (e.g. /job:worker/replica:0/...)

‎src/TensorFlowNET.Core/Eager/EagerRunner.TFE_Execute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Tensor[] TFE_ExecuteCancelable(Context ctx,
4848
{
4949
for (int i = 0; i < inputs.Length; ++i)
5050
{
51-
SafeTensorHandleHandle tensor_handle = inputs[i] switch
51+
SafeEagerTensorHandle tensor_handle = inputs[i] switch
5252
{
5353
EagerTensor et => et.EagerTensorHandle,
5454
Tensor nd => nd.EagerTensorHandle,
@@ -61,7 +61,7 @@ public Tensor[] TFE_ExecuteCancelable(Context ctx,
6161
if (status.ok() && attrs != null)
6262
SetOpAttrs(op, attrs);
6363

64-
var outputs = new SafeTensorHandleHandle[num_outputs];
64+
var outputs = new SafeEagerTensorHandle[num_outputs];
6565
if (status.ok())
6666
{
6767
c_api.TFE_Execute(op, outputs, out num_outputs, status.Handle);

‎src/TensorFlowNET.Core/Eager/EagerRunner.TFE_FastPathExecute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public Tensor[] TFE_FastPathExecute(FastPathOpExecInfo op_exec_info)
141141
num_retvals += (int)delta;
142142
}
143143

144-
var retVals = new SafeTensorHandleHandle[num_retvals];
144+
var retVals = new SafeEagerTensorHandle[num_retvals];
145145
c_api.TFE_Execute(op, retVals, out num_retvals, status.Handle);
146146
status.Check(true);
147147

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public EagerTensor(SafeTensorHandle handle)
1212
NewEagerTensorHandle(handle);
1313
}
1414

15-
public EagerTensor(SafeTensorHandleHandle handle)
15+
public EagerTensor(SafeEagerTensorHandle handle)
1616
{
1717
_id = ops.uid();
1818
_eagerTensorHandle = handle;

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@ namespace Tensorflow.Eager
66
{
77
public partial class EagerTensor : Tensor
88
{
9-
public override string Device
10-
{
11-
get
12-
{
13-
using var _ = EagerTensorHandle.Lease();
14-
return c_api.StringPiece(c_api.TFE_TensorHandleDeviceName(EagerTensorHandle, tf.Status.Handle));
15-
}
16-
}
9+
public override string Device => c_api.StringPiece(c_api.TFE_TensorHandleDeviceName(_eagerTensorHandle, tf.Status.Handle));
10+
public override TF_DataType dtype => c_api.TFE_TensorHandleDataType(_eagerTensorHandle);
1711

1812
public override int rank => c_api.TFE_TensorHandleNumDims(EagerTensorHandle, tf.Status.Handle);
1913

14+
protected override Shape GetShapeInternal()
15+
{
16+
var dims = new int[c_api.TFE_TensorHandleNumDims(_eagerTensorHandle, tf.Status.Handle)];
17+
for (int i = 0; i < dims.Length; i++)
18+
dims[i] = c_api.TFE_TensorHandleDim(_eagerTensorHandle, i, tf.Status.Handle);
19+
return dims;
20+
}
21+
2022
public static int GetRank(IntPtr handle)
2123
{
2224
var tfe_tensor_handle = c_api.TFE_EagerTensorHandle(handle);

src/TensorFlowNET.Core/Eager/SafeTensorHandleHandle.cs renamed to src/TensorFlowNET.Core/Eager/SafeEagerTensorHandle.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ limitations under the License.
2020

2121
namespace Tensorflow.Eager
2222
{
23-
public sealed class SafeTensorHandleHandle : SafeTensorflowHandle
23+
public sealed class SafeEagerTensorHandle : SafeTensorflowHandle
2424
{
25-
private SafeTensorHandleHandle()
25+
private SafeEagerTensorHandle()
2626
{
2727
}
2828

29-
public SafeTensorHandleHandle(IntPtr handle)
29+
public SafeEagerTensorHandle(IntPtr handle)
3030
: base(handle)
3131
{
3232
}

‎src/TensorFlowNET.Core/Eager/c_api.eager.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public partial class c_api
9494
/// <param name="status">TF_Status*</param>
9595
/// <returns></returns>
9696
[DllImport(TensorFlowLibName)]
97-
public static extern int TFE_OpAddInputList(SafeEagerOpHandle op, [In, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(SafeHandleArrayMarshaler))] SafeTensorHandleHandle[] inputs, int num_inputs, SafeStatusHandle status);
97+
public static extern int TFE_OpAddInputList(SafeEagerOpHandle op, [In, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(SafeHandleArrayMarshaler))] SafeEagerTensorHandle[] inputs, int num_inputs, SafeStatusHandle status);
9898

9999
/// <summary>
100100
///
@@ -161,7 +161,7 @@ public partial class c_api
161161
/// <param name="retvals"></param>
162162
/// <param name="num_retvals"></param>
163163
/// <param name="status"></param>
164-
public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] retvals, out int num_retvals, SafeStatusHandle status)
164+
public static void TFE_Execute(SafeEagerOpHandle op, SafeEagerTensorHandle[] retvals, out int num_retvals, SafeStatusHandle status)
165165
{
166166
unsafe
167167
{
@@ -173,7 +173,7 @@ public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] re
173173
// A handle is created for every return, even if rawReturns[i] is null. The resulting handle will be
174174
// non-null but invalid, which is the same behavior P/Invoke gives for non-array SafeHandle return
175175
// values.
176-
retvals[i] = new SafeTensorHandleHandle(rawReturns[i]);
176+
retvals[i] = new SafeEagerTensorHandle(rawReturns[i]);
177177
}
178178
}
179179
}
@@ -295,18 +295,18 @@ public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] re
295295
/// <param name="h">TFE_TensorHandle*</param>
296296
/// <param name="status">TF_Status*</param>
297297
[DllImport(TensorFlowLibName)]
298-
public static extern void TFE_OpAddInput(SafeEagerOpHandle op, SafeTensorHandleHandle h, SafeStatusHandle status);
298+
public static extern void TFE_OpAddInput(SafeEagerOpHandle op, SafeEagerTensorHandle h, SafeStatusHandle status);
299299

300300
/// <summary>
301301
///
302302
/// </summary>
303303
/// <param name="t">const tensorflow::Tensor&amp;</param>
304304
/// <returns>TFE_TensorHandle*</returns>
305305
[DllImport(TensorFlowLibName)]
306-
public static extern SafeTensorHandleHandle TFE_NewTensorHandle(SafeTensorHandle t, SafeStatusHandle status);
306+
public static extern SafeEagerTensorHandle TFE_NewTensorHandle(SafeTensorHandle t, SafeStatusHandle status);
307307

308308
[DllImport(TensorFlowLibName)]
309-
public static extern SafeTensorHandleHandle TFE_EagerTensorHandle(IntPtr t);
309+
public static extern SafeEagerTensorHandle TFE_EagerTensorHandle(IntPtr t);
310310

311311
/// <summary>
312312
/// Sets the default execution mode (sync/async). Note that this can be
@@ -323,7 +323,7 @@ public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] re
323323
/// <param name="h">TFE_TensorHandle*</param>
324324
/// <returns></returns>
325325
[DllImport(TensorFlowLibName)]
326-
public static extern TF_DataType TFE_TensorHandleDataType(SafeTensorHandleHandle h);
326+
public static extern TF_DataType TFE_TensorHandleDataType(SafeEagerTensorHandle h);
327327

328328
/// <summary>
329329
/// This function will block till the operation that produces `h` has
@@ -334,7 +334,7 @@ public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] re
334334
/// <param name="status">TF_Status*</param>
335335
/// <returns></returns>
336336
[DllImport(TensorFlowLibName)]
337-
public static extern SafeTensorHandle TFE_TensorHandleResolve(SafeTensorHandleHandle h, SafeStatusHandle status);
337+
public static extern SafeTensorHandle TFE_TensorHandleResolve(SafeEagerTensorHandle h, SafeStatusHandle status);
338338

339339

340340
/// <summary>
@@ -344,10 +344,10 @@ public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] re
344344
/// <param name="status">TF_Status*</param>
345345
/// <returns></returns>
346346
[DllImport(TensorFlowLibName)]
347-
public static extern int TFE_TensorHandleNumDims(SafeTensorHandleHandle h, SafeStatusHandle status);
347+
public static extern int TFE_TensorHandleNumDims(SafeEagerTensorHandle h, SafeStatusHandle status);
348348

349349
[DllImport(TensorFlowLibName)]
350-
public static extern int TFE_TensorHandleDim(SafeTensorHandleHandle h, int dim, SafeStatusHandle status);
350+
public static extern int TFE_TensorHandleDim(SafeEagerTensorHandle h, int dim, SafeStatusHandle status);
351351

352352
/// <summary>
353353
/// Returns the device of the operation that produced `h`. If `h` was produced by
@@ -360,7 +360,7 @@ public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] re
360360
/// <param name="status">TF_Status*</param>
361361
/// <returns></returns>
362362
[DllImport(TensorFlowLibName)]
363-
public static extern IntPtr TFE_TensorHandleDeviceName(SafeTensorHandleHandle h, SafeStatusHandle status);
363+
public static extern IntPtr TFE_TensorHandleDeviceName(SafeEagerTensorHandle h, SafeStatusHandle status);
364364

365365
/// <summary>
366366
/// Returns the name of the device in whose memory `h` resides.
@@ -369,7 +369,7 @@ public static void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] re
369369
/// <param name="status">TF_Status*</param>
370370
/// <returns></returns>
371371
[DllImport(TensorFlowLibName)]
372-
public static extern IntPtr TFE_TensorHandleBackingDeviceName(SafeTensorHandleHandle h, SafeStatusHandle status);
372+
public static extern IntPtr TFE_TensorHandleBackingDeviceName(SafeEagerTensorHandle h, SafeStatusHandle status);
373373

374374
/// <summary>
375375
///

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

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public partial class Tensor : DisposableObject,
6767
/// <summary>
6868
/// The DType of elements in this tensor.
6969
/// </summary>
70-
public TF_DataType dtype => _handle == null ? _override_dtype : c_api.TF_TensorType(_handle);
70+
public virtual TF_DataType dtype => _handle == null ? _override_dtype : c_api.TF_TensorType(_handle);
7171
public ulong bytesize => _handle == null ? 0 : c_api.TF_TensorByteSize(_handle);
72-
public ulong dtypesize => _handle == null ? 0 : c_api.TF_DataTypeSize(dtype);
72+
public ulong dtypesize => (ulong)dtype.get_datatype_size();
7373
public ulong size => _handle == null ? 0 : bytesize / dtypesize;
7474
public IntPtr buffer => _handle == null ? IntPtr.Zero : c_api.TF_TensorData(_handle);
7575
public int num_consumers(TF_Output oper_out) => _handle == null ? 0 : c_api.TF_OperationOutputNumConsumers(oper_out);
@@ -88,11 +88,11 @@ public partial class Tensor : DisposableObject,
8888
protected new SafeTensorHandle _handle;
8989
public SafeTensorHandle Handle => _handle;
9090

91-
protected SafeTensorHandleHandle _eagerTensorHandle;
91+
protected SafeEagerTensorHandle _eagerTensorHandle;
9292
/// <summary>
9393
/// TFE_TensorHandle
9494
/// </summary>
95-
public SafeTensorHandleHandle EagerTensorHandle => _eagerTensorHandle;
95+
public SafeEagerTensorHandle EagerTensorHandle => _eagerTensorHandle;
9696

9797
protected bool _isCreatedInGraphMode;
9898

@@ -109,19 +109,7 @@ public Shape shape
109109
if (rank < 0)
110110
return Shape.Null;
111111

112-
var dims = new Shape(new long[rank]);
113-
114-
if (_handle == null)
115-
{
116-
c_api.TF_GraphGetTensorShape(op.graph, _as_tf_output(), dims, rank, tf.Status.Handle);
117-
}
118-
else
119-
{
120-
for (int i = 0; i < rank; i++)
121-
dims[i] = c_api.TF_Dim(_handle, i);
122-
}
123-
124-
return dims;
112+
return GetShapeInternal();
125113
}
126114

127115
set
@@ -142,6 +130,23 @@ public Shape shape
142130
}
143131
}
144132

133+
protected virtual Shape GetShapeInternal()
134+
{
135+
var dims = new Shape(new long[rank]);
136+
137+
if (_handle == null)
138+
{
139+
c_api.TF_GraphGetTensorShape(op.graph, _as_tf_output(), dims, rank, tf.Status.Handle);
140+
}
141+
else
142+
{
143+
for (int i = 0; i < rank; i++)
144+
dims[i] = c_api.TF_Dim(_handle, i);
145+
}
146+
147+
return dims;
148+
}
149+
145150
public int[] _shape_tuple()
146151
{
147152
return rank < 0 ? null : shape.dims.Select(x => (int)x).ToArray();

‎test/TensorFlowNET.Native.UnitTest/CApiTest.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ protected void TF_SetAttrType(OperationDescription desc, string attrName, TF_Dat
5656
protected void TF_SetAttrBool(OperationDescription desc, string attrName, bool value)
5757
=> c_api.TF_SetAttrBool(desc, attrName, value);
5858

59-
protected TF_DataType TFE_TensorHandleDataType(SafeTensorHandleHandle h)
59+
protected TF_DataType TFE_TensorHandleDataType(SafeEagerTensorHandle h)
6060
=> c_api.TFE_TensorHandleDataType(h);
6161

62-
protected int TFE_TensorHandleNumDims(SafeTensorHandleHandle h, SafeStatusHandle status)
62+
protected int TFE_TensorHandleNumDims(SafeEagerTensorHandle h, SafeStatusHandle status)
6363
=> c_api.TFE_TensorHandleNumDims(h, status);
6464

6565
protected TF_Code TF_GetCode(Status s)
@@ -80,7 +80,7 @@ protected IntPtr TF_TensorData(SafeTensorHandle t)
8080
protected ulong TF_TensorByteSize(SafeTensorHandle t)
8181
=> c_api.TF_TensorByteSize(t);
8282

83-
protected void TFE_OpAddInput(SafeEagerOpHandle op, SafeTensorHandleHandle h, SafeStatusHandle status)
83+
protected void TFE_OpAddInput(SafeEagerOpHandle op, SafeEagerTensorHandle h, SafeStatusHandle status)
8484
=> c_api.TFE_OpAddInput(op, h, status);
8585

8686
protected void TFE_OpSetAttrType(SafeEagerOpHandle op, string attr_name, TF_DataType value)
@@ -95,10 +95,10 @@ protected void TFE_OpSetAttrString(SafeEagerOpHandle op, string attr_name, strin
9595
protected SafeEagerOpHandle TFE_NewOp(SafeContextHandle ctx, string op_or_function_name, SafeStatusHandle status)
9696
=> c_api.TFE_NewOp(ctx, op_or_function_name, status);
9797

98-
protected SafeTensorHandleHandle TFE_NewTensorHandle(SafeTensorHandle t, SafeStatusHandle status)
98+
protected SafeEagerTensorHandle TFE_NewTensorHandle(SafeTensorHandle t, SafeStatusHandle status)
9999
=> c_api.TFE_NewTensorHandle(t, status);
100100

101-
protected void TFE_Execute(SafeEagerOpHandle op, SafeTensorHandleHandle[] retvals, out int num_retvals, SafeStatusHandle status)
101+
protected void TFE_Execute(SafeEagerOpHandle op, SafeEagerTensorHandle[] retvals, out int num_retvals, SafeStatusHandle status)
102102
=> c_api.TFE_Execute(op, retvals, out num_retvals, status);
103103

104104
protected SafeContextOptionsHandle TFE_NewContextOptions()
@@ -110,7 +110,7 @@ protected SafeContextHandle TFE_NewContext(SafeContextOptionsHandle opts, SafeSt
110110
protected int TFE_OpGetInputLength(SafeEagerOpHandle op, string input_name, SafeStatusHandle status)
111111
=> c_api.TFE_OpGetInputLength(op, input_name, status);
112112

113-
protected int TFE_OpAddInputList(SafeEagerOpHandle op, SafeTensorHandleHandle[] inputs, int num_inputs, SafeStatusHandle status)
113+
protected int TFE_OpAddInputList(SafeEagerOpHandle op, SafeEagerTensorHandle[] inputs, int num_inputs, SafeStatusHandle status)
114114
=> c_api.TFE_OpAddInputList(op, inputs, num_inputs, status);
115115

116116
protected int TFE_OpGetOutputLength(SafeEagerOpHandle op, string input_name, SafeStatusHandle status)
@@ -125,13 +125,13 @@ protected SafeExecutorHandle TFE_ContextGetExecutorForThread(SafeContextHandle c
125125
protected void TFE_ExecutorWaitForAllPendingNodes(SafeExecutorHandle executor, SafeStatusHandle status)
126126
=> c_api.TFE_ExecutorWaitForAllPendingNodes(executor, status);
127127

128-
protected SafeTensorHandle TFE_TensorHandleResolve(SafeTensorHandleHandle h, SafeStatusHandle status)
128+
protected SafeTensorHandle TFE_TensorHandleResolve(SafeEagerTensorHandle h, SafeStatusHandle status)
129129
=> c_api.TFE_TensorHandleResolve(h, status);
130130

131-
protected string TFE_TensorHandleDeviceName(SafeTensorHandleHandle h, SafeStatusHandle status)
131+
protected string TFE_TensorHandleDeviceName(SafeEagerTensorHandle h, SafeStatusHandle status)
132132
=> c_api.StringPiece(c_api.TFE_TensorHandleDeviceName(h, status));
133133

134-
protected string TFE_TensorHandleBackingDeviceName(SafeTensorHandleHandle h, SafeStatusHandle status)
134+
protected string TFE_TensorHandleBackingDeviceName(SafeEagerTensorHandle h, SafeStatusHandle status)
135135
=> c_api.StringPiece(c_api.TFE_TensorHandleBackingDeviceName(h, status));
136136

137137
protected SafeDeviceListHandle TFE_ContextListDevices(SafeContextHandle ctx, SafeStatusHandle status)
@@ -146,7 +146,7 @@ protected string TF_DeviceListType(SafeDeviceListHandle list, int index, SafeSta
146146
protected string TF_DeviceListName(SafeDeviceListHandle list, int index, SafeStatusHandle status)
147147
=> c_api.TF_DeviceListName(list, index, status);
148148

149-
protected SafeTensorHandleHandle TFE_TensorHandleCopyToDevice(SafeTensorHandleHandle h, SafeContextHandle ctx, string device_name, SafeStatusHandle status)
149+
protected SafeEagerTensorHandle TFE_TensorHandleCopyToDevice(SafeEagerTensorHandle h, SafeContextHandle ctx, string device_name, SafeStatusHandle status)
150150
=> c_api.TFE_TensorHandleCopyToDevice(h, ctx, device_name, status);
151151

152152
protected void TFE_OpSetDevice(SafeEagerOpHandle op, string device_name, SafeStatusHandle status)

‎test/TensorFlowNET.Native.UnitTest/Eager/Eager.Execute_MatMul_CPU.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static SafeContextHandle NewContext(bool async, SafeStatusHandle status)
3232
{
3333
CHECK_EQ(TF_OK, TF_GetCode(status), TF_Message(status));
3434

35-
var retvals = new SafeTensorHandleHandle[2];
35+
var retvals = new SafeEagerTensorHandle[2];
3636
using (var m = TestMatrixTensorHandle())
3737
using (var matmul = MatMulOp(ctx, m, m))
3838
{

0 commit comments

Comments
 (0)