Remove false positive error message in the executor_runner

Author: ykhrustalev

kernels/portable/cpu/util/dtype_util.cpp

@@ -28,17 +28,14 @@ bool check_tensor_dtype(
     case SupportedTensorDtypes::INTB:
       return executorch::runtime::tensor_is_integral_type(t, true);
     case SupportedTensorDtypes::BOOL_OR_BYTE:
-      return (
-          executorch::runtime::tensor_is_type(t, ScalarType::Bool) ||
-          executorch::runtime::tensor_is_type(t, ScalarType::Byte));
+      return (executorch::runtime::tensor_is_type(
+          t, {ScalarType::Bool, ScalarType::Byte}));
     case SupportedTensorDtypes::SAME_AS_COMPUTE:
       return executorch::runtime::tensor_is_type(t, compute_type);
     case SupportedTensorDtypes::SAME_AS_COMMON: {
       if (compute_type == ScalarType::Float) {
-        return (
-            executorch::runtime::tensor_is_type(t, ScalarType::Float) ||
-            executorch::runtime::tensor_is_type(t, ScalarType::Half) ||
-            executorch::runtime::tensor_is_type(t, ScalarType::BFloat16));
+        return (executorch::runtime::tensor_is_type(
+            t, {ScalarType::Float, ScalarType::Half, ScalarType::BFloat16}));
       } else {
         return executorch::runtime::tensor_is_type(t, compute_type);
       }

runtime/core/exec_aten/util/tensor_util.h

@@ -14,6 +14,8 @@
 #include <cmath>
 #include <cstddef> // size_t
 #include <limits>
+#include <sstream>
+#include <vector>
 
 #include <executorch/runtime/core/array_ref.h>
 #include <executorch/runtime/core/error.h>
@@ -484,6 +486,30 @@ inline bool tensor_is_type(
   return true;
 }
 
+inline bool tensor_is_type(
+    executorch::aten::Tensor t,
+    const std::vector<executorch::aten::ScalarType>& dtypes) {
+  if (std::find(dtypes.begin(), dtypes.end(), t.scalar_type()) !=
+      dtypes.end()) {
+    return true;
+  }
+
+  std::stringstream dtype_ss;
+  for (size_t i = 0; i < dtypes.size(); i++) {
+    if (i != 0) {
+      dtype_ss << ", ";
+    }
+    dtype_ss << torch::executor::toString(dtypes[i]);
+  }
+
+  ET_LOG_MSG_AND_RETURN_IF_FALSE(
+      false,
+      "Expected to find one of %s types, but tensor has type %s",
+      dtype_ss.str().c_str(),
+      torch::executor::toString(t.scalar_type()));
+  return false;
+}
+
 inline bool tensor_is_integral_type(
     executorch::aten::Tensor t,
     bool includeBool = false) {