Skip to content

Commit 89dcb96

Browse files
GregoryComerfacebook-github-bot
GregoryComer
authored and
facebook-github-bot
committed
Clean up a few more ops (#1581)
Summary: Pull Request resolved: #1581 Clean up a few remaining portable ops. Reviewed By: SS-JIA Differential Revision: D52673700 fbshipit-source-id: 67e7f563b639be873dcb105b1036d8cc131fb516
1 parent 18e98b6 commit 89dcb96

16 files changed

Lines changed: 175 additions & 96 deletions

‎kernels/portable/cpu/op_bitwise_not.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@ Tensor& bitwise_not_out(RuntimeContext& ctx, const Tensor& in, Tensor& out) {
4949
in.numel());
5050
});
5151
} else {
52-
ET_CHECK_MSG(
52+
ET_KERNEL_CHECK_MSG(
53+
ctx,
5354
false,
55+
InvalidArgument,
56+
out,
5457
"Unsupported input dtype %" PRId8,
5558
static_cast<int8_t>(in.scalar_type()));
5659
}

‎kernels/portable/cpu/op_clamp.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,14 @@ Tensor& clamp_out(
160160
out);
161161
}
162162

163-
ET_CHECK_MSG(
164-
has_min || has_max, "At least one of 'min' or 'max' must not be None");
163+
ET_KERNEL_CHECK_MSG(
164+
ctx,
165+
has_min || has_max,
166+
InvalidArgument,
167+
out,
168+
"At least one of 'min' or 'max' must not be None");
165169

166-
ET_CHECK(common_type == out_type);
170+
ET_KERNEL_CHECK(ctx, common_type == out_type, InvalidArgument, out);
167171

168172
ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
169173
// Extract optional min value

‎kernels/portable/cpu/op_cumsum.cpp‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -98,35 +98,13 @@ Tensor& cumsum_out(
9898

9999
dim = (self.dim() == 0) ? 0 : dim < 0 ? dim + self.dim() : dim;
100100

101-
// Use a two layer switch to handle each possible data pair
102-
#define CUMSUM_IMPL(SELF_CTYPE, OUT_CTYPE, out_dtype) \
103-
case ScalarType::out_dtype: \
104-
cumsum_tensors<SELF_CTYPE, OUT_CTYPE>(self, dim, out); \
105-
break;
106-
107-
#define CUMSUM_TENSORS(SELF_CTYPE, self_dtype) \
108-
case ScalarType::self_dtype: \
109-
switch (out.scalar_type()) { \
110-
ET_FORALL_REAL_TYPES_WITH(SELF_CTYPE, CUMSUM_IMPL) \
111-
default: \
112-
ET_CHECK_MSG( \
113-
false, \
114-
"Unhandled output dtype %" PRId8, \
115-
static_cast<int8_t>(out.scalar_type())); \
116-
} \
117-
break;
118-
119-
switch (self.scalar_type()) {
120-
ET_FORALL_REAL_TYPES_AND(Bool, CUMSUM_TENSORS)
121-
default:
122-
ET_CHECK_MSG(
123-
false,
124-
"Unhandled input dtype %" PRId8,
125-
static_cast<int8_t>(self.scalar_type()));
126-
}
127-
128-
#undef CUMSUM_TENSORS
129-
#undef CUMSUM_IMPL
101+
ET_SWITCH_REAL_TYPES_AND(
102+
Bool, self.scalar_type(), ctx, "cumsum", CTYPE_SELF, [&] {
103+
ET_SWITCH_REAL_TYPES_AND(
104+
Bool, out.scalar_type(), ctx, "cumsum", CTYPE_OUT, [&] {
105+
cumsum_tensors<CTYPE_SELF, CTYPE_OUT>(self, dim, out);
106+
});
107+
});
130108

131109
return out;
132110
}

