Unverified Commit c401c64b authored by Cyrus Leung's avatar Cyrus Leung Committed by GitHub
Browse files

[CI/Build] Fix model executor tests (#21387)


Signed-off-by: default avatarDarkLight1337 <tlleungac@connect.ust.hk>
parent b77c7d32
...@@ -434,7 +434,6 @@ steps: ...@@ -434,7 +434,6 @@ steps:
- label: Model Executor Test - label: Model Executor Test
mirror_hardwares: [amdexperimental, amdproduction] mirror_hardwares: [amdexperimental, amdproduction]
soft_fail: true
source_file_dependencies: source_file_dependencies:
- vllm/model_executor - vllm/model_executor
- tests/model_executor - tests/model_executor
......
...@@ -5,7 +5,8 @@ import os ...@@ -5,7 +5,8 @@ import os
import pytest import pytest
from vllm.model_executor.layers.pooler import CLSPool, MeanPool, PoolingType from vllm.model_executor.layers.pooler import (CLSPool, DispatchPooler,
MeanPool, PoolingType)
from vllm.model_executor.models.bert import BertEmbeddingModel from vllm.model_executor.models.bert import BertEmbeddingModel
from vllm.model_executor.models.roberta import RobertaEmbeddingModel from vllm.model_executor.models.roberta import RobertaEmbeddingModel
from vllm.platforms import current_platform from vllm.platforms import current_platform
...@@ -49,7 +50,8 @@ def test_model_loading_with_params(vllm_runner): ...@@ -49,7 +50,8 @@ def test_model_loading_with_params(vllm_runner):
def check_model(model): def check_model(model):
assert isinstance(model, BertEmbeddingModel) assert isinstance(model, BertEmbeddingModel)
assert isinstance(model.pooler.pooling, CLSPool) assert isinstance(pooler := model.pooler, DispatchPooler)
assert isinstance(pooler.poolers_by_task["embed"].pooling, CLSPool)
vllm_model.apply_model(check_model) vllm_model.apply_model(check_model)
...@@ -87,7 +89,9 @@ def test_roberta_model_loading_with_params(vllm_runner): ...@@ -87,7 +89,9 @@ def test_roberta_model_loading_with_params(vllm_runner):
def check_model(model): def check_model(model):
assert isinstance(model, RobertaEmbeddingModel) assert isinstance(model, RobertaEmbeddingModel)
assert isinstance(model.pooler.pooling, MeanPool) assert isinstance(pooler := model.pooler, DispatchPooler)
assert isinstance(pooler.poolers_by_task["embed"].pooling,
MeanPool)
vllm_model.apply_model(check_model) vllm_model.apply_model(check_model)
...@@ -114,7 +118,8 @@ def test_facebook_roberta_model_loading_with_params(vllm_runner): ...@@ -114,7 +118,8 @@ def test_facebook_roberta_model_loading_with_params(vllm_runner):
def check_model(model): def check_model(model):
assert isinstance(model, RobertaEmbeddingModel) assert isinstance(model, RobertaEmbeddingModel)
assert not hasattr(model, "lm_head") assert not hasattr(model, "lm_head")
assert isinstance(model.pooler.pooling, CLSPool) assert isinstance(pooler := model.pooler, DispatchPooler)
assert isinstance(pooler.poolers_by_task["embed"].pooling, CLSPool)
vllm_model.apply_model(check_model) vllm_model.apply_model(check_model)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment