fix: Revert order changes for Falcon H1 to stay consistent with upstream

Branch: GraniteFour

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>

Author: gabe-l-hart

gguf-py/gguf/constants.py

@@ -603,7 +603,6 @@ class MODEL_TENSOR(IntEnum):
     MODEL_ARCH.LLAMA4:             "llama4",
     MODEL_ARCH.DECI:               "deci",
     MODEL_ARCH.FALCON:             "falcon",
-    MODEL_ARCH.FALCON_H1:          "falcon-h1",
     MODEL_ARCH.BAICHUAN:           "baichuan",
     MODEL_ARCH.GROK:               "grok",
     MODEL_ARCH.GPT2:               "gpt2",
@@ -676,6 +675,7 @@ class MODEL_TENSOR(IntEnum):
     MODEL_ARCH.DOTS1:              "dots1",
     MODEL_ARCH.ARCEE:              "arcee",
     MODEL_ARCH.ERNIE4_5:           "ernie4_5",
+    MODEL_ARCH.FALCON_H1:          "falcon-h1",
     MODEL_ARCH.HUNYUAN_MOE:        "hunyuan-moe",
     MODEL_ARCH.SMOLLM3:            "smollm3",
 }

src/llama-arch.cpp

@@ -9,7 +9,6 @@ static const std::map<llm_arch, const char *> LLM_ARCH_NAMES = {
     { LLM_ARCH_LLAMA4,             "llama4"           },
     { LLM_ARCH_DECI,               "deci"             },
     { LLM_ARCH_FALCON,             "falcon"           },
-    { LLM_ARCH_FALCON_H1,          "falcon-h1"        },
     { LLM_ARCH_GROK,               "grok"             },
     { LLM_ARCH_GPT2,               "gpt2"             },
     { LLM_ARCH_GPTJ,               "gptj"             },
@@ -48,6 +47,7 @@ static const std::map<llm_arch, const char *> LLM_ARCH_NAMES = {
     { LLM_ARCH_MAMBA,              "mamba"            },
     { LLM_ARCH_MAMBA2,             "mamba2"           },
     { LLM_ARCH_JAMBA,              "jamba"            },
+    { LLM_ARCH_FALCON_H1,          "falcon-h1"        },
     { LLM_ARCH_BAMBA,              "bamba"            },
     { LLM_ARCH_XVERSE,             "xverse"           },
     { LLM_ARCH_COMMAND_R,          "command-r"        },
@@ -364,30 +364,6 @@ static const std::map<llm_arch, std::map<llm_tensor, const char *>> LLM_TENSOR_N
             { LLM_TENSOR_FFN_UP,          "blk.%d.ffn_up" },
         },
     },
-    {
-        LLM_ARCH_FALCON_H1,
-        {
-            { LLM_TENSOR_TOKEN_EMBD,      "token_embd" },
-            { LLM_TENSOR_OUTPUT,          "output" },
-            { LLM_TENSOR_OUTPUT_NORM,     "output_norm" },
-            { LLM_TENSOR_ATTN_NORM,       "blk.%d.attn_norm" },
-            { LLM_TENSOR_ATTN_Q,          "blk.%d.attn_q" },
-            { LLM_TENSOR_ATTN_K,          "blk.%d.attn_k" },
-            { LLM_TENSOR_ATTN_V,          "blk.%d.attn_v" },
-            { LLM_TENSOR_ATTN_OUT,        "blk.%d.attn_output" },
-            { LLM_TENSOR_SSM_IN,          "blk.%d.ssm_in" },
-            { LLM_TENSOR_SSM_CONV1D,      "blk.%d.ssm_conv1d" },
-            { LLM_TENSOR_SSM_DT,          "blk.%d.ssm_dt" },
-            { LLM_TENSOR_SSM_A,           "blk.%d.ssm_a" },
-            { LLM_TENSOR_SSM_D,           "blk.%d.ssm_d" },
-            { LLM_TENSOR_SSM_NORM,        "blk.%d.ssm_norm" },
-            { LLM_TENSOR_SSM_OUT,         "blk.%d.ssm_out" },
-            { LLM_TENSOR_FFN_NORM,        "blk.%d.ffn_norm" },
-            { LLM_TENSOR_FFN_GATE,        "blk.%d.ffn_gate" },
-            { LLM_TENSOR_FFN_DOWN,        "blk.%d.ffn_down" },
-            { LLM_TENSOR_FFN_UP,          "blk.%d.ffn_up" },
-        },
-    },
     {
         LLM_ARCH_GROK,
         {
@@ -1083,6 +1059,30 @@ static const std::map<llm_arch, std::map<llm_tensor, const char *>> LLM_TENSOR_N
             { LLM_TENSOR_FFN_UP_EXPS,     "blk.%d.ffn_up_exps" },
         },
     },
