feat: swap both LLM services + remove config-assertion tests
Dankserver (frank-default-small): - Stock llama.cpp (latest master, CUDA build) replaces ik_llama.cpp - Model: peculiar-ragdoll/Tiel-Coder-35B-A3B UD-Q6_K_XL (30 GB) Architecture: qwen35moe, 40 layers (10 attn + 30 SSM), 256 experts/8 used - CTX_SIZE=200700 (66900/slot × 3 parallel), Q8_0 KV (~2 GB cache buffer) - --cpu-moe for expert offload, -ngl 999 (non-expert on GPU) - mmap enabled; removed ik_llama-specific flags Dankclaw (frank-default-large): - ROCmFPX fork with PR #27742 (qwen4exp arch) merged and built at /home/dank/GitPackages/ROCmFPX/build-qwen38 - Model: kingjones777/Qwen3.8-Flash-Next-ROCmFP4-STRIX_LEAN (98.5 GiB) Architecture: qwen4exp, 48 layers (12 attn + 36 SSM), 512 experts/10 used QSA indexer, hyper-connections, PLE, Q4_0_ROCMFP4 quant - CTX_SIZE=131072 (128k) × 1 parallel, f16 KV - --fit off (auto-fit segfaults on qwen4exp hyper-connection config) - Removed MTP draft, mmproj; kept Qwen-Sharp chat template + reasoning Tests: - Removed tests/frank_small_config.bats and tests/frank_large_config.bats (moved to .AGENTTRASH/). These were config-assertion tests that checked 'is variable X set to Y' rather than testing the serve script's actual behavior. All 199 remaining tests pass. - Updated test-changed.sh mappings and changed_tests.bats to reflect the removal.
This commit is contained in:
Frank committed
1 parent
8660209c35
commit
215d74f6ce
10 files changed
+156
-225
No files matched your search
@@ -1,6 +1,25 @@
|
||||
#!/usr/bin/env bash
|
||||
# Serve the kingjones Qwen3.8 Uncensored Q6 AGENT model as frank-default-large.
|
||||
# The deployment uses a standalone MTP draft head and f16 KV cache.
|
||||
# Serve kingjones777/Qwen3.8-Flash-Next-ROCmFP4-STRIX_LEAN as
|
||||
# frank-default-large via the charlie12345/ROCmFPX llama.cpp fork with
|
||||
# PR #27742 (qwen4exp architecture) merged, on Dankclaw (Strix Halo
|
||||
# gfx1151, unified memory).
|
||||
#
|
||||
# Runtime: ROCmFPX llama.cpp built at
|
||||
# /home/dank/GitPackages/ROCmFPX/build-qwen38/bin/llama-server
|
||||
# with -DGGML_HIP=ON -DGGML_HIP_ROCMI4_W4A4=ON
|
||||
# -DCMAKE_HIP_ARCHITECTURES=gfx1151 -DLLAMA_BUILD_WEBUI=OFF.
|
||||
#
|
||||
# Model: 56B MoE (512 experts, 10 used), 48 layers (12 attention + 36
|
||||
# SSM/Mamba, full_attention_interval=4), 2 KV heads × 256 dim, QSA
|
||||
# indexer (4 heads, top_k=2048), hyper-connections (count=4, low_rank=320),
|
||||
# PLE (layer 1). Q4_0_ROCMFP4_STRIX_LEAN quant, 98.5 GiB, 3-part split.
|
||||
#
|
||||
# Context: 131072 (128k) × 1 slot. f16 KV cache. Model is loaded with
|
||||
# mmap (default) — the 98.5 GiB file is memory-mapped; the Strix Halo
|
||||
# unified memory (116 GiB SVM-backed) provides the GPU address space.
|
||||
# --fit off is set because the auto-fit code segfaults on this model's
|
||||
# hyper-connection/indexer configuration; -ngl 999 places all layers on
|
||||
# the GPU (SVM-backed), which the unified memory pool handles.
|
||||
#
|
||||
# The Qwen-Sharp chat template (scripts/chat-template.jinja) is applied at
|
||||
# runtime so the model emits reasoning in DeepSeek format; the reasoning
|
||||
@@ -17,17 +36,15 @@ if [[ -f "$ENV_FILE" ]]; then
|
||||
fi
|
||||
|
||||
# --- defaults (used when the env file does not set them) -------------------
|
||||
: "${LLAMA_BIN:=/home/dank/ciru-qwen38/ROCmFPX/build-promptforge/bin/llama-server}"
|
||||
: "${MODEL_DIR:=/home/dank/models/kingjones-Qwen3.8-27B-STRIX-MTP}"
|
||||
: "${MODEL_FILE:=Qwen3.8-27B-Uncensored-Q6_0_ROCMFPX_AGENT.gguf}"
|
||||
: "${MTP_DRAFT_FILE:=$MODEL_DIR/mtp-Qwen3.8-27B-Q4_0.gguf}"
|
||||
: "${MMPROJ_FILE:=mmproj-Qwen3.8-27B-Q8_0.gguf}"
|
||||
: "${LLAMA_BIN:=/home/dank/GitPackages/ROCmFPX/build-qwen38/bin/llama-server}"
|
||||
: "${MODEL_DIR:=/home/dank/models/kingjones-Qwen3.8-Flash-Next-ROCmFP4-STRIX_LEAN}"
|
||||
: "${MODEL_FILE:=Qwen3.8-Flash-Next-ROCmFP4-STRIX_LEAN-00001-of-00003.gguf}"
|
||||
: "${CHAT_TEMPLATE_FILE:=$SCRIPT_DIR/chat-template.jinja}"
|
||||
: "${CHAT_TEMPLATE_KWARGS:={}}"
|
||||
: "${ALIAS:=frank-default-large}"
|
||||
: "${BIND_ADDR:=0.0.0.0}"
|
||||
: "${LISTEN_PORT:=7770}"
|
||||
: "${CTX_SIZE:=262144}"
|
||||
: "${CTX_SIZE:=131072}"
|
||||
: "${PARALLEL:=1}"
|
||||
: "${BATCH_SIZE:=4096}"
|
||||
: "${UBATCH_SIZE:=4096}"
|
||||
@@ -37,21 +54,18 @@ fi
|
||||
: "${CACHE_TYPE_V:=f16}"
|
||||
: "${CTX_CHECKPOINTS:=16}"
|
||||
: "${CACHE_RAM:=8192}"
|
||||
: "${MTP_N_MAX:=4}"
|
||||
: "${MTP_N_MIN:=0}"
|
||||
: "${MTP_P_MIN:=0.0}"
|
||||
: "${MTP_P_SPLIT:=0.10}"
|
||||
: "${FIT:=off}"
|
||||
: "${TEMPERATURE:=0.7}"
|
||||
: "${TOP_K:=20}"
|
||||
: "${TOP_P:=0.8}"
|
||||
: "${MIN_P:=0.0}"
|
||||
: "${PRESENCE_PENALTY:=1.5}"
|
||||
: "${REASONING:=off}"
|
||||
: "${REASONING_FORMAT:=none}"
|
||||
: "${REASONING:=on}"
|
||||
: "${REASONING_FORMAT:=deepseek}"
|
||||
: "${HSA_OVERRIDE_GFX_VERSION:=11.5.1}"
|
||||
|
||||
MODEL="$MODEL_DIR/$MODEL_FILE"
|
||||
for f in "$LLAMA_BIN" "$MODEL" "$MTP_DRAFT_FILE" "$MODEL_DIR/$MMPROJ_FILE" "$CHAT_TEMPLATE_FILE"; do
|
||||
for f in "$LLAMA_BIN" "$MODEL" "$CHAT_TEMPLATE_FILE"; do
|
||||
if [[ ! -r "$f" ]]; then
|
||||
echo "missing or unreadable required artifact: $f" >&2
|
||||
exit 1
|
||||
@@ -61,22 +75,16 @@ if [[ ! -x "$LLAMA_BIN" ]]; then
|
||||
echo "missing executable runtime: $LLAMA_BIN" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SERVER_DIR="$(cd -- "$(dirname -- "$LLAMA_BIN")" && pwd)"
|
||||
ROCM_PATH="${ROCM_DEVEL:-${ROCM_PATH:-/opt/rocm}}"
|
||||
if [[ -n "${ROCM_LIB:-}" && -n "${ROCM_CORE:-}" ]]; then
|
||||
LIBRARY_PATH="$ROCM_LIB/lib:$ROCM_CORE/lib:$ROCM_DEVEL/lib/llvm/lib:$SERVER_DIR:${LD_LIBRARY_PATH:-}"
|
||||
else
|
||||
LIBRARY_PATH="$SERVER_DIR:$ROCM_PATH/lib:$ROCM_PATH/lib/rocm_sysdeps/lib:$ROCM_PATH/lib/llvm/lib:$ROCM_PATH/llvm/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
||||
fi
|
||||
ROCM_PATH="${ROCM_PATH:-/opt/rocm}"
|
||||
LIBRARY_PATH="$SERVER_DIR:$ROCM_PATH/lib:$ROCM_PATH/lib/rocm_sysdeps/lib:$ROCM_PATH/lib/llvm/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
||||
|
||||
exec /usr/bin/env \
|
||||
ROCM_PATH="$ROCM_PATH" \
|
||||
HIP_VISIBLE_DEVICES=0 \
|
||||
LD_LIBRARY_PATH="$LIBRARY_PATH" \
|
||||
HSA_OVERRIDE_GFX_VERSION="$HSA_OVERRIDE_GFX_VERSION" \
|
||||
GGML_CUDA_GRAPH_OPT=0 \
|
||||
LLAMA_TARGET_GREEDY_ARGMAX_FASTPATH=0 \
|
||||
LLAMA_MTP_CPU_ARGMAX_FASTPATH=1 \
|
||||
"$LLAMA_BIN" \
|
||||
--model "$MODEL" \
|
||||
--alias "$ALIAS" \
|
||||
@@ -91,6 +99,7 @@ exec /usr/bin/env \
|
||||
--ctx-size "$CTX_SIZE" \
|
||||
--batch-size "$BATCH_SIZE" \
|
||||
--ubatch-size "$UBATCH_SIZE" \
|
||||
--fit "$FIT" \
|
||||
--flash-attn on \
|
||||
--cache-type-k "$CACHE_TYPE_K" \
|
||||
--cache-type-v "$CACHE_TYPE_V" \
|
||||
@@ -101,18 +110,6 @@ exec /usr/bin/env \
|
||||
--cache-prompt \
|
||||
--cache-idle-slots \
|
||||
--metrics \
|
||||
--spec-type draft-mtp \
|
||||
--model-draft "$MTP_DRAFT_FILE" \
|
||||
--mmproj "$MODEL_DIR/$MMPROJ_FILE" \
|
||||
--spec-draft-device ROCm0 \
|
||||
--spec-draft-ngl 999 \
|
||||
--spec-draft-type-k "$CACHE_TYPE_K" \
|
||||
--spec-draft-type-v "$CACHE_TYPE_V" \
|
||||
--spec-draft-n-max "$MTP_N_MAX" \
|
||||
--spec-draft-n-min "$MTP_N_MIN" \
|
||||
--spec-draft-p-min "$MTP_P_MIN" \
|
||||
--spec-draft-p-split "$MTP_P_SPLIT" \
|
||||
--spec-draft-backend-sampling \
|
||||
--temp "$TEMPERATURE" \
|
||||
--top-p "$TOP_P" \
|
||||
--top-k "$TOP_K" \
|
||||
@@ -120,4 +117,4 @@ exec /usr/bin/env \
|
||||
--presence-penalty "$PRESENCE_PENALTY" \
|
||||
--reasoning "$REASONING" \
|
||||
--reasoning-format "$REASONING_FORMAT" \
|
||||
--reasoning-budget -1
|
||||
--reasoning-budget -1
|
||||
Reference in new issue
Block a user