fix

Author: noooop

tests/models/embedding/language/test_snowflake_arctic_embed.py

@@ -15,18 +15,38 @@
 ]
 
 MODELS = [
-    EmbedModelInfo("Snowflake/snowflake-arctic-embed-xs", is_matryoshka=False),
-    EmbedModelInfo("Snowflake/snowflake-arctic-embed-s", is_matryoshka=False),
-    EmbedModelInfo("Snowflake/snowflake-arctic-embed-m", is_matryoshka=False),
+    EmbedModelInfo("Snowflake/snowflake-arctic-embed-xs",
+                   is_matryoshka=False,
+                   architecture="BertModel",
+                   enable_ci_test=True),
+    EmbedModelInfo("Snowflake/snowflake-arctic-embed-s",
+                   is_matryoshka=False,
+                   architecture="BertModel",
+                   enable_ci_test=False),
+    EmbedModelInfo("Snowflake/snowflake-arctic-embed-m",
+                   is_matryoshka=False,
+                   architecture="BertModel",
+                   enable_ci_test=False),
     EmbedModelInfo("Snowflake/snowflake-arctic-embed-m-long",
-                   is_matryoshka=False),
-    EmbedModelInfo("Snowflake/snowflake-arctic-embed-l", is_matryoshka=False),
+                   is_matryoshka=False,
+                   architecture="NomicBertModel",
+                   enable_ci_test=True),
+    EmbedModelInfo("Snowflake/snowflake-arctic-embed-l",
+                   is_matryoshka=False,
+                   architecture="BertModel",
+                   enable_ci_test=False),
     EmbedModelInfo("Snowflake/snowflake-arctic-embed-m-v1.5",
-                   is_matryoshka=True),
+                   is_matryoshka=True,
+                   architecture="BertModel",
+                   enable_ci_test=True),
     EmbedModelInfo("Snowflake/snowflake-arctic-embed-l-v2.0",
-                   is_matryoshka=True),
+                   is_matryoshka=True,
+                   architecture="XLMRobertaModel",
+                   enable_ci_test=True),
     EmbedModelInfo("Snowflake/snowflake-arctic-embed-m-v2.0",
-                   is_matryoshka=True),
+                   is_matryoshka=True,
+                   architecture="GteModel",
+                   enable_ci_test=True),
 ]
 
 
@@ -40,6 +60,10 @@ def test_models(
     dtype: str,
     monkeypatch,
 ) -> None:
+    if not model_info.enable_ci_test:
+        # A model family has many models with the same architecture,
+        # and we don't need to test each one.
+        pytest.skip("Skipping CI test.")
 
     example_prompts = example_prompts + EMBEDDING_PROMPTS
 
@@ -62,6 +86,10 @@ def test_models(
         assert (vllm_model.model.llm_engine.model_config.is_matryoshka ==
                 model_info.is_matryoshka)
 
+        if model_info.architecture:
+            assert (model_info.architecture
+                    in vllm_model.model.llm_engine.model_config.architectures)
+
         vllm_outputs = vllm_model.encode(example_prompts)
 
     check_embeddings_close(

tests/models/embedding/utils.py

@@ -42,4 +42,6 @@ def matryoshka_fy(tensor, dimensions):
 
 class EmbedModelInfo(NamedTuple):
     name: str
-    is_matryoshka: bool
+    is_matryoshka: bool
+    architecture: str = ""
+    enable_ci_test: bool = True

vllm/model_executor/models/bert.py

@@ -414,6 +414,15 @@ def __init__(self,
                  rotary_kwargs: Optional[dict] = None,
                  add_pooling_layer: bool = False):
         super().__init__()
+        """
+        For BertModel, all linear layers have bias.
+        For NomicBertModel, all linear layers do not have bias, 
+            the bias parameter intended to control all linear layers.
+        For GteModel, only up_gate_proj layer does not have bias, 
+            so the gate_up_proj_bias parameter must be added.
+        see #16649
+        """
+
         config = vllm_config.model_config.hf_config
         self.embeddings = embedding_class(config)
         self.encoder = BertEncoder(vllm_config=vllm_config,