Revert "Support Half/BFloat16 in prod operator (#7857)"

This reverts commit 0d365a6.

Author: swolchok

kernels/portable/cpu/op_prod.cpp

@@ -33,8 +33,8 @@ Tensor& prod_out(
   ScalarType out_type = out.scalar_type();
   constexpr auto name = "prod.int_out";
 
-  ET_SWITCH_REALHBBF16_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
-    ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
+  ET_SWITCH_REALHB_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
+    ET_SWITCH_REALHB_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
       const auto data_in = in.const_data_ptr<CTYPE_IN>();
       auto data_out = out.mutable_data_ptr<CTYPE_OUT>();
       data_out[0] = static_cast<CTYPE_OUT>(1);
@@ -73,8 +73,8 @@ Tensor& prod_int_out(
   ScalarType out_type = out.scalar_type();
   constexpr auto name = "prod.int_out";
 
-  ET_SWITCH_REALHBBF16_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
-    ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
+  ET_SWITCH_REALHB_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
+    ET_SWITCH_REALHB_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
       CTYPE_OUT* out_data = out.mutable_data_ptr<CTYPE_OUT>();
       for (size_t out_ix = 0; out_ix < out.numel(); ++out_ix) {
         CTYPE_OUT prod = 1;

kernels/test/op_prod_test.cpp

@@ -45,24 +45,6 @@ class OpProdOutTest : public ::testing::Test {
     // first.
     torch::executor::runtime_init();
   }
-
-  template <ScalarType DTYPE>
-  void test_dtype() {
-    TensorFactory<DTYPE> tf;
-    TensorFactory<
-        executorch::runtime::isIntegralType(DTYPE, /*includeBool*/ true)
-            ? ScalarType::Long
-            : DTYPE>
-        tf_out;
-
-    Tensor self = tf.make({2, 3}, {1, 2, 3, 4, 5, 6});
-    optional<ScalarType> dtype{};
-    Tensor out = tf_out.zeros({});
-    Tensor out_expected =
-        tf_out.make({}, {DTYPE == ScalarType::Bool ? 1 : 720});
-    op_prod_out(self, dtype, out);
-    EXPECT_TENSOR_CLOSE(out, out_expected);
-  }
 };
 
 class OpProdIntOutTest : public ::testing::Test {
@@ -72,32 +54,30 @@ class OpProdIntOutTest : public ::testing::Test {
     // first.
     torch::executor::runtime_init();
   }
-
-  template <ScalarType DTYPE>
-  void test_dtype() {
-    TensorFactory<DTYPE> tf;
-
-    Tensor self = tf.make({2, 3}, {1, 2, 3, 4, 5, 6});
-    int64_t dim = 0;
-    bool keepdim = false;
-    optional<ScalarType> dtype{};
-    Tensor out = tf.zeros({3});
-    Tensor out_expected = tf.make({3}, {4, 10, 18});
-    op_prod_int_out(self, dim, keepdim, dtype, out);
-    EXPECT_TENSOR_CLOSE(out, out_expected);
-  }
 };
 
-TEST_F(OpProdOutTest, SmokeTest){
-#define TEST_ENTRY(ctype, dtype) test_dtype<ScalarType::dtype>();
-    ET_FORALL_REALHBBF16_TYPES(TEST_ENTRY)
-#undef TEST_ENTRY
+TEST_F(OpProdOutTest, SmokeTest) {
+  TensorFactory<ScalarType::Float> tfFloat;
+
+  Tensor self = tfFloat.make({2, 3}, {1, 2, 3, 4, 5, 6});
+  optional<ScalarType> dtype{};
+  Tensor out = tfFloat.zeros({});
+  Tensor out_expected = tfFloat.make({}, {720});
+  op_prod_out(self, dtype, out);
+  EXPECT_TENSOR_CLOSE(out, out_expected);
 }
 
-TEST_F(OpProdIntOutTest, SmokeTest){
-#define TEST_ENTRY(ctype, dtype) test_dtype<ScalarType::dtype>();
-    ET_FORALL_REALHBBF16_TYPES(TEST_ENTRY)
-#undef TEST_ENTRY
+TEST_F(OpProdIntOutTest, SmokeTest) {
+  TensorFactory<ScalarType::Float> tfFloat;
+
+  Tensor self = tfFloat.make({2, 3}, {1, 2, 3, 4, 5, 6});
+  int64_t dim = 0;
+  bool keepdim = false;
+  optional<ScalarType> dtype{};
+  Tensor out = tfFloat.zeros({3});
+  Tensor out_expected = tfFloat.make({3}, {4, 10, 18});
+  op_prod_int_out(self, dim, keepdim, dtype, out);
+  EXPECT_TENSOR_CLOSE(out, out_expected);
 }
 
 TEST_F(OpProdIntOutTest, SmokeTestKeepdim) {