+    {
+        LLM_ARCH_FALCON_H1,
+        {
+            { LLM_TENSOR_TOKEN_EMBD,      "token_embd" },
+            { LLM_TENSOR_OUTPUT,          "output" },
+            { LLM_TENSOR_OUTPUT_NORM,     "output_norm" },
+            { LLM_TENSOR_ATTN_NORM,       "blk.%d.attn_norm" },
+            { LLM_TENSOR_ATTN_Q,          "blk.%d.attn_q" },
+            { LLM_TENSOR_ATTN_K,          "blk.%d.attn_k" },
+            { LLM_TENSOR_ATTN_V,          "blk.%d.attn_v" },
+            { LLM_TENSOR_ATTN_OUT,        "blk.%d.attn_output" },
+            { LLM_TENSOR_SSM_IN,          "blk.%d.ssm_in" },
+            { LLM_TENSOR_SSM_CONV1D,      "blk.%d.ssm_conv1d" },
+            { LLM_TENSOR_SSM_DT,          "blk.%d.ssm_dt" },
+            { LLM_TENSOR_SSM_A,           "blk.%d.ssm_a" },
+            { LLM_TENSOR_SSM_D,           "blk.%d.ssm_d" },
+            { LLM_TENSOR_SSM_NORM,        "blk.%d.ssm_norm" },
+            { LLM_TENSOR_SSM_OUT,         "blk.%d.ssm_out" },
+            { LLM_TENSOR_FFN_NORM,        "blk.%d.ffn_norm" },
+            { LLM_TENSOR_FFN_GATE,        "blk.%d.ffn_gate" },
+            { LLM_TENSOR_FFN_DOWN,        "blk.%d.ffn_down" },
+            { LLM_TENSOR_FFN_UP,          "blk.%d.ffn_up" },
+        },
+    },
     {
         LLM_ARCH_BAMBA,
         {
@@ -2099,8 +2099,8 @@ bool llm_arch_is_recurrent(const llm_arch & arch) {
 
 bool llm_arch_is_hybrid(const llm_arch & arch) {
     switch (arch) {
-        case LLM_ARCH_FALCON_H1:
         case LLM_ARCH_JAMBA:
+        case LLM_ARCH_FALCON_H1:
         case LLM_ARCH_BAMBA:
         case LLM_ARCH_GRANITE_MOE_HYBRID:
             return true;

src/llama-arch.h

@@ -13,7 +13,6 @@ enum llm_arch {
     LLM_ARCH_LLAMA4,
     LLM_ARCH_DECI,
     LLM_ARCH_FALCON,
-    LLM_ARCH_FALCON_H1,
     LLM_ARCH_BAICHUAN,
     LLM_ARCH_GROK,
     LLM_ARCH_GPT2,
@@ -52,6 +51,7 @@ enum llm_arch {
     LLM_ARCH_MAMBA,
     LLM_ARCH_MAMBA2,
     LLM_ARCH_JAMBA,
+    LLM_ARCH_FALCON_H1,
     LLM_ARCH_BAMBA,
     LLM_ARCH_XVERSE,
     LLM_ARCH_COMMAND_R,