From 2de1e6871f99d324ebfa703495cb06a6ed0a2521 Mon Sep 17 00:00:00 2001 From: Sam Malayek Date: Sun, 2 Nov 2025 13:55:01 -0800 Subject: [PATCH] Increase scope of embedding cli tests --- .../{embeddings.yml => embedding.yml} | 26 ++++++++++++------- examples/tests/__init__.py | 0 .../e2e/embedding/test_embedding_cli.py | 10 ++++--- 3 files changed, 23 insertions(+), 13 deletions(-) rename .github/workflows/{embeddings.yml => embedding.yml} (71%) delete mode 100644 examples/tests/__init__.py rename examples/tests/test_embedding.py => tests/e2e/embedding/test_embedding_cli.py (98%) diff --git a/.github/workflows/embeddings.yml b/.github/workflows/embedding.yml similarity index 71% rename from .github/workflows/embeddings.yml rename to .github/workflows/embedding.yml index c530a696d6..db566b36d5 100644 --- a/.github/workflows/embeddings.yml +++ b/.github/workflows/embedding.yml @@ -4,19 +4,25 @@ name: Embedding CLI on: workflow_dispatch: push: - branches: - - feature/* - - master + branches: [master, feature/**] paths: - - '.github/workflows/embeddings.yml' - - 'examples/embedding/**' - - 'examples/tests/**' + - '.github/workflows/embedding.yml' + - 'examples/**' + - 'src/**' + - 'ggml/**' + - 'include/**' + - '**/CMakeLists.txt' + - 'tests/e2e/embedding/**' pull_request: types: [opened, synchronize, reopened] paths: - - '.github/workflows/embeddings.yml' - - 'examples/embedding/**' - - 'examples/tests/**' + - '.github/workflows/embedding.yml' + - 'examples/**' + - 'src/**' + - 'ggml/**' + - 'include/**' + - '**/CMakeLists.txt' + - 'tests/e2e/embedding/**' jobs: embedding-cli-tests: @@ -56,4 +62,4 @@ jobs: - name: Run embedding tests run: | - pytest -v examples/tests + pytest -v tests/e2e/embedding diff --git a/examples/tests/__init__.py b/examples/tests/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/examples/tests/test_embedding.py b/tests/e2e/embedding/test_embedding_cli.py similarity index 98% rename from examples/tests/test_embedding.py rename to tests/e2e/embedding/test_embedding_cli.py index 414b01d4d4..cf4731d6bf 100644 --- a/examples/tests/test_embedding.py +++ b/tests/e2e/embedding/test_embedding_cli.py @@ -1,14 +1,17 @@ -import os, json, subprocess, hashlib +import json +import hashlib +import os +import pytest +import subprocess from pathlib import Path import numpy as np -import pytest # --------------------------------------------------------------------------- # Configuration constants # --------------------------------------------------------------------------- EPS = 1e-3 -REPO_ROOT = Path(__file__).resolve().parents[2] +REPO_ROOT = Path(__file__).resolve().parents[3] EXE = REPO_ROOT / ("build/bin/llama-embedding.exe" if os.name == "nt" else "build/bin/llama-embedding") DEFAULT_ENV = {**os.environ, "LLAMA_CACHE": os.environ.get("LLAMA_CACHE", "tmp")} SEED = "42" @@ -96,6 +99,7 @@ def embedding_hash(vec: np.ndarray) -> str: # Register custom mark so pytest doesn't warn about it pytestmark = pytest.mark.filterwarnings("ignore::pytest.PytestUnknownMarkWarning") + @pytest.mark.slow @pytest.mark.parametrize("fmt", ["raw", "json"]) @pytest.mark.parametrize("text", ["hello world", "hi 🌎", "line1\nline2\nline3"])