Data type independent tensor attribute hashing and comparison

Author: n-v-k

onnxruntime/core/optimizer/common_subexpression_elimination.cc

@@ -172,12 +172,9 @@ bool AreRangesEqual(const Range& lhs, const Range& rhs) {
 }
 
 // Check if two tensor attributes are equal scalar tensors, mainly to support ConstantOfShape Op.
-// Currently support float, float16 and int64 data types.
 bool AreScalarTensorAttributeEqual(const ONNX_NAMESPACE::TensorProto& lhs_t, const ONNX_NAMESPACE::TensorProto& rhs_t) {
   if (!(utils::HasDataType(lhs_t) && utils::HasDataType(rhs_t) && lhs_t.data_type() == rhs_t.data_type() &&
-        (lhs_t.data_type() == onnx::TensorProto_DataType_FLOAT ||
-         lhs_t.data_type() == onnx::TensorProto_DataType_FLOAT16 ||
-         lhs_t.data_type() == onnx::TensorProto_DataType_INT64) &&
+        lhs_t.data_type() != onnx::TensorProto_DataType_STRING &&
         lhs_t.dims_size() == 1 && rhs_t.dims_size() == 1 && lhs_t.dims()[0] == 1 && rhs_t.dims()[0] == 1)) {
     return false;
   }
@@ -227,24 +224,16 @@ bool AreEqual(const ONNX_NAMESPACE::AttributeProto& lhs, const ONNX_NAMESPACE::A
   return false;
 }
 
-// Support scalar float/int64/fp16 tensor attribute only for now.
+// Support scalar tensor attribute only for now.
 std::size_t GetTensorAttributeHash(const ONNX_NAMESPACE::TensorProto& attr_t) {
   std::size_t hash = 0;
   if (utils::HasDataType(attr_t) && attr_t.dims_size() == 1 && attr_t.dims()[0] == 1) {
     int data_type = attr_t.data_type();
-    switch (data_type) {
-      case onnx::TensorProto_DataType_FLOAT:
-      case onnx::TensorProto_DataType_FLOAT16:
-      case onnx::TensorProto_DataType_INT64: {
-        std::vector<uint8_t> unpacked_tensor;
-        if (utils::UnpackInitializerData(attr_t, unpacked_tensor).IsOK()) {
-          UpdateHash(data_type, hash);
-          UpdateHashWithContainer(unpacked_tensor, hash);
-        }
-        break;
-      }
-      default:
-        break;
+    ORT_ENFORCE(data_type != onnx::TensorProto_DataType_STRING, "Unexpected tensor string type");
+    std::vector<uint8_t> unpacked_tensor;
+    if (utils::UnpackInitializerData(attr_t, unpacked_tensor).IsOK()) {
+      UpdateHash(data_type, hash);
+      UpdateHashWithContainer(unpacked_tensor, hash);
     }
   }
   return hash;