Skip to content

d to g start ops | add dim order sanity check #4329

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

Merged
merged 1 commit into from
Sep 4, 2024
Merged

d to g start ops | add dim order sanity check #4329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions kernels/portable/cpu/op_detach_copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Tensor& detach_copy_out(RuntimeContext& ctx, const Tensor& self, Tensor& out) {
out,
"Failed to resize output tensor.");

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(self, out), InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_shape_and_dtype(self, out), InvalidArgument, out);

Expand Down
5 changes: 5 additions & 0 deletions kernels/portable/cpu/op_diagonal_copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ Tensor& diagonal_copy_out(
ET_KERNEL_CHECK(
ctx, check_diagonal_copy_args(in, dim1, dim2, out), InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(in, out), InvalidArgument, out);

ET_KERNEL_CHECK(ctx, tensor_is_default_dim_order(in), InvalidArgument, out);

if (dim1 < 0) {
dim1 += nonzero_dim(in);
}
Expand Down
9 changes: 9 additions & 0 deletions kernels/portable/cpu/op_div.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ div_out(RuntimeContext& ctx, const Tensor& a, const Tensor& b, Tensor& out) {
InvalidArgument,
out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, b, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = b.scalar_type();

Expand Down Expand Up @@ -97,6 +100,9 @@ Tensor& div_out_mode(
InvalidArgument,
out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, b, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = b.scalar_type();
ScalarType common_type = get_compute_type(a_type, b_type);
Expand Down Expand Up @@ -159,6 +165,9 @@ Tensor& div_scalar_out(
ScalarType common_type = isFloatingType(a_type) ? a_type : ScalarType::Float;
ScalarType out_type = out.scalar_type();

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

ET_KERNEL_CHECK(ctx, common_type == out_type, InvalidArgument, out);

ET_SWITCH_REAL_TYPES_AND(Bool, a_type, ctx, "div.Scalar_out", CTYPE_A, [&]() {
Expand Down
9 changes: 9 additions & 0 deletions kernels/portable/cpu/op_embedding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ Tensor& embedding_out(
out.size(1),
weight.size(1));

ET_KERNEL_CHECK(
ctx,
tensors_have_same_dim_order(weight, indices, out),
InvalidArgument,
out);

ET_KERNEL_CHECK(
ctx, tensor_is_default_dim_order(weight), InvalidArgument, out);

ScalarType ix_type = indices.scalar_type();
ET_CHECK_MSG(
ix_type == ScalarType::Long || ix_type == ScalarType::Int,
Expand Down
6 changes: 6 additions & 0 deletions kernels/portable/cpu/op_eq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ Tensor& eq_tensor_out(
ScalarType b_type = b.scalar_type();
ScalarType out_type = out.scalar_type();

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, b, out), InvalidArgument, out);

ET_SWITCH_REAL_TYPES_AND(Bool, a_type, ctx, "eq.Scalar_out", CTYPE_A, [&]() {
ET_SWITCH_REAL_TYPES_AND(
Bool, b_type, ctx, "eq.Scalar_out", CTYPE_B, [&]() {
Expand Down Expand Up @@ -80,6 +83,9 @@ Tensor& eq_scalar_out(
ScalarType b_type = utils::get_scalar_dtype(b);
ScalarType out_type = out.scalar_type();

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

ET_SWITCH_REAL_TYPES_AND(Bool, a_type, ctx, "eq.Scalar_out", CTYPE_A, [&]() {
ET_SWITCH_SCALAR_OBJ_TYPES(b_type, ctx, "eq.Scalar_out", CTYPE_B, [&]() {
using CTYPE_IN =
Expand Down
4 changes: 4 additions & 0 deletions kernels/portable/cpu/op_expand_copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ Tensor& expand_copy_out(
InvalidArgument,
out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(self, out), InvalidArgument, out);
ET_KERNEL_CHECK(ctx, tensor_is_default_dim_order(self), InvalidArgument, out);

// Holds the result of expand_sizes converted to repeat sizes
int64_t repeats[kTensorDimensionLimit];
const auto repeats_size{map_expand_to_repeats(
Expand Down
6 changes: 6 additions & 0 deletions kernels/portable/cpu/op_fill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ Tensor& fill_scalar_out(

ET_KERNEL_CHECK(ctx, a_type == out_type, InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

// Resize for dynamic shape
ET_KERNEL_CHECK_MSG(
ctx,
Expand Down Expand Up @@ -67,6 +70,9 @@ Tensor& fill_tensor_out(
// Assert `b` must be a scalar tensor.
ET_KERNEL_CHECK(ctx, tensor_is_scalar(b), InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = b.scalar_type();
ScalarType out_type = out.scalar_type();
Expand Down
3 changes: 3 additions & 0 deletions kernels/portable/cpu/op_flip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ flip_out(RuntimeContext& ctx, const Tensor& in, IntArrayRef dims, Tensor& out) {
ET_KERNEL_CHECK(
ctx, resize_tensor(out, in.sizes()) == Error::Ok, InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(in, out), InvalidArgument, out);

ET_KERNEL_CHECK(ctx, check_flip_args(in, dims, out), InvalidArgument, out);

bool flip_dim_data[kTensorDimensionLimit];
Expand Down
3 changes: 3 additions & 0 deletions kernels/portable/cpu/op_floor_divide.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ Tensor& floor_divide_out(

ET_KERNEL_CHECK(ctx, tensor_is_real_type(out), InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, b, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = b.scalar_type();
ScalarType common_type = promoteTypes(a_type, b_type);
Expand Down
6 changes: 6 additions & 0 deletions kernels/portable/cpu/op_fmod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ Tensor& fmod_Tensor_out(
InvalidArgument,
out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, b, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = b.scalar_type();
ScalarType common_type = promoteTypes(a_type, b_type);
Expand Down Expand Up @@ -139,6 +142,9 @@ Tensor& fmod_Scalar_out(
out,
"Failed to resize output tensor.");

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = utils::get_scalar_dtype(b);
ScalarType common_type = utils::promote_type_with_scalar(a_type, b);
Expand Down
5 changes: 5 additions & 0 deletions kernels/portable/cpu/op_full_like.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ Tensor& full_like_out(
"memory_format must be contiguous");
}

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(in, out), InvalidArgument, out);

ET_KERNEL_CHECK(ctx, tensor_is_default_dim_order(in), InvalidArgument, out);

// Resize for dynamic shape
ET_KERNEL_CHECK_MSG(
ctx,
Expand Down
6 changes: 6 additions & 0 deletions kernels/portable/cpu/op_ge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ Tensor& ge_tensor_out(
InvalidArgument,
out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = b.scalar_type();
ScalarType out_type = out.scalar_type();
Expand Down Expand Up @@ -77,6 +80,9 @@ Tensor& ge_scalar_out(
out,
"Failed to resize output tensor.");

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = utils::get_scalar_dtype(b);
ScalarType common_type = utils::promote_type_with_scalar(a_type, b);
Expand Down
3 changes: 3 additions & 0 deletions kernels/portable/cpu/op_gelu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ Tensor& gelu_out(
ET_KERNEL_CHECK(
ctx, resize_tensor(out, in.sizes()) == Error::Ok, InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(in, out), InvalidArgument, out);

ET_SWITCH_FLOAT_TYPES(in.scalar_type(), ctx, "gelu.out", CTYPE, [&]() {
if (approximate == "tanh") {
apply_unary_map_fn(
Expand Down
3 changes: 3 additions & 0 deletions kernels/portable/cpu/op_glu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ glu_out(RuntimeContext& ctx, const Tensor& self, int64_t dim, Tensor& out) {
ET_KERNEL_CHECK(
ctx, resize_glu_out(self, dim, out) == Error::Ok, InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(self, out), InvalidArgument, out);

ET_KERNEL_CHECK(ctx, check_glu_args(self, dim, out), InvalidArgument, out);

const size_t non_negative_dim = dim < 0 ? dim + self.dim() : dim;
Expand Down
6 changes: 6 additions & 0 deletions kernels/portable/cpu/op_gt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ Tensor& gt_tensor_out(
InvalidArgument,
out);

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, b, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = b.scalar_type();
ScalarType out_type = out.scalar_type();
Expand Down Expand Up @@ -77,6 +80,9 @@ Tensor& gt_scalar_out(
out,
"Failed to resize output tensor.");

ET_KERNEL_CHECK(
ctx, tensors_have_same_dim_order(a, out), InvalidArgument, out);

ScalarType a_type = a.scalar_type();
ScalarType b_type = utils::get_scalar_dtype(b);
ScalarType common_type = utils::promote_type_with_scalar(a_type, b);
Expand Down
Loading