diff --git a/.buildkite/test_areas/entrypoints.yaml b/.buildkite/test_areas/entrypoints.yaml index ddd25190b8..5f8e1d1c35 100644 --- a/.buildkite/test_areas/entrypoints.yaml +++ b/.buildkite/test_areas/entrypoints.yaml @@ -230,10 +230,10 @@ steps: depends_on: - image-build-amd -- label: ":nvidia: (H200 MIG 35GB) Entrypoints Integration (Pooling Scoring Cross Encoder)" +- label: ":nvidia: (H200 MIG 35GB) Entrypoints Integration (Pooling)" device: h200_35gb - key: entrypoints-integration-pooling-scoring-cross-encoder - timeout_in_minutes: 25 + key: entrypoints-integration-pooling + timeout_in_minutes: 75 working_dir: "/vllm-workspace/tests" source_file_dependencies: - vllm/ @@ -241,81 +241,13 @@ steps: - tests/entrypoints/pooling commands: - export VLLM_WORKER_MULTIPROC_METHOD=spawn - - pytest -v -s entrypoints/pooling/scoring/cross_encoder + - pytest -v -s entrypoints/pooling mirror: amd: - label: ":amd: (MI355 DPX) Entrypoints Integration (Pooling Scoring Cross Encoder)" + label: ":amd: (MI355 DPX) Entrypoints Integration (Pooling)" dind: false device: mi355_dpx - timeout_in_minutes: 30 - working_dir: "/vllm-workspace/tests" - depends_on: - - image-build-amd - -- label: ":nvidia: (H200 MIG 35GB) Entrypoints Integration (Pooling Scoring Bi-Encoder and Late Interaction)" - device: h200_35gb - key: entrypoints-integration-pooling-scoring-bi-encoder-late-interaction - timeout_in_minutes: 25 - working_dir: "/vllm-workspace/tests" - source_file_dependencies: - - vllm/ - - "!vllm/distributed/kv_transfer/" - - tests/entrypoints/pooling - commands: - - export VLLM_WORKER_MULTIPROC_METHOD=spawn - - pytest -v -s entrypoints/pooling/scoring/bi_encoder entrypoints/pooling/scoring/late_interaction entrypoints/pooling/scoring/unit - mirror: - amd: - label: ":amd: (MI355 DPX) Entrypoints Integration (Pooling Scoring Bi-Encoder and Late Interaction)" - dind: false - device: mi355_dpx - timeout_in_minutes: 30 - working_dir: "/vllm-workspace/tests" - depends_on: - - image-build-amd - -- label: ":nvidia: (H200 MIG 35GB) Entrypoints Integration (Pooling Embed)" - device: h200_35gb - key: entrypoints-integration-pooling-embed - timeout_in_minutes: 35 - working_dir: "/vllm-workspace/tests" - source_file_dependencies: - - vllm/ - - "!vllm/distributed/kv_transfer/" - - tests/entrypoints/pooling - commands: - - export VLLM_WORKER_MULTIPROC_METHOD=spawn - - pytest -v -s entrypoints/pooling/embed - mirror: - amd: - label: ":amd: (MI355 DPX) Entrypoints Integration (Pooling Embed)" - dind: false - device: mi355_dpx - timeout_in_minutes: 35 - working_dir: "/vllm-workspace/tests" - depends_on: - - image-build-amd - -- label: ":nvidia: (H200 MIG 35GB) Entrypoints Integration (Pooling Basic, Classify, Reward and Token)" - device: h200_35gb - key: entrypoints-integration-pooling-basic-classify-reward-token - timeout_in_minutes: 35 - working_dir: "/vllm-workspace/tests" - source_file_dependencies: - - vllm/ - - "!vllm/distributed/kv_transfer/" - - tests/entrypoints/pooling - commands: - - export VLLM_WORKER_MULTIPROC_METHOD=spawn - - pytest -v -s entrypoints/pooling/basic entrypoints/pooling/classify entrypoints/pooling/reward entrypoints/pooling/token_classify entrypoints/pooling/token_embed - - "find entrypoints/pooling -maxdepth 1 -name 'test_*.py' | xargs -r pytest -v -s" - - "find entrypoints/pooling/scoring -maxdepth 1 -name 'test_*.py' | xargs -r pytest -v -s" - mirror: - amd: - label: ":amd: (MI355 DPX) Entrypoints Integration (Pooling Basic, Classify, Reward and Token)" - dind: false - device: mi355_dpx - timeout_in_minutes: 35 + timeout_in_minutes: 65 working_dir: "/vllm-workspace/tests" depends_on: - image-build-amd diff --git a/tests/entrypoints/pooling/scoring/bi_encoder/__init__.py b/tests/entrypoints/pooling/scoring/bi_encoder/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/entrypoints/pooling/scoring/cross_encoder/__init__.py b/tests/entrypoints/pooling/scoring/cross_encoder/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/entrypoints/pooling/scoring/late_interaction/__init__.py b/tests/entrypoints/pooling/scoring/late_interaction/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/entrypoints/pooling/scoring/bi_encoder/test_bi_encoder_offline.py b/tests/entrypoints/pooling/scoring/test_bi_encoder_offline.py similarity index 100% rename from tests/entrypoints/pooling/scoring/bi_encoder/test_bi_encoder_offline.py rename to tests/entrypoints/pooling/scoring/test_bi_encoder_offline.py diff --git a/tests/entrypoints/pooling/scoring/bi_encoder/test_bi_encoder_online.py b/tests/entrypoints/pooling/scoring/test_bi_encoder_online.py similarity index 100% rename from tests/entrypoints/pooling/scoring/bi_encoder/test_bi_encoder_online.py rename to tests/entrypoints/pooling/scoring/test_bi_encoder_online.py diff --git a/tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_correctness_mteb.py b/tests/entrypoints/pooling/scoring/test_cross_encoder_correctness_mteb.py similarity index 100% rename from tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_correctness_mteb.py rename to tests/entrypoints/pooling/scoring/test_cross_encoder_correctness_mteb.py diff --git a/tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_offline.py b/tests/entrypoints/pooling/scoring/test_cross_encoder_offline.py similarity index 100% rename from tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_offline.py rename to tests/entrypoints/pooling/scoring/test_cross_encoder_offline.py diff --git a/tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_online.py b/tests/entrypoints/pooling/scoring/test_cross_encoder_online.py similarity index 100% rename from tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_online.py rename to tests/entrypoints/pooling/scoring/test_cross_encoder_online.py diff --git a/tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_online_vision.py b/tests/entrypoints/pooling/scoring/test_cross_encoder_online_vision.py similarity index 100% rename from tests/entrypoints/pooling/scoring/cross_encoder/test_cross_encoder_online_vision.py rename to tests/entrypoints/pooling/scoring/test_cross_encoder_online_vision.py diff --git a/tests/entrypoints/pooling/scoring/unit/test_io_processor_unit.py b/tests/entrypoints/pooling/scoring/test_io_processor_unit.py similarity index 100% rename from tests/entrypoints/pooling/scoring/unit/test_io_processor_unit.py rename to tests/entrypoints/pooling/scoring/test_io_processor_unit.py diff --git a/tests/entrypoints/pooling/scoring/unit/test_jina_ranking_io_processor_unit.py b/tests/entrypoints/pooling/scoring/test_jina_ranking_io_processor_unit.py similarity index 100% rename from tests/entrypoints/pooling/scoring/unit/test_jina_ranking_io_processor_unit.py rename to tests/entrypoints/pooling/scoring/test_jina_ranking_io_processor_unit.py diff --git a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_offline.py b/tests/entrypoints/pooling/scoring/test_late_interaction_offline.py similarity index 98% rename from tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_offline.py rename to tests/entrypoints/pooling/scoring/test_late_interaction_offline.py index 7e66dcf5c6..b39aa7abb9 100644 --- a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_offline.py +++ b/tests/entrypoints/pooling/scoring/test_late_interaction_offline.py @@ -5,7 +5,7 @@ import weakref import pytest -from ..util import ColBERTScoringHfRunner +from .util import ColBERTScoringHfRunner MODEL_NAME = "answerdotai/answerai-colbert-small-v1" COLBERT_DIM = 96 diff --git a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_offline_vision.py b/tests/entrypoints/pooling/scoring/test_late_interaction_offline_vision.py similarity index 97% rename from tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_offline_vision.py rename to tests/entrypoints/pooling/scoring/test_late_interaction_offline_vision.py index 0340a50510..ca7843f8cf 100644 --- a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_offline_vision.py +++ b/tests/entrypoints/pooling/scoring/test_late_interaction_offline_vision.py @@ -5,7 +5,7 @@ import weakref import pytest -from ..util import make_base64_image, make_image_mm_param +from .util import make_base64_image, make_image_mm_param MODEL_NAME = "vidore/colpali-v1.3-hf" diff --git a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_online.py b/tests/entrypoints/pooling/scoring/test_late_interaction_online.py similarity index 99% rename from tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_online.py rename to tests/entrypoints/pooling/scoring/test_late_interaction_online.py index 6c8daa1256..51ef85c0d7 100644 --- a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_online.py +++ b/tests/entrypoints/pooling/scoring/test_late_interaction_online.py @@ -8,7 +8,7 @@ import requests from tests.utils import RemoteOpenAIServer from vllm.entrypoints.pooling.scoring.protocol import RerankResponse, ScoreResponse -from ..util import ColBERTScoringHfRunner +from .util import ColBERTScoringHfRunner MODEL_NAME = "answerdotai/answerai-colbert-small-v1" COLBERT_DIM = 96 diff --git a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_online_vision.py b/tests/entrypoints/pooling/scoring/test_late_interaction_online_vision.py similarity index 100% rename from tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_online_vision.py rename to tests/entrypoints/pooling/scoring/test_late_interaction_online_vision.py diff --git a/tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_serving.py b/tests/entrypoints/pooling/scoring/test_late_interaction_serving.py similarity index 100% rename from tests/entrypoints/pooling/scoring/late_interaction/test_late_interaction_serving.py rename to tests/entrypoints/pooling/scoring/test_late_interaction_serving.py diff --git a/tests/entrypoints/pooling/scoring/unit/test_utils.py b/tests/entrypoints/pooling/scoring/test_utils.py similarity index 100% rename from tests/entrypoints/pooling/scoring/unit/test_utils.py rename to tests/entrypoints/pooling/scoring/test_utils.py diff --git a/tests/entrypoints/pooling/scoring/unit/__init__.py b/tests/entrypoints/pooling/scoring/unit/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/entrypoints/pooling/basic/test_factories.py b/tests/entrypoints/pooling/test_factories.py similarity index 100% rename from tests/entrypoints/pooling/basic/test_factories.py rename to tests/entrypoints/pooling/test_factories.py diff --git a/tests/entrypoints/pooling/basic/test_io_processor.py b/tests/entrypoints/pooling/test_io_processor.py similarity index 100% rename from tests/entrypoints/pooling/basic/test_io_processor.py rename to tests/entrypoints/pooling/test_io_processor.py diff --git a/tests/entrypoints/pooling/basic/test_utils.py b/tests/entrypoints/pooling/test_utils.py similarity index 100% rename from tests/entrypoints/pooling/basic/test_utils.py rename to tests/entrypoints/pooling/test_utils.py