Fixes conflicts with new upstream changes

Signed-off-by: Flavia Beo <[email protected]>
vllm-project · Nov 12, 2024 · 971acea · 971acea
1 parent 5b75f4a
commit 971acea
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/vllm/model_executor/models/bert.py b/vllm/model_executor/models/bert.py
@@ -305,17 +305,17 @@ def forward(self, hidden_states: torch.Tensor,
 
 class BertModel(nn.Module):
 
-    def __init__(self, *, 
-                 vllm_config: VllmConfig, 
+    def __init__(self, 
+                 *, 
+                 config: BertConfig,
+                 vllm_config: VllmConfig,
                  prefix: str = "",
                  embedding_class: type = BertEmbedding):
         super().__init__()
-        self.embeddings = embedding_class(config)
         config = vllm_config.model_config.hf_config
         cache_config = vllm_config.cache_config
         quant_config = vllm_config.quant_config
-
-        self.embeddings = BertEmbedding(config)
+        self.embeddings = embedding_class(config)
         self.encoder = BertEncoder(config,
                                    cache_config,
                                    quant_config,