aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnur Gündüz <ogunduz@gmail.com>2026-06-21 08:42:10 +0200
committerOnur Gündüz <ogunduz@gmail.com>2026-06-21 08:42:10 +0200
commit7a047fd8f0c0f56143b7bb08aa326568abbc2284 (patch)
tree80b7f0f678de5d85aceaede40c223c911d773c2d
parentbe5ce08004c640aa5e77cf6155af3d124c66cf3e (diff)
downloadffwd-7a047fd8f0c0f56143b7bb08aa326568abbc2284.tar.gz
ffwd-7a047fd8f0c0f56143b7bb08aa326568abbc2284.zip
tests: point check scripts at the root ffwd-cli/ffwd-server symlinks
-rwxr-xr-xdevtools/compare_model_embeddings.py2
-rwxr-xr-xdevtools/compare_reference_backends.py2
-rwxr-xr-xdevtools/quant_precision_drift.py2
-rwxr-xr-xtests/check_batch_parity.py4
-rwxr-xr-xtests/check_cli.py8
-rwxr-xr-xtests/check_cuda_fast_gemm_parity.py2
-rw-r--r--tests/check_e5_parity.py4
-rwxr-xr-xtests/check_mlx_model_limits.py2
-rwxr-xr-xtests/check_mlx_quantized_parity.py2
-rwxr-xr-xtests/check_model_matrix.py2
-rw-r--r--tests/check_openai_sdk_compat.py4
-rw-r--r--tests/check_perplexity_sdk_compat.py4
-rw-r--r--tests/check_qwen3_parity.py4
-rw-r--r--tests/check_reference_parity.py4
-rwxr-xr-xtests/check_server_api.py5
15 files changed, 25 insertions, 26 deletions
diff --git a/devtools/compare_model_embeddings.py b/devtools/compare_model_embeddings.py
index 95154a2..3f39f19 100755
--- a/devtools/compare_model_embeddings.py
+++ b/devtools/compare_model_embeddings.py
@@ -10,7 +10,7 @@ import subprocess
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
def ensure_cli(binary: Path) -> None:
diff --git a/devtools/compare_reference_backends.py b/devtools/compare_reference_backends.py
index 0f6d758..38a929e 100755
--- a/devtools/compare_reference_backends.py
+++ b/devtools/compare_reference_backends.py
@@ -546,7 +546,7 @@ def main() -> int:
ap.add_argument("--base-url", default="http://127.0.0.1:8000")
ap.add_argument("--native-mode", choices=("http", "stdin", "none"), default="http")
ap.add_argument("--native-backend", choices=("cpu", "mlx"), default="mlx")
- ap.add_argument("--native-binary", default=str(repo_root() / "tools/cli/ffwd-cli"))
+ ap.add_argument("--native-binary", default=str(repo_root() / "ffwd-cli"))
ap.add_argument("--max-native-rss-mb", type=float, default=32768.0)
ap.add_argument("--skip-native", action="store_true")
ap.add_argument("--server-pid", type=int)
diff --git a/devtools/quant_precision_drift.py b/devtools/quant_precision_drift.py
index 896d2f8..1bd3f57 100755
--- a/devtools/quant_precision_drift.py
+++ b/devtools/quant_precision_drift.py
@@ -34,7 +34,7 @@ import sys
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
DEFAULT_TEXTS = [
diff --git a/tests/check_batch_parity.py b/tests/check_batch_parity.py
index 61f4427..147f21b 100755
--- a/tests/check_batch_parity.py
+++ b/tests/check_batch_parity.py
@@ -9,13 +9,13 @@ import sys
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
def ensure_cli(binary: Path) -> None:
"""Build the CLI if the default binary is missing."""
if binary == DEFAULT_BINARY and not binary.exists():
- subprocess.run(["make", "-C", "tools/cli", "all"], cwd=ROOT, check=True,
+ subprocess.run(["make", "cpu"], cwd=ROOT, check=True,
stdout=subprocess.DEVNULL)
diff --git a/tests/check_cli.py b/tests/check_cli.py
index 3044637..089ad95 100755
--- a/tests/check_cli.py
+++ b/tests/check_cli.py
@@ -7,7 +7,7 @@ runs a hermetic synthetic model (written by the gen_fixture test helper, the
same fixture the C tests build) so the CLI has something to load, then drives
the binary through its modes and asserts only exit codes and output shapes.
-The binary path is an argument (default tools/cli/ffwd-cli), so this works
+The binary path is an argument (default ./ffwd-cli), so this works
against any backend build - CPU, MLX, or CUDA. Backend-specific checks (the CPU
thread-count line) are gated on the binary's reported backend.
@@ -77,12 +77,12 @@ def backend_label(binary):
def main():
ap = argparse.ArgumentParser()
- ap.add_argument("--bin", default=os.path.join(ROOT, "tools", "cli", "ffwd-cli"),
- help="path to the embed CLI binary")
+ ap.add_argument("--bin", default=os.path.join(ROOT, "ffwd-cli"),
+ help="path to the ffwd CLI binary")
args = ap.parse_args()
binary = args.bin
- ensure_tool(binary, "tools/cli", "all")
+ ensure_tool(binary, ".", "cpu")
gen = os.path.join(ROOT, "tests", "gen_fixture")
ensure_tool(gen, "tests", "gen_fixture")
diff --git a/tests/check_cuda_fast_gemm_parity.py b/tests/check_cuda_fast_gemm_parity.py
index 06ee1f1..bc201f7 100755
--- a/tests/check_cuda_fast_gemm_parity.py
+++ b/tests/check_cuda_fast_gemm_parity.py
@@ -18,7 +18,7 @@ import sys
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
DEFAULT_TEXTS = [
diff --git a/tests/check_e5_parity.py b/tests/check_e5_parity.py
index 85177d6..37b63ae 100644
--- a/tests/check_e5_parity.py
+++ b/tests/check_e5_parity.py
@@ -23,7 +23,7 @@ import sys
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
DEFAULT_TEXTS = [
"The capital of France is Paris.",
@@ -40,7 +40,7 @@ DEFAULT_TEXTS = [
def ensure_cli(binary: Path) -> None:
"""Build the CLI if the default binary is missing."""
if binary == DEFAULT_BINARY and not binary.exists():
- subprocess.run(["make", "-C", "tools/cli", "all"], cwd=ROOT, check=True,
+ subprocess.run(["make", "cpu"], cwd=ROOT, check=True,
stdout=subprocess.DEVNULL)
diff --git a/tests/check_mlx_model_limits.py b/tests/check_mlx_model_limits.py
index 08eb7ba..09b750a 100755
--- a/tests/check_mlx_model_limits.py
+++ b/tests/check_mlx_model_limits.py
@@ -8,7 +8,7 @@ import tempfile
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
def main() -> int:
diff --git a/tests/check_mlx_quantized_parity.py b/tests/check_mlx_quantized_parity.py
index 2cf0add..1bcb81a 100755
--- a/tests/check_mlx_quantized_parity.py
+++ b/tests/check_mlx_quantized_parity.py
@@ -8,7 +8,7 @@ import subprocess
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
TEXTS = [
diff --git a/tests/check_model_matrix.py b/tests/check_model_matrix.py
index 3f640a7..1d37c14 100755
--- a/tests/check_model_matrix.py
+++ b/tests/check_model_matrix.py
@@ -244,7 +244,7 @@ def print_failure(backend: str, proc: subprocess.CompletedProcess[str]) -> None:
def main() -> int:
ap = argparse.ArgumentParser(description=__doc__)
- ap.add_argument("--binary", default=str(ROOT / "tools" / "cli" / "ffwd-cli"))
+ ap.add_argument("--binary", default=str(ROOT / "ffwd-cli"))
ap.add_argument("--models", default=",".join(DEFAULT_MODELS),
help="Comma-separated model keys")
ap.add_argument("--model", action="append",
diff --git a/tests/check_openai_sdk_compat.py b/tests/check_openai_sdk_compat.py
index 5ba582e..74474b6 100644
--- a/tests/check_openai_sdk_compat.py
+++ b/tests/check_openai_sdk_compat.py
@@ -37,7 +37,7 @@ except ImportError as e:
ROOT = Path(__file__).resolve().parents[1]
HOST = "127.0.0.1"
-SERVER_BIN = ROOT / "tools/server/ffwd-server"
+SERVER_BIN = ROOT / "ffwd-server"
DOCS = [
("Capitals", "Paris is the capital of France."),
@@ -50,7 +50,7 @@ QUERY = "What is the capital of France?"
def ensure_server() -> None:
if not SERVER_BIN.exists():
- subprocess.run(["make", "-C", "tools/server", "all"], cwd=ROOT, check=True,
+ subprocess.run(["make", "cpu"], cwd=ROOT, check=True,
stdout=subprocess.DEVNULL)
if not SERVER_BIN.exists():
sys.exit(f"ffwd-server not found and could not be built: {SERVER_BIN}")
diff --git a/tests/check_perplexity_sdk_compat.py b/tests/check_perplexity_sdk_compat.py
index 7a3244d..f0511f6 100644
--- a/tests/check_perplexity_sdk_compat.py
+++ b/tests/check_perplexity_sdk_compat.py
@@ -40,7 +40,7 @@ except ImportError as e:
ROOT = Path(__file__).resolve().parents[1]
HOST = "127.0.0.1"
-SERVER_BIN = ROOT / "tools/server/ffwd-server"
+SERVER_BIN = ROOT / "ffwd-server"
STANDARD_DOCS = [
@@ -72,7 +72,7 @@ CONTEXT_DOCS = {
def ensure_server() -> None:
if not SERVER_BIN.exists():
- subprocess.run(["make", "-C", "tools/server", "all"], cwd=ROOT, check=True,
+ subprocess.run(["make", "cpu"], cwd=ROOT, check=True,
stdout=subprocess.DEVNULL)
if not SERVER_BIN.exists():
sys.exit(f"ffwd-server not found and could not be built: {SERVER_BIN}")
diff --git a/tests/check_qwen3_parity.py b/tests/check_qwen3_parity.py
index 01b7031..2f59fe9 100644
--- a/tests/check_qwen3_parity.py
+++ b/tests/check_qwen3_parity.py
@@ -30,7 +30,7 @@ import torch
from sentence_transformers import SentenceTransformer
ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_BINARY = ROOT / "tools/cli/ffwd-cli"
+DEFAULT_BINARY = ROOT / "ffwd-cli"
DEFAULT_TEXTS = [
(
@@ -52,7 +52,7 @@ DEFAULT_TEXTS = [
def ensure_cli(binary: Path) -> None:
"""Build the CLI if the default binary is missing."""
if binary == DEFAULT_BINARY and not binary.exists():
- subprocess.run(["make", "-C", "tools/cli", "all"], cwd=ROOT, check=True,
+ subprocess.run(["make", "cpu"], cwd=ROOT, check=True,
stdout=subprocess.DEVNULL)
diff --git a/tests/check_reference_parity.py b/tests/check_reference_parity.py
index 81488b3..7d88bcd 100644
--- a/tests/check_reference_parity.py
+++ b/tests/check_reference_parity.py
@@ -32,7 +32,7 @@ from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
HOST = "127.0.0.1"
API_KEY = "tt-test-key"
-SERVER_BIN = ROOT / "tools/server/ffwd-server"
+SERVER_BIN = ROOT / "ffwd-server"
DEFAULT_TEXTS = [
"document: Your text string goes here",
@@ -44,7 +44,7 @@ DEFAULT_TEXTS = [
def ensure_server() -> None:
"""Build ffwd-server if its binary is missing."""
if not SERVER_BIN.exists():
- subprocess.run(["make", "-C", "tools/server", "all"], cwd=ROOT, check=True,
+ subprocess.run(["make", "cpu"], cwd=ROOT, check=True,
stdout=subprocess.DEVNULL)
if not SERVER_BIN.exists():
sys.exit(f"ffwd-server not found and could not be built: {SERVER_BIN}")
diff --git a/tests/check_server_api.py b/tests/check_server_api.py
index 421ab9b..cfdc6aa 100755
--- a/tests/check_server_api.py
+++ b/tests/check_server_api.py
@@ -524,8 +524,7 @@ def test_keepalive() -> None:
def main() -> int:
global PORT, VERBOSE
ap = argparse.ArgumentParser(description=__doc__)
- ap.add_argument("--server", default=os.path.join(ROOT, "tools", "server",
- "ffwd-server"),
+ ap.add_argument("--server", default=os.path.join(ROOT, "ffwd-server"),
help="path to the ffwd-server binary")
ap.add_argument("--gen", default=os.path.join(ROOT, "tests", "gen_fixture"),
help="path to the gen_fixture helper")
@@ -533,7 +532,7 @@ def main() -> int:
args = ap.parse_args()
VERBOSE = args.verbose
- ensure_tool(args.server, "tools/server", "all")
+ ensure_tool(args.server, ".", "cpu")
ensure_tool(args.gen, "tests", "gen_fixture")
with tempfile.TemporaryDirectory(prefix="ffwd-server-check-") as workdir: