Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use tensor_shape_to_c_string for error in check_mask_indices #8314

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Use tensor_shape_to_c_string for error in check_mask_indices #8314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf1ead9
Update
swolchok Feb 7, 2025
e7768b6
Update
swolchok Feb 7, 2025
1a17c4d
Update
swolchok Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions kernels/portable/cpu/util/advanced_index_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

#include <executorch/kernels/portable/cpu/util/broadcast_util.h>
#include <executorch/runtime/core/exec_aten/util/tensor_shape_to_c_string.h>
#include <executorch/runtime/kernel/kernel_includes.h>

namespace torch {
Expand Down Expand Up @@ -49,9 +50,22 @@ bool check_mask_indices(const Tensor& in, TensorOptList indices) {
ET_LOG_MSG_AND_RETURN_IF_FALSE(
index.dim() > 0, "Zero-dimensional mask index not allowed");
for (auto j = 0; j < index.dim(); j++) {
ET_LOG_MSG_AND_RETURN_IF_FALSE(
index.size(j) == in.size(in_i + j),
"The shape of mask index must match the sizes of the corresponding input dimensions.");
if (index.size(j) != in.size(in_i + j)) {
#ifdef ET_LOG_ENABLED
auto mask_shape = executorch::runtime::tensor_shape_to_c_string(
executorch::runtime::Span<const Tensor::SizesType>(
index.sizes().data(), index.sizes().size()));
auto input_shape = executorch::runtime::tensor_shape_to_c_string(
executorch::runtime::Span<const Tensor::SizesType>(
in.sizes().data() + in_i, index.sizes().size()));
ET_LOG(
Error,
"The shape of mask index %s must match the sizes of the corresponding input dimensions %s.",
mask_shape.data(),
input_shape.data());
#endif // ET_LOG_ENABLED
return false;
}
}
in_i += index.dim();
} else {
Expand Down
1 change: 1 addition & 0 deletions kernels/portable/cpu/util/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def define_common_targets():
compiler_flags = ["-Wno-missing-prototypes"],
deps = [
":broadcast_util",
"//executorch/runtime/core/exec_aten/util:tensor_shape_to_c_string",
"//executorch/runtime/kernel:kernel_includes",
],
visibility = ["//executorch/kernels/portable/cpu/...", "//executorch/kernels/optimized/cpu/..."],
Expand Down
Loading