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

Fix slice in Tensor. · MSavameri/TensorFlow.NET@13e4e3e · GitHub

  1. MSavameri
  2. TensorFlow.NET

Repository navigation

Commit 13e4e3e

Browse files
Oceania2018
committed
Fix slice in Tensor.
1 parent 899d15e commit 13e4e3e

6 files changed

Lines changed: 45 additions & 17 deletions

File tree

‎src/TensorFlowNET.Core/Operations/array_ops.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,13 @@ private static Tensor _constant_if_small(int value, Tensor shape)
191191

192192
private static Tensor _constant_if_small<T>(T value, TensorShape shape, TF_DataType dtype, string name)
193193
{
194-
Tensor shape_t = null;
195194
if (shape.size < 1000)
196195
{
197196
return constant_op.constant(value, shape: shape, dtype: dtype, name: name);
198197
}
199198
else
200199
{
201-
shape_t = constant_op._tensor_shape_tensor_conversion_function(shape);
200+
var shape_t = constant_op._tensor_shape_tensor_conversion_function(shape);
202201
var c = constant_op.constant(0, dtype: dtype);
203202
return gen_array_ops.fill(shape_t, c, name: name);
204203
}

‎src/TensorFlowNET.Core/Operations/string_ops.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@ public RaggedTensor string_split_v2(Tensor input, string sep = " ", int maxsplit
8080
var sep_tensor = ops.convert_to_tensor(sep, dtype: TF_DataType.TF_STRING);
8181
if(input.rank == 0)
8282
{
83-
return string_split_v2(array_ops.stack(new[] { input }),
83+
var parts = string_split_v2(array_ops.stack(new[] { input }),
8484
sep: sep,
8585
maxsplit: maxsplit,
86-
name: name)[0];
86+
name: name);
87+
return parts;
8788
}
8889

8990
var result = tf.Context.ExecuteOp("StringSplitV2", name,

‎src/TensorFlowNET.Core/Tensors/Ragged/RaggedTensor.cs‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@ public TensorShape shape
4444
}
4545
}
4646

47+
public Tensor this[int index]
48+
{
49+
get
50+
{
51+
return tf_with(ops.name_scope(null, "RaggedGetItem"), scope =>
52+
{
53+
string name = scope;
54+
return _ragged_getitem(index);
55+
});
56+
}
57+
}
58+
4759
public RaggedTensor this[params Slice[] slices]
4860
{
4961
get
@@ -61,6 +73,14 @@ public RaggedTensor this[params Slice[] slices]
6173
}
6274
}
6375

76+
Tensor _ragged_getitem(int row_key)
77+
{
78+
var starts = _row_splits[":-1"];
79+
var limits = _row_splits["1:"];
80+
var row = _values[starts[row_key], limits[row_key]];
81+
return row;
82+
}
83+
6484
RaggedTensor _ragged_getitem_inner_dimensions(RaggedTensor input, Slice[] slices)
6585
{
6686
return input;
@@ -134,7 +154,7 @@ Tensor[] nested_row_splits
134154
=> new[] { _row_splits };
135155

136156
public override string ToString()
137-
=> $"tf.RaggedTensor: shape={_values.TensorShape} [{string.Join(", ", _values.StringData().Take(10))}]";
157+
=> $"tf.RaggedTensor: shape={shape} [{string.Join(", ", _values.StringData().Take(10))}]";
138158

139159
public static implicit operator Tensor(RaggedTensor indexedSlices)
140160
=> indexedSlices._to_variant();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ public Tensor slice(Slice slice)
120120
});
121121
}
122122

123-
public Tensor this[params Tensor[] slice]
123+
public Tensor this[Tensor start, Tensor stop = null, Tensor step = null]
124124
{
125125
get
126126
{
127-
var args = tensor_util.ParseSlices(slice);
127+
var args = tensor_util.ParseSlices(start, stop: stop, step: step);
128128

129129
return tf_with(ops.name_scope(null, "strided_slice", args), scope =>
130130
{

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -674,25 +674,30 @@ public static ParsedSliceArgs ParseSlices(Slice[] slices)
674674
};
675675
}
676676

677-
public static ParsedSliceArgs ParseSlices(Tensor[] slices)
677+
public static ParsedSliceArgs ParseSlices(Tensor start, Tensor stop = null, Tensor step = null)
678678
{
679679
var begin = new List<Tensor>();
680680
var end = new List<Tensor>();
681681
var strides = new List<Tensor>();
682682

683-
var index = 0;
683+
// var index = 0;
684684
var (new_axis_mask, shrink_axis_mask) = (0, 0);
685685
var (begin_mask, end_mask) = (0, 0);
686686
var ellipsis_mask = 0;
687687

688-
foreach (var s in slices)
689-
{
690-
begin.Add(s);
691-
end.Add(s + 1);
692-
shrink_axis_mask |= (1 << index);
693-
strides.Add(tf.constant(1, dtype: s.dtype));
694-
index += 1;
695-
}
688+
begin.Add(start);
689+
690+
if (stop == null)
691+
end.Add(start + 1);
692+
else
693+
end.Add(stop);
694+
695+
// shrink_axis_mask |= (1 << index);
696+
697+
if (step == null)
698+
strides.Add(tf.constant(1, dtype: start.dtype));
699+
else
700+
strides.Add(step);
696701

697702
return new ParsedSliceArgs
698703
{

‎src/TensorFlowNET.Core/Tensors/tf.constant.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ public Tensor constant(object value,
4040
public Tensor zeros(TensorShape shape, TF_DataType dtype = TF_DataType.TF_FLOAT, string name = null)
4141
=> array_ops.zeros(shape, dtype, name);
4242

43+
public Tensor zeros(Tensor shape, TF_DataType dtype = TF_DataType.TF_FLOAT, string name = null)
44+
=> array_ops.zeros(shape, dtype, name);
45+
4346
public Tensor ones(TensorShape shape, TF_DataType dtype = TF_DataType.TF_FLOAT, string name = null)
4447
=> array_ops.ones(shape, dtype, name);
4548

0 commit comments

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