Skip to content

Commit 2431bee

Browse files
committed
Merge branch 'develop' of https://github.com/elizaOS/eliza into develop
2 parents 597747d + 97a7687 commit 2431bee

144 files changed

Lines changed: 7572 additions & 1608 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/lifeops-bench-multi-tier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ jobs:
295295
id: dflash-cache
296296
uses: actions/cache@v4
297297
with:
298-
path: ~/.cache/eliza-dflash/milady-llama-cpp/build/bin/llama-server
298+
path: ~/.cache/eliza-dflash/eliza-llama-cpp/build/bin/llama-server
299299
key: dflash-llama-cpp-${{ runner.os }}-v1
300300

301301
- name: Build dflash fork (best-effort)

.github/workflows/local-inference-bench.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
- ".github/workflows/local-inference-bench.yml"
3333
- "plugins/plugin-local-embedding/**"
3434
- "packages/app-core/scripts/build-llama-cpp-dflash.mjs"
35-
- "packages/training/scripts/publish_milady_model.py"
35+
- "packages/training/scripts/publish_eliza1_model.py"
3636
- "packages/training/scripts/sync_catalog_from_hf.py"
3737
- "scripts/verify-phone-download.mjs"
3838
workflow_dispatch:
@@ -379,7 +379,7 @@ jobs:
379379
380380
- name: Cross-build windows-x64-cpu
381381
env:
382-
# Override the dflash fork to elizaOS/llama.cpp v0.1.0-milady so
382+
# Override the dflash fork to elizaOS/llama.cpp v1.0.0-eliza so
383383
# CI exercises the symbols downstream consumers actually expect.
384384
# Operators that want to test against the spiritbuun upstream can
385385
# leave this unset.
@@ -388,7 +388,7 @@ jobs:
388388
set -euo pipefail
389389
node packages/app-core/scripts/build-llama-cpp-dflash.mjs \
390390
--target windows-x64-cpu \
391-
--ref v0.1.0-milady \
391+
--ref v1.0.0-eliza \
392392
--cache-dir "$RUNNER_TEMP/llama-cpp-cross-cache" \
393393
--out-dir "$GITHUB_WORKSPACE/build-output/windows-x64-cpu"
394394
@@ -486,7 +486,7 @@ jobs:
486486

487487
publish-models-nightly:
488488
# Weekly nightly publish to the elizaos HF org. Walks W5-Pipeline's
489-
# output, calls publish_milady_model.py for each fused-kernel GGUF,
489+
# output, calls publish_eliza1_model.py for each fused-kernel GGUF,
490490
# then runs sync_catalog_from_hf.py to produce the catalog diff and
491491
# opens a PR with the update.
492492
#
@@ -502,7 +502,7 @@ jobs:
502502
env:
503503
# W5-Pipeline drops finished checkpoints under this path. The
504504
# nightly publish step expects each subdirectory to be a complete
505-
# `<base>-milady-optimized` (or `-milady-drafter`) bundle —
505+
# `<base>-optimized` (or `-drafter`) bundle —
506506
# i.e. a single .gguf + manifest.json + README.md.
507507
W5_PIPELINE_OUTPUT_ROOT: ${{ vars.W5_PIPELINE_OUTPUT_ROOT || '/mnt/w5-pipeline-output' }}
508508
HF_TOKEN: ${{ secrets.MILADY_HF_TOKEN }}
@@ -568,15 +568,15 @@ jobs:
568568
FAILURES=0
569569
for dir in "$W5_PIPELINE_OUTPUT_ROOT"/*/; do
570570
name=$(basename "$dir")
571-
# Bundle naming: <base>-milady-optimized or <base>-milady-drafter.
571+
# Bundle naming: <base>-optimized or <base>-drafter.
572572
# Anything else is rejected — these repos are for fused builds only.
573-
if [[ "$name" != *-milady-optimized && "$name" != *-milady-drafter ]]; then
573+
if [[ "$name" != *-optimized && "$name" != *-drafter ]]; then
574574
echo "::warning ::skipping $name (not a fused-kernel bundle name)"
575575
continue
576576
fi
577577
repo_id="elizaos/$name"
578578
echo "::group::publish $repo_id"
579-
if ! python packages/training/scripts/publish_milady_model.py \
579+
if ! python packages/training/scripts/publish_eliza1_model.py \
580580
--model-dir "$dir" \
581581
--repo-id "$repo_id"; then
582582
echo "::error ::publish failed for $name"

.gitmodules

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
[submodule "packages/inference/llama.cpp"]
2+
# The single canonical llama.cpp checkout for the whole repo. This is the
3+
# elizaOS/llama.cpp fork (@ v1.0.0-eliza, commit 08032d57): the unified
4+
# fork with the milady kernels (Q4_POLAR / QJL1_256 / TBQ4_0 / TBQ3_0
5+
# GGML types + Metal/Vulkan/CUDA kernels) and DFlash spec-decode. The
6+
# host build (build-llama-cpp-dflash.mjs) + AOSP cross-compile
7+
# (aosp/compile-libllama.mjs) default to this submodule; bun's postinstall
8+
# (scripts/ensure-llama-cpp-submodule.mjs) initializes it. The fork is
9+
# itself a llama.cpp fork, so it carries convert_hf_to_gguf.py /
10+
# llama-quantize / llama-cli too — the training pipeline's plain Q4_K_M
11+
# GGUF path uses the fork's tooling (there is no separate "stock upstream"
12+
# submodule). build/ is gitignored by llama.cpp's own .gitignore so only
13+
# the gitlink (commit SHA) is tracked.
214
path = packages/inference/llama.cpp
315
url = https://github.com/elizaOS/llama.cpp.git
416
branch = eliza/main
5-
[submodule "packages/training/vendor/llama.cpp"]
6-
# Stock upstream llama.cpp pinned to a release tag (b6650). Used by the
7-
# training pipeline's plain GGUF Q4_K_M path (convert_hf_to_gguf.py +
8-
# llama-quantize + llama-cli). The Milady fork — Q4_POLAR/QJL1_256/TBQ
9-
# GGML types — is the *other* submodule (packages/inference/llama.cpp).
10-
# scripts/vendor_llama_cpp.sh inits + builds this; build/ is gitignored
11-
# by llama.cpp's own .gitignore so only the gitlink (commit SHA) is tracked.
12-
path = packages/training/vendor/llama.cpp
13-
url = https://github.com/ggml-org/llama.cpp.git
14-
shallow = true

0 commit comments

Comments
 (0)