b5ef9e697f
Archive (per #254, user-approved "drop registry"): - 15 Genesis/nightly vLLM composes -> models/qwen3.6-27b/vllm/compose/_archive/ + revival manifest (README.md): the 9 vllm-nightly-mtp slugs, dual-int8 (nightly-full), tools-text + dual-bf16 (nightly-clean deprecated), and the 3 Genesis-stack slugs dual4/carnice/qwopus. - Removed their 15 COMPOSE_REGISTRY entries (56 -> 41). Cascade migrated to keep the catalog coherent: - calibration/qwen3.6-27b.yml: dropped 5 archived-slug rows. - patches.yml: dropped 69 archived-slug refs from compose lists. - tools/kv-calc.py: pruned the legacy alias map + dual-turbo/dual4 overrides (--calibration now 13/13). - DEFAULTS (qwen,vllm,multi4): vllm/dual4 -> vllm/dual4-dflash. - compose-meta.sh: compose_hw_model_status qwen candidates repointed off the two archived composes -> minimal.yml (fixes a real setup.sh "doesn't fit" bug). - test fixtures: registry-disk counts (41/43), kv-generic-dense + submit-pull calibration counts (13/13), model-default-resolver (dual4-dflash + dual-dflash pin). WIP: 5 test files still anchor on archived slugs (handed to Codex to finish to 42/42 green). Refs #254. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
355 lines
10 KiB
Bash
355 lines
10 KiB
Bash
#!/usr/bin/env bash
|
||
#
|
||
# Tiny parser for hardware metadata stored as compose header comments.
|
||
#
|
||
# Expected form:
|
||
# # Requires-min-vram-gb: 24
|
||
# # Requires-min-gpu-count: 2
|
||
# # Tensor-parallel: 2
|
||
# # Requires-sm: 9.0+
|
||
#
|
||
# This intentionally does not parse YAML. These fields are comments so that
|
||
# older docker compose versions and direct `docker compose -f ... up` flows keep
|
||
# working unchanged.
|
||
|
||
_compose_meta_trim() {
|
||
local value="$1"
|
||
value="${value#"${value%%[![:space:]]*}"}"
|
||
value="${value%"${value##*[![:space:]]}"}"
|
||
printf '%s' "$value"
|
||
}
|
||
|
||
_compose_meta_norm_key() {
|
||
local key="$1"
|
||
key="$(_compose_meta_trim "$key")"
|
||
key="${key//_/-}"
|
||
key="${key// /-}"
|
||
printf '%s' "$key" | tr '[:upper:]' '[:lower:]'
|
||
}
|
||
|
||
_compose_meta_wants_key() {
|
||
local requested="$(_compose_meta_norm_key "$1")"
|
||
local candidate="$(_compose_meta_norm_key "$2")"
|
||
|
||
case "$requested" in
|
||
min-vram-gb) requested="requires-min-vram-gb" ;;
|
||
min-gpu-count) requested="requires-min-gpu-count" ;;
|
||
tp) requested="tensor-parallel" ;;
|
||
sm) requested="requires-sm" ;;
|
||
esac
|
||
|
||
[[ "$candidate" == "$requested" ]]
|
||
}
|
||
|
||
compose_meta_get() {
|
||
local compose_file="$1"
|
||
local field="$2"
|
||
|
||
[[ -f "$compose_file" ]] || return 1
|
||
|
||
local line key value
|
||
while IFS= read -r line; do
|
||
[[ "$line" =~ ^[[:space:]]*# ]] || continue
|
||
line="${line#*\#}"
|
||
[[ "$line" == *:* ]] || continue
|
||
key="${line%%:*}"
|
||
value="${line#*:}"
|
||
if _compose_meta_wants_key "$field" "$key"; then
|
||
_compose_meta_trim "$value"
|
||
return 0
|
||
fi
|
||
done < "$compose_file"
|
||
|
||
return 1
|
||
}
|
||
|
||
compose_hw_sm_to_int() {
|
||
local sm="$1"
|
||
sm="${sm%%+}"
|
||
sm="${sm//sm_/}"
|
||
sm="${sm//SM_/}"
|
||
sm="${sm// /}"
|
||
[[ -z "$sm" ]] && { echo 0; return; }
|
||
|
||
local major minor
|
||
if [[ "$sm" == *.* ]]; then
|
||
major="${sm%%.*}"
|
||
minor="${sm#*.}"
|
||
else
|
||
major="$sm"
|
||
minor="0"
|
||
fi
|
||
major="${major//[^0-9]/}"
|
||
minor="${minor//[^0-9]/}"
|
||
[[ -z "$major" ]] && major=0
|
||
[[ -z "$minor" ]] && minor=0
|
||
if [[ "${#minor}" -eq 1 ]]; then
|
||
minor=$(( minor * 10 ))
|
||
else
|
||
minor="${minor:0:2}"
|
||
[[ -z "$minor" ]] && minor=0
|
||
fi
|
||
echo $(( major * 100 + minor ))
|
||
}
|
||
|
||
compose_hw_vram_gb() {
|
||
local mib="$1"
|
||
echo $(( (mib + 1023) / 1024 ))
|
||
}
|
||
|
||
compose_hw_detect_gpus() {
|
||
if [[ "${_COMPOSE_HW_GPU_CACHE_SET:-0}" == "1" ]]; then
|
||
[[ -n "${_COMPOSE_HW_GPU_CACHE:-}" ]] || return 1
|
||
printf '%s\n' "${_COMPOSE_HW_GPU_CACHE}"
|
||
return 0
|
||
fi
|
||
|
||
if [[ -n "${CLUB3090_FAKE_GPUS:-}" ]]; then
|
||
local fake parsed_fake="" f_idx f_name f_mem_mib f_sm
|
||
IFS=',' read -ra _compose_fake_gpus <<< "${CLUB3090_FAKE_GPUS}"
|
||
for fake in "${_compose_fake_gpus[@]}"; do
|
||
IFS=':' read -r f_idx f_name f_mem_mib f_sm <<< "$fake"
|
||
f_idx="$(_compose_meta_trim "${f_idx:-}")"
|
||
f_name="$(_compose_meta_trim "${f_name:-}")"
|
||
f_name="${f_name//_/ }"
|
||
f_mem_mib="$(_compose_meta_trim "${f_mem_mib:-}")"
|
||
f_sm="$(_compose_meta_trim "${f_sm:-}")"
|
||
[[ -z "$f_idx" || -z "$f_mem_mib" ]] && continue
|
||
parsed_fake+="${f_idx}"$'\t'"${f_name}"$'\t'"${f_mem_mib}"$'\t'"${f_sm}"$'\n'
|
||
done
|
||
parsed_fake="${parsed_fake%$'\n'}"
|
||
_COMPOSE_HW_GPU_CACHE_SET=1
|
||
_COMPOSE_HW_GPU_CACHE="$parsed_fake"
|
||
[[ -n "$parsed_fake" ]] || return 1
|
||
printf '%s\n' "$parsed_fake"
|
||
return 0
|
||
fi
|
||
|
||
command -v nvidia-smi >/dev/null 2>&1 || return 1
|
||
|
||
local query idx name mem_mib sm rest
|
||
query="$(nvidia-smi --query-gpu=index,name,memory.total,compute_cap --format=csv,noheader,nounits 2>/dev/null)" || return 1
|
||
[[ -n "$query" ]] || return 1
|
||
|
||
local parsed=""
|
||
while IFS=',' read -r idx name mem_mib sm rest; do
|
||
idx="$(_compose_meta_trim "$idx")"
|
||
name="$(_compose_meta_trim "$name")"
|
||
mem_mib="$(_compose_meta_trim "$mem_mib")"
|
||
sm="$(_compose_meta_trim "$sm")"
|
||
[[ -z "$idx" || -z "$mem_mib" ]] && continue
|
||
parsed+="${idx}"$'\t'"${name}"$'\t'"${mem_mib}"$'\t'"${sm}"$'\n'
|
||
done <<< "$query"
|
||
|
||
parsed="${parsed%$'\n'}"
|
||
_COMPOSE_HW_GPU_CACHE_SET=1
|
||
_COMPOSE_HW_GPU_CACHE="$parsed"
|
||
[[ -n "$parsed" ]] || return 1
|
||
printf '%s\n' "$parsed"
|
||
}
|
||
|
||
compose_hw_in_use_gpus() {
|
||
# Returns GPU indices with non-trivial active compute work. Best-effort:
|
||
# primary path maps compute-app UUIDs back to GPU indices; memory.used is
|
||
# the fallback for drivers that do not expose compute app UUIDs.
|
||
if [[ -n "${CLUB3090_FAKE_BUSY_GPUS:-}" ]]; then
|
||
printf '%s\n' "${CLUB3090_FAKE_BUSY_GPUS//,/$'\n'}" | sed '/^$/d'
|
||
return 0
|
||
fi
|
||
if [[ -n "${CLUB3090_FAKE_GPUS:-}" ]]; then
|
||
return 0
|
||
fi
|
||
|
||
command -v nvidia-smi >/dev/null 2>&1 || return 0
|
||
|
||
local uuid_query apps line uuid idx
|
||
uuid_query="$(nvidia-smi --query-gpu=index,uuid --format=csv,noheader,nounits 2>/dev/null || true)"
|
||
apps="$(nvidia-smi --query-compute-apps=gpu_uuid,pid --format=csv,noheader,nounits 2>/dev/null || true)"
|
||
if [[ -n "$uuid_query" && -n "$apps" ]]; then
|
||
while IFS=',' read -r uuid _pid; do
|
||
uuid="$(_compose_meta_trim "$uuid")"
|
||
[[ -z "$uuid" ]] && continue
|
||
while IFS=',' read -r idx line; do
|
||
idx="$(_compose_meta_trim "$idx")"
|
||
line="$(_compose_meta_trim "$line")"
|
||
if [[ "$line" == "$uuid" ]]; then
|
||
printf '%s\n' "$idx"
|
||
fi
|
||
done <<< "$uuid_query"
|
||
done <<< "$apps" | sort -u
|
||
return 0
|
||
fi
|
||
|
||
local mem_used_lines used
|
||
mem_used_lines="$(nvidia-smi --query-gpu=index,memory.used --format=csv,noheader,nounits 2>/dev/null || true)"
|
||
while IFS=',' read -r idx used; do
|
||
idx="$(_compose_meta_trim "$idx")"
|
||
used="$(_compose_meta_trim "$used")"
|
||
[[ -z "$idx" || -z "$used" ]] && continue
|
||
if [[ "$used" =~ ^[0-9]+$ ]] && (( used > 1024 )); then
|
||
printf '%s\n' "$idx"
|
||
fi
|
||
done <<< "$mem_used_lines"
|
||
}
|
||
|
||
compose_hw_summary() {
|
||
local gpu_lines
|
||
gpu_lines="$(compose_hw_detect_gpus 2>/dev/null || true)"
|
||
if [[ -z "$gpu_lines" ]]; then
|
||
printf 'no NVIDIA GPUs detected'
|
||
return 0
|
||
fi
|
||
|
||
local count=0 first_name="" first_gb="" mixed=0 idx name mem_mib sm
|
||
while IFS=$'\t' read -r idx name mem_mib sm; do
|
||
[[ -z "$idx" ]] && continue
|
||
local gb
|
||
gb="$(compose_hw_vram_gb "$mem_mib")"
|
||
name="${name#NVIDIA }"
|
||
name="${name#GeForce }"
|
||
count=$((count + 1))
|
||
if [[ -z "$first_name" ]]; then
|
||
first_name="$name"
|
||
first_gb="$gb"
|
||
elif [[ "$name" != "$first_name" || "$gb" != "$first_gb" ]]; then
|
||
mixed=1
|
||
fi
|
||
done <<< "$gpu_lines"
|
||
|
||
if (( count == 0 )); then
|
||
printf 'no NVIDIA GPUs detected'
|
||
elif (( mixed == 0 )); then
|
||
if (( count == 1 )); then
|
||
printf '1× %s, %s GB' "$first_name" "$first_gb"
|
||
else
|
||
printf '%d× %s, %s GB each' "$count" "$first_name" "$first_gb"
|
||
fi
|
||
else
|
||
local parts=()
|
||
while IFS=$'\t' read -r idx name mem_mib sm; do
|
||
[[ -z "$idx" ]] && continue
|
||
name="${name#NVIDIA }"
|
||
name="${name#GeForce }"
|
||
parts+=("${name}, $(compose_hw_vram_gb "$mem_mib") GB")
|
||
done <<< "$gpu_lines"
|
||
local joined=""
|
||
for part in "${parts[@]}"; do
|
||
if [[ -z "$joined" ]]; then
|
||
joined="$part"
|
||
else
|
||
joined="${joined} + ${part}"
|
||
fi
|
||
done
|
||
printf '%s' "$joined"
|
||
fi
|
||
}
|
||
|
||
compose_hw_requirement_text() {
|
||
local min_vram_gb="$1"
|
||
local min_gpu_count="$2"
|
||
local requires_sm="${3:-}"
|
||
|
||
local req
|
||
if [[ "$min_gpu_count" == "1" ]]; then
|
||
req="${min_vram_gb} GB+"
|
||
else
|
||
req="${min_gpu_count}× ${min_vram_gb} GB"
|
||
fi
|
||
if [[ -n "$requires_sm" && "$requires_sm" != "0.0" ]]; then
|
||
req="${req}, sm_${requires_sm%%+}+"
|
||
fi
|
||
printf '%s' "$req"
|
||
}
|
||
|
||
compose_hw_compose_status() {
|
||
local compose_file="$1"
|
||
local min_vram_gb min_gpu_count requires_sm
|
||
|
||
min_vram_gb="$(compose_meta_get "$compose_file" requires-min-vram-gb || true)"
|
||
min_gpu_count="$(compose_meta_get "$compose_file" requires-min-gpu-count || true)"
|
||
requires_sm="$(compose_meta_get "$compose_file" requires-sm || true)"
|
||
|
||
if [[ -z "$min_vram_gb" || -z "$min_gpu_count" ]]; then
|
||
printf 'unknown|metadata unavailable'
|
||
return 2
|
||
fi
|
||
|
||
requires_sm="${requires_sm:-0.0}"
|
||
local required_sm_int
|
||
required_sm_int="$(compose_hw_sm_to_int "$requires_sm")"
|
||
|
||
local gpu_lines
|
||
gpu_lines="$(compose_hw_detect_gpus 2>/dev/null || true)"
|
||
if [[ -z "$gpu_lines" ]]; then
|
||
printf 'no|no NVIDIA GPUs detected'
|
||
return 1
|
||
fi
|
||
|
||
local eligible_count=0 idx name mem_mib sm gb sm_int
|
||
while IFS=$'\t' read -r idx name mem_mib sm; do
|
||
[[ -z "$idx" ]] && continue
|
||
gb="$(compose_hw_vram_gb "$mem_mib")"
|
||
sm_int="$(compose_hw_sm_to_int "$sm")"
|
||
if (( gb >= min_vram_gb && sm_int >= required_sm_int )); then
|
||
eligible_count=$((eligible_count + 1))
|
||
fi
|
||
done <<< "$gpu_lines"
|
||
|
||
if (( eligible_count >= min_gpu_count )); then
|
||
printf 'ok|fits your rig'
|
||
return 0
|
||
fi
|
||
|
||
printf 'no|needs %s (your rig: %s)' \
|
||
"$(compose_hw_requirement_text "$min_vram_gb" "$min_gpu_count" "$requires_sm")" \
|
||
"$(compose_hw_summary)"
|
||
return 1
|
||
}
|
||
|
||
compose_hw_compose_eligible() {
|
||
local status
|
||
status="$(compose_hw_compose_status "$1" 2>/dev/null || true)"
|
||
[[ "$status" == ok\|* ]]
|
||
}
|
||
|
||
compose_hw_model_status() {
|
||
local repo_root="$1"
|
||
local model="$2"
|
||
local candidates=()
|
||
local friendly_need=""
|
||
|
||
case "$model" in
|
||
qwen3.6-27b)
|
||
candidates=(
|
||
"${repo_root}/models/qwen3.6-27b/vllm/compose/single/autoround-int4/minimal.yml"
|
||
)
|
||
friendly_need="needs 20 GB+ VRAM (24 GB recommended)"
|
||
;;
|
||
gemma-4-31b)
|
||
candidates=(
|
||
"${repo_root}/models/gemma-4-31b/vllm/compose/dual/autoround-int4/bf16-mtp.yml"
|
||
"${repo_root}/models/gemma-4-31b/vllm/compose/dual/autoround-int4/int8.yml"
|
||
"${repo_root}/models/gemma-4-31b/vllm/compose/single/autoround-int4/fp8-mtp.yml"
|
||
)
|
||
friendly_need="needs 32 GB+ on single card OR 2× 24 GB"
|
||
;;
|
||
*)
|
||
printf 'no|unknown model: %s' "$model"
|
||
return 1
|
||
;;
|
||
esac
|
||
|
||
local file status
|
||
for file in "${candidates[@]}"; do
|
||
[[ -f "$file" ]] || continue
|
||
status="$(compose_hw_compose_status "$file" 2>/dev/null || true)"
|
||
if [[ "$status" == ok\|* ]]; then
|
||
printf 'ok|fits your rig'
|
||
return 0
|
||
fi
|
||
done
|
||
|
||
printf 'no|%s (your rig: %s)' "$friendly_need" "$(compose_hw_summary)"
|
||
return 1
|
||
}
|