Merge branch 'main' into xpu

Author: yao-matrix

mergekit/moe/mixtral.py

@@ -9,7 +9,7 @@
 import transformers
 
 from mergekit.architecture import WeightInfo
-from mergekit.architecture.mixtral import MISTRAL_INFO
+from mergekit.architecture.moe_defs import MISTRAL_INFO
 from mergekit.moe.arch import MoEOutputArchitecture
 from mergekit.moe.common import copy_tensor_out, initialize_io, select_dtype
 from mergekit.moe.config import MoEMergeConfig