Fix MHSA requant fields needing to be ints when single item and tuples when multiitem

Author: lukamac

Deeploy/OperatorDescriptor.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from enum import Enum, IntEnum
-from typing import Any, Dict, Tuple
+from typing import Any, Dict, Tuple, Union
 
 import numpy as np
 import onnx_graphsurgeon as gs
@@ -51,6 +51,13 @@ def FloatTupleUnpack(value: Any) -> Tuple[float, ...]:
         return (FloatUnpack(value),)
 
 
+def IntTupleIfNotSingleItemUnpack(value: Any) -> Union[int, Tuple[int, ...]]:
+    try:
+        return IntUnpack(value)
+    except:
+        return IntTupleUnpack(value)
+
+
 def attrToTensor(node: gs.Node, attr: str) -> None:
     values = node.attrs[attr]
     if isinstance(values, (int, float)):
@@ -609,18 +616,18 @@ def canonicalize(self, node: gs.Node, opset: int) -> bool:
          "wo_bias"]),
     outputDescriptor = IoDesc("data_out"),
     attrDescriptors = [
-        AttrDesc("preattn_requant_mul", IntUnpack),
-        AttrDesc("preattn_requant_div", IntUnpack),
-        AttrDesc("postattn_requant_mul", IntUnpack),
-        AttrDesc("postattn_requant_div", IntUnpack),
-        AttrDesc("wo_requant_mul", IntUnpack),
-        AttrDesc("wo_requant_div", IntUnpack),
-        AttrDesc("wq_requant_mul", IntUnpack),
-        AttrDesc("wq_requant_div", IntUnpack),
-        AttrDesc("wk_requant_mul", IntUnpack),
-        AttrDesc("wk_requant_div", IntUnpack),
-        AttrDesc("wv_requant_mul", IntUnpack),
-        AttrDesc("wv_requant_div", IntUnpack),
+        AttrDesc("preattn_requant_mul", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("preattn_requant_div", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("postattn_requant_mul", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("postattn_requant_div", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wo_requant_mul", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wo_requant_div", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wq_requant_mul", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wq_requant_div", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wk_requant_mul", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wk_requant_div", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wv_requant_mul", IntTupleIfNotSingleItemUnpack),
+        AttrDesc("wv_requant_div", IntTupleIfNotSingleItemUnpack),
         AttrDesc("n_levels", IntUnpack),
         AttrDesc("dim", IntUnpack),
         AttrDesc("dim_head", IntUnpack),