‎kernels/portable/cpu/op_div.cpp‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ namespace native {
2020
namespace {
2121

2222
ScalarType get_compute_type(ScalarType a_type, ScalarType b_type) {
23-
ET_CHECK(
24-
!isComplexType(a_type) && !isQIntType(a_type) && !isBitsType(a_type));
25-
ET_CHECK(
26-
!isComplexType(b_type) && !isQIntType(b_type) && !isBitsType(b_type));
27-
2823
if (isFloatingType(a_type) && isFloatingType(b_type)) {
2924
return promoteTypes(a_type, b_type);
3025
} else if (isFloatingType(a_type)) {
@@ -47,6 +42,18 @@ div_out(RuntimeContext& ctx, const Tensor& a, const Tensor& b, Tensor& out) {
4742

4843
ScalarType a_type = a.scalar_type();
4944
ScalarType b_type = b.scalar_type();
45+
46+
ET_KERNEL_CHECK(
47+
ctx,
48+
!isComplexType(a_type) && !isQIntType(a_type) && !isBitsType(a_type),
49+
InvalidArgument,
50+
out);
51+
ET_KERNEL_CHECK(
52+
ctx,
53+
!isComplexType(b_type) && !isQIntType(b_type) && !isBitsType(b_type),
54+
InvalidArgument,
55+
out);
56+
5057
ScalarType common_type = get_compute_type(a_type, b_type);
5158
ScalarType out_type = out.scalar_type();
5259

@@ -94,7 +101,11 @@ Tensor& div_out_mode(
94101

95102
// Allow casting float -> integral here
96103
// non-bool -> bool is still disallowed
97-
ET_CHECK(!(common_type != ScalarType::Bool && out_type == ScalarType::Bool));
104+
ET_KERNEL_CHECK(
105+
ctx,
106+
!(common_type != ScalarType::Bool && out_type == ScalarType::Bool),
107+
InvalidArgument,
108+
out);
98109

99110
ET_SWITCH_REAL_TYPES_AND(Bool, a_type, ctx, "div.out_mode", CTYPE_A, [&]() {
100111
ET_SWITCH_REAL_TYPES_AND(Bool, b_type, ctx, "div.out_mode", CTYPE_B, [&]() {
@@ -131,15 +142,19 @@ Tensor& div_scalar_out(
131142
(void)ctx;
132143

133144
// Resize for dynamic shape
134-
auto error = resize_tensor(out, a.sizes());
135-
ET_CHECK_MSG(error == Error::Ok, "Failed to resize output tensor.");
145+
ET_KERNEL_CHECK_MSG(
146+
ctx,
147+
resize_tensor(out, a.sizes()) == Error::Ok,
148+
InvalidArgument,
149+
out,
150+
"Failed to resize output tensor.");
136151

137152
ScalarType a_type = a.scalar_type();
138153
ScalarType b_type = utils::get_scalar_dtype(b);
139154
ScalarType common_type = isFloatingType(a_type) ? a_type : ScalarType::Float;
140155
ScalarType out_type = out.scalar_type();
141156

142-
ET_CHECK(common_type == out_type);
157+
ET_KERNEL_CHECK(ctx, common_type == out_type, InvalidArgument, out);
143158

144159
ET_SWITCH_REAL_TYPES_AND(Bool, a_type, ctx, "div.Scalar_out", CTYPE_A, [&]() {
145160
ET_SWITCH_SCALAR_OBJ_TYPES(b_type, ctx, "div.Scalar_out", CTYPE_B, [&]() {

‎kernels/portable/cpu/op_eq.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,12 @@ Tensor& eq_scalar_out(
6868
(void)ctx;
6969

7070
// Resize for dynamic shape
71-
auto error = resize_tensor(out, a.sizes());
72-
ET_CHECK_MSG(error == Error::Ok, "Failed to resize output tensor.");
71+
ET_KERNEL_CHECK_MSG(
72+
ctx,
73+
resize_tensor(out, a.sizes()) == Error::Ok,
74+
InvalidArgument,
75+
out,
76+
"Failed to resize output tensor.");
7377

7478
ScalarType a_type = a.scalar_type();
7579
ScalarType b_type = utils::get_scalar_dtype(b);

‎kernels/portable/cpu/op_fill.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ Tensor& fill_tensor_out(
6565
(void)ctx;
6666

6767
// Assert `b` must be a scalar tensor.
68-
ET_CHECK(b.dim() == 0 && b.numel() == 1);
68+
ET_KERNEL_CHECK(ctx, tensor_is_scalar(b), InvalidArgument, b);
6969

7070
ScalarType a_type = a.scalar_type();
7171
ScalarType b_type = b.scalar_type();
7272
ScalarType out_type = out.scalar_type();
7373

74-
ET_CHECK(a_type == out_type);
74+
ET_KERNEL_CHECK(ctx, a_type == out_type, InvalidArgument, out);
7575

7676
// Resize for dynamic shape
7777
ET_KERNEL_CHECK_MSG(

‎kernels/portable/cpu/op_floor_divide.cpp‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ Tensor& floor_divide_out(
7676

7777
ET_KERNEL_CHECK(ctx, canCast(common_type, out_type), InvalidArgument, out);
7878

79+
auto div_by_zero_error = false;
80+
7981
ET_SWITCH_REAL_TYPES_AND(
8082
Bool, a_type, ctx, "floor_divide.out", CTYPE_A, [&]() {
8183
ET_SWITCH_REAL_TYPES_AND(
@@ -88,11 +90,14 @@ Tensor& floor_divide_out(
8890
CTYPE_A,
8991
CTYPE_B,
9092
CTYPE_OUT>(
91-
[common_type](
93+
[common_type, &div_by_zero_error](
9294
const CTYPE_A val_a, const CTYPE_B val_b) {
9395
if (isIntegralType(
9496
common_type, /*includeBool=*/true)) {
95-
ET_CHECK(val_b != 0);
97+
if (val_b == 0) {
98+
div_by_zero_error = true;
99+
return static_cast<CTYPE_OUT>(0);
100+
}
96101
}
97102
CTYPE_IN a_casted =
98103
static_cast<CTYPE_IN>(val_a);
@@ -111,6 +116,13 @@ Tensor& floor_divide_out(
111116
});
112117
});
113118

119+
ET_KERNEL_CHECK_MSG(
120+
ctx,
121+
!div_by_zero_error,
122+
InvalidArgument,
123+
out,
124+
"Floor divide operation encountered integer division by zero");
125+
114126
return out;
115127
}
116128

‎kernels/portable/cpu/op_fmod.cpp‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ Tensor& fmod_Tensor_out(
3838

3939
ET_KERNEL_CHECK(ctx, canCast(common_type, out_type), InvalidArgument, out);
4040

41+
auto div_by_zero_error = false;
42+
4143
ET_SWITCH_REAL_TYPES_AND(
4244
Bool, a_type, ctx, "fmod.Tensor_out", CTYPE_A, [&]() {
4345
ET_SWITCH_REAL_TYPES_AND(
@@ -50,11 +52,14 @@ Tensor& fmod_Tensor_out(
5052
CTYPE_A,
5153
CTYPE_B,
5254
CTYPE_OUT>(
53-
[common_type](
55+
[common_type, &div_by_zero_error](
5456
const CTYPE_A val_a, const CTYPE_B val_b) {
5557
if (isIntegralType(
5658
common_type, /*includeBool=*/true)) {
57-
ET_CHECK(val_b != 0);
59+
if (val_b == 0) {
60+
div_by_zero_error = true;
61+
return static_cast<CTYPE_OUT>(0);
62+
}
5863
}
5964
CTYPE_IN a_casted =
6065
static_cast<CTYPE_IN>(val_a);
@@ -72,6 +77,13 @@ Tensor& fmod_Tensor_out(
7277
});
7378
});
7479

80+
ET_KERNEL_CHECK_MSG(
81+
ctx,
82+
!div_by_zero_error,
83+
InvalidArgument,
84+
out,
85+
"Fmod operation encountered integer division by zero");
86+
7587
return out;
7688
}
7789

@@ -97,6 +109,24 @@ Tensor& fmod_Scalar_out(
97109

98110
ET_KERNEL_CHECK(ctx, canCast(common_type, out_type), InvalidArgument, out);
99111

112+
// Check for integer division by zero
113+
if (isIntegralType(common_type, /*includeBool=*/true)) {
114+
auto is_zero = false;
115+
ET_SWITCH_REAL_TYPES_AND(
116+
Bool, b_type, ctx, "fmod.Scalar_out", CTYPE_B, [&]() {
117+
CTYPE_B val_b = 0;
118+
ET_EXTRACT_SCALAR(b, val_b);
119+
is_zero = (val_b == 0);
120+
});
121+
122+
ET_KERNEL_CHECK_MSG(
123+
ctx,
124+
!is_zero,
125+
InvalidArgument,
126+
out,
127+
"Fmod operation encountered integer division by zero");
128+
}
129+
100130
ET_SWITCH_REAL_TYPES_AND(
101131
Bool, a_type, ctx, "fmod.Scalar_out", CTYPE_A, [&]() {
102132
ET_SWITCH_SCALAR_OBJ_TYPES(
@@ -105,9 +135,6 @@ Tensor& fmod_Scalar_out(
105135
ET_EXTRACT_SCALAR(b, val_b);
106136
ET_SWITCH_REAL_TYPES(
107137
common_type, ctx, "fmod.Scalar_out", CTYPE_IN, [&]() {
108-
if (isIntegralType(common_type, /*includeBool=*/true)) {
109-
ET_CHECK(val_b != 0);
110-
}
111138
ET_SWITCH_REAL_TYPES(
112139
out_type, ctx, "fmod.Scalar_out", CTYPE_OUT, [&]() {
113140
apply_unary_map_fn(

‎kernels/portable/cpu/op_glu.cpp‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,14 @@ glu_out(RuntimeContext& ctx, const Tensor& self, int64_t dim, Tensor& out) {
149149
const size_t non_negative_dim = dim < 0 ? dim + self.dim() : dim;
150150
const auto in_dtype = self.scalar_type();
151151

152-
#define GLU_TENSOR(ctype, dtype) \
153-
case ScalarType::dtype: \
154-
if (out.scalar_type() == ScalarType::Float) { \
155-
glu_out_tensor<ctype, float>(self, non_negative_dim, out); \
156-
} else { \
157-
glu_out_tensor<ctype, double>(self, non_negative_dim, out); \
158-
} \
159-
break;
160-
161-
switch (in_dtype) {
162-
ET_FORALL_FLOAT_TYPES(GLU_TENSOR)
163-
default:
164-
ET_CHECK_MSG(
165-
false, "Unhandled dtype %" PRId8, static_cast<int8_t>(in_dtype));
166-
}
167-
#undef GLU_TENSOR
152+
ET_SWITCH_FLOAT_TYPES(in_dtype, ctx, "glu", CTYPE_IN, [&]() {
153+
if (out.scalar_type() == ScalarType::Float) {
154+
glu_out_tensor<CTYPE_IN, float>(self, non_negative_dim, out);
155+
} else {
156+
glu_out_tensor<CTYPE_IN, double>(self, non_negative_dim, out);
157+
}
158+
});
159+
168160
return out;
169161
}
170162

‎kernels/portable/cpu/util/activation_ops_util.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ bool check_gelu_args(const Tensor& in, string_view approximate, Tensor& out) {
2525

2626
bool check_glu_args(const Tensor& in, int64_t dim, Tensor& out) {
2727
ET_LOG_AND_RETURN_IF_FALSE(dim_is_valid(dim, in.dim()));
28+
ET_LOG_AND_RETURN_IF_FALSE(tensor_is_floating_type(in));
2829

2930
const size_t non_negative_dim = dim < 0 ? dim + in.dim() : dim;
3031
const size_t dim_size = in.size(non_negative_dim);

0 commit comments

Comments
 (0)