Compare commits
11 Commits
fix/48-mar
...
step35/67-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb0045960b | ||
| 7797b9b4c8 | |||
| 0338cf940a | |||
| f3f796fa64 | |||
| 6ab98d65f5 | |||
| c4293f0d31 | |||
| 88a5c48402 | |||
| 3ff52f02b2 | |||
| 8475539070 | |||
|
|
f0f117cdd3 | ||
|
|
a537511652 |
@@ -18,6 +18,13 @@ jobs:
|
|||||||
find . -name '*.py' | grep -v llama-cpp-fork | xargs -r python3 -m py_compile
|
find . -name '*.py' | grep -v llama-cpp-fork | xargs -r python3 -m py_compile
|
||||||
find . -name '*.sh' | xargs -r bash -n
|
find . -name '*.sh' | xargs -r bash -n
|
||||||
echo "PASS: All files parse"
|
echo "PASS: All files parse"
|
||||||
|
- name: Build standalone CMake target
|
||||||
|
run: |
|
||||||
|
cmake -S . -B build -DTURBOQUANT_BUILD_TESTS=ON
|
||||||
|
cmake --build build -j$(nproc)
|
||||||
|
- name: Run tests
|
||||||
|
run: |
|
||||||
|
ctest --test-dir build --output-on-failure
|
||||||
- name: Secret scan
|
- name: Secret scan
|
||||||
run: |
|
run: |
|
||||||
if grep -rE 'sk-or-|sk-ant-|ghp_|AKIA' . --include='*.yml' --include='*.py' --include='*.sh' 2>/dev/null | grep -v .gitea | grep -v llama-cpp-fork; then exit 1; fi
|
if grep -rE 'sk-or-|sk-ant-|ghp_|AKIA' . --include='*.yml' --include='*.py' --include='*.sh' 2>/dev/null | grep -v .gitea | grep -v llama-cpp-fork; then exit 1; fi
|
||||||
|
|||||||
10
README.md
10
README.md
@@ -16,11 +16,11 @@ A 27B model at 128K context with TurboQuant beats a 72B at Q2 with 8K context.
|
|||||||
See [issues](https://forge.alexanderwhitestone.com/Timmy_Foundation/turboquant/issues) for current progress.
|
See [issues](https://forge.alexanderwhitestone.com/Timmy_Foundation/turboquant/issues) for current progress.
|
||||||
|
|
||||||
## Roles
|
## Roles
|
||||||
- **Strago:** Build spec author
|
- **Build Spec:** Architecture and specification
|
||||||
- **Cid:** Implementation, benchmarks, deployment
|
- **Implementation:** Code, benchmarks, deployment
|
||||||
- **Locke:** Research support, upstream watch
|
- **Research:** Upstream tracking, literature review
|
||||||
- **John:** Quality review
|
- **Quality:** Testing and review
|
||||||
- **Frankie:** Coordination
|
- **Coordination:** Project management
|
||||||
|
|
||||||
## Source Repos
|
## Source Repos
|
||||||
- [TheTom/llama-cpp-turboquant](https://github.com/TheTom/llama-cpp-turboquant) — llama.cpp fork with Metal
|
- [TheTom/llama-cpp-turboquant](https://github.com/TheTom/llama-cpp-turboquant) — llama.cpp fork with Metal
|
||||||
|
|||||||
@@ -385,7 +385,7 @@ Step 7: If pass → production. If fail → drop to turbo3 or adjust per-layer p
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
*Repo: http://143.198.27.163:3000/Timmy_Foundation/turboquant*
|
*Repo: https://forge.alexanderwhitestone.com/Timmy_Foundation/turboquant*
|
||||||
*Build: /tmp/llama-cpp-turboquant/build/bin/ (all binaries)*
|
*Build: /tmp/llama-cpp-turboquant/build/bin/ (all binaries)*
|
||||||
*Branch: feature/turboquant-kv-cache*
|
*Branch: feature/turboquant-kv-cache*
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,29 @@
|
|||||||
"""Phase 19: Hardware-Aware Inference Optimization.
|
"""Backward-compatible shim for hardware-aware quantization selection.
|
||||||
Part of the TurboQuant suite for local inference excellence.
|
|
||||||
|
The original Phase 19 placeholder `hardware_optimizer.py` never shipped real
|
||||||
|
logic. The canonical implementation now lives in `evolution.quant_selector`.
|
||||||
|
This shim preserves the legacy import path for any downstream callers while
|
||||||
|
making `quant_selector.py` the single source of truth.
|
||||||
"""
|
"""
|
||||||
import logging
|
|
||||||
# ... (rest of the code)
|
from evolution.quant_selector import ( # noqa: F401
|
||||||
|
HardwareInfo,
|
||||||
|
QuantLevel,
|
||||||
|
QuantSelection,
|
||||||
|
QUANT_LEVELS,
|
||||||
|
detect_hardware,
|
||||||
|
estimate_kv_cache_gb,
|
||||||
|
estimate_model_memory_gb,
|
||||||
|
select_quant_level,
|
||||||
|
)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"HardwareInfo",
|
||||||
|
"QuantLevel",
|
||||||
|
"QuantSelection",
|
||||||
|
"QUANT_LEVELS",
|
||||||
|
"detect_hardware",
|
||||||
|
"estimate_kv_cache_gb",
|
||||||
|
"estimate_model_memory_gb",
|
||||||
|
"select_quant_level",
|
||||||
|
]
|
||||||
|
|||||||
21
tests/test_hardware_optimizer.py
Normal file
21
tests/test_hardware_optimizer.py
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Tests for hardware_optimizer compatibility shim."""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
|
||||||
|
|
||||||
|
from evolution import hardware_optimizer, quant_selector
|
||||||
|
|
||||||
|
|
||||||
|
def test_hardware_optimizer_reexports_quant_selector_api():
|
||||||
|
assert hardware_optimizer.select_quant_level is quant_selector.select_quant_level
|
||||||
|
assert hardware_optimizer.detect_hardware is quant_selector.detect_hardware
|
||||||
|
assert hardware_optimizer.HardwareInfo is quant_selector.HardwareInfo
|
||||||
|
assert hardware_optimizer.QuantSelection is quant_selector.QuantSelection
|
||||||
|
|
||||||
|
|
||||||
|
def test_hardware_optimizer_exports_quant_level_definitions():
|
||||||
|
assert hardware_optimizer.QUANT_LEVELS is quant_selector.QUANT_LEVELS
|
||||||
|
assert hardware_optimizer.QuantLevel is quant_selector.QuantLevel
|
||||||
@@ -20,9 +20,35 @@ from evolution.quant_selector import (
|
|||||||
|
|
||||||
class TestQuantLevels:
|
class TestQuantLevels:
|
||||||
def test_levels_ordered_by_quality(self):
|
def test_levels_ordered_by_quality(self):
|
||||||
"""Levels should be ordered from best quality to most aggressive."""
|
"""TurboQuant levels should be ordered from best quality to most aggressive.
|
||||||
for i in range(len(QUANT_LEVELS) - 1):
|
|
||||||
assert QUANT_LEVELS[i].bits_per_channel > QUANT_LEVELS[i + 1].bits_per_channel
|
The quality ordering invariant for TurboQuant levels is monotonically
|
||||||
|
increasing compression_ratio (more aggressive = more compression).
|
||||||
|
Non-TurboQuant fallbacks (e.g. q4_0) are placed after all TurboQuant
|
||||||
|
levels and may have any compression ratio — they exist as safe defaults,
|
||||||
|
not as part of the quality progression.
|
||||||
|
"""
|
||||||
|
turbo_quant_names = {"turbo4", "turbo3", "turbo2"}
|
||||||
|
turbo_levels = [l for l in QUANT_LEVELS if l.name in turbo_quant_names]
|
||||||
|
for i in range(len(turbo_levels) - 1):
|
||||||
|
assert turbo_levels[i].compression_ratio <= turbo_levels[i + 1].compression_ratio, (
|
||||||
|
f"TurboQuant {turbo_levels[i].name} (compression={turbo_levels[i].compression_ratio}x) "
|
||||||
|
f"should have <= compression than {turbo_levels[i+1].name} "
|
||||||
|
f"(compression={turbo_levels[i+1].compression_ratio}x)"
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_fallback_quant_is_last(self):
|
||||||
|
"""Non-TurboQuant fallbacks (e.g. q4_0) should be at the end of the list."""
|
||||||
|
turbo_quant_names = {"turbo4", "turbo3", "turbo2"}
|
||||||
|
found_fallback = False
|
||||||
|
for level in QUANT_LEVELS:
|
||||||
|
if level.name not in turbo_quant_names:
|
||||||
|
found_fallback = True
|
||||||
|
elif found_fallback:
|
||||||
|
pytest.fail(
|
||||||
|
f"TurboQuant level '{level.name}' appears after a fallback level. "
|
||||||
|
f"All TurboQuant levels must precede fallbacks."
|
||||||
|
)
|
||||||
|
|
||||||
def test_all_levels_have_required_fields(self):
|
def test_all_levels_have_required_fields(self):
|
||||||
for level in QUANT_LEVELS:
|
for level in QUANT_LEVELS:
|
||||||
|
|||||||
83
tests/test_smoke_workflow.py
Normal file
83
tests/test_smoke_workflow.py
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
"""Tests for smoke workflow CI configuration.
|
||||||
|
|
||||||
|
Validates that the GitHub Actions / Gitea Actions smoke workflow
|
||||||
|
actually runs the standalone CMake build and test suite, not just
|
||||||
|
parse checks.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
import yaml
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
|
WORKFLOW_PATH = Path(".gitea/workflows/smoke.yml")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def workflow():
|
||||||
|
"""Load and parse the smoke workflow YAML."""
|
||||||
|
content = WORKFLOW_PATH.read_text(encoding="utf-8")
|
||||||
|
return yaml.safe_load(content)
|
||||||
|
|
||||||
|
|
||||||
|
def test_smoke_workflow_exists():
|
||||||
|
"""Smoke workflow file must exist."""
|
||||||
|
assert WORKFLOW_PATH.exists(), f"Missing {WORKFLOW_PATH}"
|
||||||
|
|
||||||
|
|
||||||
|
def test_smoke_has_cmake_configure_step(workflow):
|
||||||
|
"""Smoke workflow must configure the CMake project with tests enabled."""
|
||||||
|
steps = workflow["jobs"]["smoke"]["steps"]
|
||||||
|
cmake_found = False
|
||||||
|
for step in steps:
|
||||||
|
run = step.get("run", "")
|
||||||
|
if "cmake -S . -B build" in run and "TURBOQUANT_BUILD_TESTS=ON" in run:
|
||||||
|
cmake_found = True
|
||||||
|
break
|
||||||
|
assert cmake_found, (
|
||||||
|
"Smoke workflow missing cmake configure step with TURBOQUANT_BUILD_TESTS=ON"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_smoke_has_cmake_build_step(workflow):
|
||||||
|
"""Smoke workflow must build the CMake project."""
|
||||||
|
steps = workflow["jobs"]["smoke"]["steps"]
|
||||||
|
build_found = False
|
||||||
|
for step in steps:
|
||||||
|
run = step.get("run", "")
|
||||||
|
if "cmake --build build" in run:
|
||||||
|
build_found = True
|
||||||
|
break
|
||||||
|
assert build_found, "Smoke workflow missing cmake --build step"
|
||||||
|
|
||||||
|
|
||||||
|
def test_smoke_has_ctest_step(workflow):
|
||||||
|
"""Smoke workflow must run ctest."""
|
||||||
|
steps = workflow["jobs"]["smoke"]["steps"]
|
||||||
|
ctest_found = False
|
||||||
|
for step in steps:
|
||||||
|
run = step.get("run", "")
|
||||||
|
if "ctest" in run and "output-on-failure" in run:
|
||||||
|
ctest_found = True
|
||||||
|
break
|
||||||
|
assert ctest_found, "Smoke workflow missing ctest --output-on-failure step"
|
||||||
|
|
||||||
|
|
||||||
|
def test_smoke_build_before_secret_scan(workflow):
|
||||||
|
"""Build and test steps must run before secret scan (fail fast on build errors)."""
|
||||||
|
steps = workflow["jobs"]["smoke"]["steps"]
|
||||||
|
names = [s.get("name", "") for s in steps]
|
||||||
|
build_idx = None
|
||||||
|
scan_idx = None
|
||||||
|
for i, name in enumerate(names):
|
||||||
|
if "cmake" in name.lower() or "build" in name.lower():
|
||||||
|
if build_idx is None:
|
||||||
|
build_idx = i
|
||||||
|
if "secret" in name.lower():
|
||||||
|
scan_idx = i
|
||||||
|
if build_idx is not None and scan_idx is not None:
|
||||||
|
assert build_idx < scan_idx, (
|
||||||
|
"Build step should run before secret scan to fail fast on broken code"
|
||||||
|
)
|
||||||
Reference in New Issue
Block a user