Skip to content

Commit a86e421

Browse files
dsharletgxnnpack-bot
authored andcommitted
Update Slinky in XNNPACK
PiperOrigin-RevId: 891935408
1 parent 445bbc8 commit a86e421

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ http_archive(
115115

116116
http_archive(
117117
name = "slinky",
118-
sha256 = "28d311d7aa3c7f432e3fc14a09f11bff363a1611896c198d1c4a41ed5aab0d48",
119-
strip_prefix = "slinky-4de79eb693dfa2791fa469586c8052287cb3110d",
118+
sha256 = "3be8c5eb2e0540479ff87f5b0d771a8dddf2056d938aafeab0e47b6f4edaca9d",
119+
strip_prefix = "slinky-42f643e511fc7310281055c270f229aaa87bf1f8",
120120
urls = [
121-
"https://github.com/dsharlet/slinky/archive/4de79eb693dfa2791fa469586c8052287cb3110d.zip",
121+
"https://github.com/dsharlet/slinky/archive/42f643e511fc7310281055c270f229aaa87bf1f8.zip",
122122
],
123123
)

ynnpack/subgraph/copy.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ slinky::func make_reshape(ynn_runtime& runtime,
149149
slinky::buffer<const void, YNN_MAX_TENSOR_RANK> input_as_output = output;
150150
input_as_output.raw_buffer::base = input.raw_buffer::base;
151151
for (size_t d = 0; d < input_as_output.rank; ++d) {
152-
input_as_output.dim(d).set_bounds(0, input_as_output.dim(d).max());
152+
input_as_output.mutable_dim(d).set_bounds(0,
153+
input_as_output.dim(d).max());
153154
}
154155
slinky::copy(input_as_output, output);
155156
return 0;

ynnpack/subgraph/reduce.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ void prepare_reduction_output(slinky::buffer<void, YNN_MAX_TENSOR_RANK>& output,
6060
if (op.keep_dims) {
6161
for (int d = 0; d < input.rank; ++d) {
6262
if (op.k_dims[d]) {
63-
output.dim(d) = input.dim(d);
64-
output.dim(d).set_stride(0);
63+
output.mutable_dim(d) = input.dim(d);
64+
output.mutable_dim(d).set_stride(0);
6565
}
6666
}
6767
} else {

ynnpack/subgraph/runtime.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,10 @@ auto make_reshape_impl(ynn_runtime* runtime) {
480480
assert(i.data->rank == i.rank());
481481
for (size_t d = 0; d < i.rank(); ++d) {
482482
if (i.extents[d].defined()) {
483-
i.data->dim(d).set_min_extent(
483+
i.data->mutable_dim(d).set_min_extent(
484484
0, evaluate(i.extents[d], ctx));
485485
} else {
486-
i.data->dim(d).set_min_extent(0, 1);
486+
i.data->mutable_dim(d).set_min_extent(0, 1);
487487
}
488488
}
489489
ynn::init_buffer_strides(*i.data);
@@ -553,7 +553,7 @@ ynn_runtime::ynn_runtime(ynn::ref_count<const ynn_subgraph> subgraph,
553553
for (size_t d = 0; d < value.extents.size(); ++d) {
554554
if (!value.extents[d].defined() ||
555555
slinky::is_constant(value.extents[d], 1)) {
556-
value.data->dim(d) = slinky::dim::broadcast();
556+
value.data->mutable_dim(d) = slinky::dim::broadcast();
557557
}
558558
}
559559

@@ -632,7 +632,7 @@ ynn_status ynn_runtime::build() {
632632
for (size_t d = 0; d < value.extents.size(); ++d) {
633633
if (!value.extents[d].defined() ||
634634
slinky::is_constant(value.extents[d], 1)) {
635-
value.data->dim(d) = slinky::dim::broadcast();
635+
value.data->mutable_dim(d) = slinky::dim::broadcast();
636636
}
637637
}
638638
}

ynnpack/subgraph/static_transpose.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ auto make_transpose_impl(int rank, size_t elem_count,
4444
int fuse_transpose[YNN_MAX_TENSOR_RANK];
4545
int fuse_batch[YNN_MAX_TENSOR_RANK];
4646
for (int d = 0; d < rank; ++d) {
47-
sliced_input.dim(d) = input.dim(permutation[d]);
47+
sliced_input.mutable_dim(d) = input.dim(permutation[d]);
4848
fuse_batch[d] = input_dim0 == -1 ? d : YNN_MAX_TENSOR_RANK;
4949
if (permutation[d] == 0) {
5050
input_dim0 = d;

ynnpack/subgraph/subgraph.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ ynn_status ynn_value::set_external_shape(size_t rank, const size_t* dims) {
200200

201201
for (size_t d = 0; d < rank; ++d) {
202202
if (!extents[d].defined() || slinky::is_constant(extents[d], 1)) {
203-
data->dim(d) = slinky::dim::broadcast();
203+
data->mutable_dim(d) = slinky::dim::broadcast();
204204
}
205205
}
206206

ynnpack/subgraph/tensor.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void init_buffer_strides(slinky::raw_buffer& buffer) {
4545
slinky::index_t stride = buffer.elem_size;
4646
for (size_t i = 0; i < buffer.rank; ++i) {
4747
if (buffer.dim(i) != slinky::dim::broadcast()) {
48-
buffer.dim(i).set_stride(stride);
48+
buffer.mutable_dim(i).set_stride(stride);
4949
stride *= buffer.dim(i).extent();
5050
}
5151
}
@@ -60,8 +60,8 @@ void init_buffer(slinky::raw_buffer& buffer, size_t elem_size, size_t num_dims,
6060
buffer.base = const_cast<void*>(data);
6161
if (dims) {
6262
for (size_t i = 0; i < num_dims; ++i) {
63-
buffer.dim(i).set_min_extent(0, dims[num_dims - i - 1]);
64-
buffer.dim(i).set_fold_factor(slinky::dim::unfolded);
63+
buffer.mutable_dim(i).set_min_extent(0, dims[num_dims - i - 1]);
64+
buffer.mutable_dim(i).set_fold_factor(slinky::dim::unfolded);
6565
}
6666
init_buffer_strides(buffer);
6767
}
@@ -162,7 +162,7 @@ ynn_status ynn_define_tensor_value(ynn_subgraph_t subgraph, enum ynn_type type,
162162
for (size_t d = 0; d < value->extents.size(); ++d) {
163163
if (!value->extents[d].defined() ||
164164
slinky::is_constant(value->extents[d], 1)) {
165-
value->data->dim(d) = slinky::dim::broadcast();
165+
value->data->mutable_dim(d) = slinky::dim::broadcast();
166166
}
167167
}
168168

0 commit comments

Comments
 (0)