Skip to content

Commit fd1ce98

Browse files
authored
[CI] Split mteb test from Language Models Test (#24634)
Signed-off-by: wang.yuqi <[email protected]>
1 parent d11ec12 commit fd1ce98

16 files changed

+56
-40
lines changed

.buildkite/test-pipeline.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,16 @@ steps:
642642
commands:
643643
- pytest -v -s models/language/pooling -m 'not core_model'
644644

645+
- label: Language Models Test (MTEB)
646+
timeout_in_minutes: 110
647+
mirror_hardwares: [amdexperimental]
648+
optional: true
649+
source_file_dependencies:
650+
- vllm/
651+
- tests/models/language/pooling_mteb_test
652+
commands:
653+
- pytest -v -s models/language/pooling_mteb_test
654+
645655
- label: Multi-Modal Processor Test # 44min
646656
timeout_in_minutes: 60
647657
source_file_dependencies:

tests/entrypoints/pooling/correctness/test_mteb_embed.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44

55
import pytest
66

7-
from tests.models.language.pooling.mteb_utils import (MTEB_EMBED_TASKS,
8-
MTEB_EMBED_TOL,
9-
OpenAIClientMtebEncoder,
10-
run_mteb_embed_task)
7+
from tests.models.language.pooling_mteb_test.mteb_utils import (
8+
MTEB_EMBED_TASKS, MTEB_EMBED_TOL, OpenAIClientMtebEncoder,
9+
run_mteb_embed_task)
1110
from tests.utils import RemoteOpenAIServer
1211

1312
os.environ["VLLM_LOGGING_LEVEL"] = "WARNING"

tests/entrypoints/pooling/correctness/test_mteb_score.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@
44

55
import pytest
66

7-
# yapf conflicts with isort for this block
8-
# yapf: disable
9-
from tests.models.language.pooling.mteb_utils import (MTEB_RERANK_LANGS,
10-
MTEB_RERANK_TASKS,
11-
MTEB_RERANK_TOL,
12-
RerankClientMtebEncoder,
13-
ScoreClientMtebEncoder,
14-
run_mteb_rerank)
15-
# yapf: enable
7+
from tests.models.language.pooling_mteb_test.mteb_utils import (
8+
MTEB_RERANK_LANGS, MTEB_RERANK_TASKS, MTEB_RERANK_TOL,
9+
RerankClientMtebEncoder, ScoreClientMtebEncoder, run_mteb_rerank)
1610
from tests.utils import RemoteOpenAIServer
1711

1812
os.environ["VLLM_LOGGING_LEVEL"] = "WARNING"

tests/models/language/pooling_mteb_test/__init__.py

Whitespace-only changes.
File renamed without changes.

tests/models/language/pooling/test_baai.py renamed to tests/models/language/pooling_mteb_test/test_baai.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
33
import pytest
44

5-
from ...utils import (CLSPoolingEmbedModelInfo, CLSPoolingRerankModelInfo,
6-
EmbedModelInfo, LASTPoolingEmbedModelInfo,
7-
RerankModelInfo)
8-
from .embed_utils import correctness_test_embed_models
5+
from tests.models.language.pooling.embed_utils import (
6+
correctness_test_embed_models)
7+
from tests.models.utils import (CLSPoolingEmbedModelInfo,
8+
CLSPoolingRerankModelInfo, EmbedModelInfo,
9+
LASTPoolingEmbedModelInfo, RerankModelInfo)
10+
911
from .mteb_utils import mteb_test_embed_models, mteb_test_rerank_models
1012

1113
MODELS = [

tests/models/language/pooling/test_bge_reranker_v2_gemma.py renamed to tests/models/language/pooling_mteb_test/test_bge_reranker_v2_gemma.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import torch
88

99
from tests.conftest import HfRunner
10-
11-
from ...utils import LASTPoolingRerankModelInfo, RerankModelInfo
12-
from .mteb_utils import VllmMtebEncoder, mteb_test_rerank_models
10+
from tests.models.language.pooling_mteb_test.mteb_utils import (
11+
VllmMtebEncoder, mteb_test_rerank_models)
12+
from tests.models.utils import LASTPoolingRerankModelInfo, RerankModelInfo
1313

1414
RERANK_MODELS = [
1515
LASTPoolingRerankModelInfo("BAAI/bge-reranker-v2-gemma",

tests/models/language/pooling/test_cross_encoder.py renamed to tests/models/language/pooling_mteb_test/test_cross_encoder.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
33
import pytest
44

5-
from ...utils import (CLSPoolingRerankModelInfo, LASTPoolingRerankModelInfo,
6-
RerankModelInfo)
5+
from tests.models.utils import (CLSPoolingRerankModelInfo,
6+
LASTPoolingRerankModelInfo, RerankModelInfo)
7+
78
from .mteb_utils import mteb_test_rerank_models
89

910
RERANK_MODELS = [

tests/models/language/pooling/test_gte.py renamed to tests/models/language/pooling_mteb_test/test_gte.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33

44
import pytest
55

6-
from ...utils import (CLSPoolingEmbedModelInfo, CLSPoolingRerankModelInfo,
7-
EmbedModelInfo, LASTPoolingEmbedModelInfo,
8-
RerankModelInfo)
9-
from .embed_utils import correctness_test_embed_models
6+
from tests.models.language.pooling.embed_utils import (
7+
correctness_test_embed_models)
8+
from tests.models.utils import (CLSPoolingEmbedModelInfo,
9+
CLSPoolingRerankModelInfo, EmbedModelInfo,
10+
LASTPoolingEmbedModelInfo, RerankModelInfo)
11+
1012
from .mteb_utils import mteb_test_embed_models, mteb_test_rerank_models
1113

1214
MODELS = [

tests/models/language/pooling/test_intfloat.py renamed to tests/models/language/pooling_mteb_test/test_intfloat.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
33
import pytest
44

5-
from ...utils import CLSPoolingEmbedModelInfo, EmbedModelInfo
6-
from .embed_utils import correctness_test_embed_models
5+
from tests.models.language.pooling.embed_utils import (
6+
correctness_test_embed_models)
7+
from tests.models.utils import CLSPoolingEmbedModelInfo, EmbedModelInfo
8+
79
from .mteb_utils import mteb_test_embed_models
810

911
MODELS = [

0 commit comments

Comments
 (0)