Update on "[ET][Portable] Check scalar overflow: op_leaky_relu"

Differential Revision: [D77401091](https://our.internmc.facebook.com/intern/diff/D77401091/)

[ghstack-poisoned]

Author: manuelcandales

kernels/portable/cpu/op_hardtanh.cpp

@@ -45,8 +45,15 @@ Tensor& hardtanh_out(
   ET_KERNEL_CHECK(ctx, in_type == out_type, InvalidArgument, out);
 
   ET_SWITCH_REALHBF16_TYPES(in_type, ctx, "hardtanh.out", CTYPE, [&]() {
-    const CTYPE min_casted = utils::scalar_to<CTYPE>(min);
-    const CTYPE max_casted = utils::scalar_to<CTYPE>(max);
+    auto opt_min_casted =
+        utils::internal::check_overflow_scalar_cast<CTYPE>(min);
+    ET_KERNEL_CHECK(ctx, opt_min_casted.has_value(), InvalidArgument, );
+    auto min_casted = opt_min_casted.value();
+
+    auto opt_max_casted =
+        utils::internal::check_overflow_scalar_cast<CTYPE>(max);
+    ET_KERNEL_CHECK(ctx, opt_max_casted.has_value(), InvalidArgument, );
+    auto max_casted = opt_max_casted.value();
 
     apply_unary_map_fn(
         [min_casted, max_casted](const CTYPE val_in) {

kernels/portable/cpu/op_scatter.cpp

@@ -154,7 +154,9 @@ Tensor& scatter_value_out(
   constexpr auto name = "scatter.value_out";
 
   ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
-    const CTYPE val = utils::scalar_to<CTYPE>(value);
+    auto opt_val = utils::internal::check_overflow_scalar_cast<CTYPE>(value);
+    ET_KERNEL_CHECK(ctx, opt_val.has_value(), InvalidArgument, );
+    auto val = opt_val.value();
     scatter_value_helper<CTYPE>(in, dim, index, val, out);
   });
 

kernels/test/op_hardtanh_test.cpp

@@ -7,6 +7,7 @@
  */
 
 #include <executorch/kernels/test/FunctionHeaderWrapper.h> // Declares the operator
+#include <executorch/kernels/test/ScalarOverflowTestMacros.h>
 #include <executorch/kernels/test/TestUtil.h>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
@@ -51,10 +52,27 @@ class OpHardTanhTest : public OperatorTest {
     EXPECT_TENSOR_EQ(out, ret);
     EXPECT_TENSOR_EQ(out, tf.make({2, 2}, {lower_bound, 0, 1, 2}));
   }
+
+  template <ScalarType DTYPE>
+  void expect_bad_scalar_value_dies(const Scalar& bad_value) {
+    TensorFactory<DTYPE> tf;
+    Tensor in = tf.ones({2, 2});
+    Tensor out = tf.zeros({2, 2});
+
+    // Test overflow for min parameter (using valid max)
+    ET_EXPECT_KERNEL_FAILURE(
+        context_, op_hardtanh_out(in, bad_value, 1.0, out));
+
+    // Test overflow for max parameter (using valid min)
+    ET_EXPECT_KERNEL_FAILURE(
+        context_, op_hardtanh_out(in, -1.0, bad_value, out));
+  }
 };
 
 TEST_F(OpHardTanhTest, SanityCheck) {
 #define TEST_ENTRY(ctype, dtype) test_dtype<ctype, ScalarType::dtype>();
   ET_FORALL_REALHBF16_TYPES(TEST_ENTRY);
 #undef TEST_ENTRY
 }
+
+GENERATE_SCALAR_OVERFLOW_TESTS(OpHardTanhTest)

kernels/test/op_scatter_test.cpp

@@ -7,6 +7,7 @@
  */
 
 #include <executorch/kernels/test/FunctionHeaderWrapper.h> // Declares the operator
+#include <executorch/kernels/test/ScalarOverflowTestMacros.h>
 #include <executorch/kernels/test/TestUtil.h>
 #include <executorch/kernels/test/supported_features.h>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
@@ -364,6 +365,19 @@ class OpScatterValueOutTest : public OperatorTest {
     op_scatter_value_out(input, 2, index, value, out);
     EXPECT_TENSOR_EQ(out, expected);
   }
+
+  template <ScalarType DTYPE>
+  void expect_bad_scalar_value_dies(const Scalar& bad_value) {
+    TensorFactory<DTYPE> tf;
+    TensorFactory<ScalarType::Long> tf_index;
+
+    Tensor self = tf.ones({2, 2});
+    Tensor index = tf_index.zeros({2, 2});
+    Tensor out = tf.zeros({2, 2});
+
+    ET_EXPECT_KERNEL_FAILURE(
+        context_, op_scatter_value_out(self, 0, index, bad_value, out));
+  }
 };
 
 TEST_F(OpScatterSrcOutTest, AllValidInputOutputSupport) {
@@ -652,3 +666,5 @@ TEST_F(OpScatterSrcOutTest, InvalidOneDimInputAndZeroDimIndex) {
   ET_EXPECT_KERNEL_FAILURE(
       context_, op_scatter_src_out(self, 0, index, src, out));
 }
+
+GENERATE_SCALAR_OVERFLOW_TESTS(OpScatterValueOutTest)