feat: optimize text generation speed across all platforms and fix DeepThink control

This commit is contained in:
jarves committed 2026-06-17 10:37:13 +00:00
1 parent 523b791471
commit 2aec5c36ea
7 files changed
+795 -37

No files matched your search

+17 -1
View File
@@ -130,7 +130,23 @@ function App() {
temperature: 0.7,
systemPrompt: "You are a helpful local AI assistant.",
threads: Math.max(4, Math.min(16, (navigator.hardwareConcurrency || 4) - 2)),
enableThinking: true
enableThinking: true,
// New performance settings
gpuLayers: -1,
maxTokens: 1024,
topP: 0.95,
topK: 40,
minP: 0.05,
repeatPenalty: 1.1,
seed: null,
performanceProfile: "balanced",
flashAttn: true,
cacheTypeK: "q8_0",
cacheTypeV: "q8_0",
mlock: false,
mmap: true,
cachePrompt: true,
defragThold: 0.1,
};
});
+281
View File
@@ -685,6 +685,287 @@ function Settings({
<strong>No GPU detected.</strong> Text generation will use CPU only. Install GPU drivers or restart if you have a dedicated graphics card.
</div>
)}
{/* Performance Profile Preset */}
<div className="m3-text-field" style={{ marginTop: "16px" }}>
<label className="m3-text-field-label">Performance Profile</label>
<select
value={textSettings.performanceProfile || "balanced"}
onChange={(e) => {
const profile = e.target.value;
updateTextSetting("performanceProfile", profile);
// Auto-apply recommended settings for the profile
if (profile === "potato") {
updateTextSetting("contextSize", 2048);
updateTextSetting("cacheTypeK", "q4_0");
updateTextSetting("cacheTypeV", "q4_0");
updateTextSetting("mlock", true);
updateTextSetting("gpuLayers", 0);
} else if (profile === "balanced") {
updateTextSetting("contextSize", 4096);
updateTextSetting("cacheTypeK", "q8_0");
updateTextSetting("cacheTypeV", "q8_0");
updateTextSetting("mlock", false);
updateTextSetting("gpuLayers", -1);
} else if (profile === "high") {
updateTextSetting("contextSize", 8192);
updateTextSetting("cacheTypeK", "q8_0");
updateTextSetting("cacheTypeV", "q8_0");
updateTextSetting("mlock", false);
updateTextSetting("gpuLayers", -1);
}
}}
className="m3-input"
style={{ marginTop: "6px", height: "40px", cursor: "pointer" }}
>
<option value="potato">🥔 Potato PC (Low-end CPU, no GPU)</option>
<option value="balanced">⚖️ Balanced (Mid-range GPU/CPU)</option>
<option value="high">🚀 High-End (Fast GPU, 16GB+ VRAM)</option>
<option value="custom">🔧 Custom (Manual settings)</option>
</select>
<span style={{ fontSize: "0.75rem", color: "var(--md-sys-color-outline)", marginTop: "4px" }}>
One-click optimization for your hardware tier. Select "Custom" to fine-tune individual settings.
</span>
</div>
{/* Advanced Settings Toggle */}
<details style={{ marginTop: "16px" }}>
<summary style={{
fontSize: "0.85rem",
fontWeight: 600,
color: "var(--md-sys-color-primary)",
cursor: "pointer",
userSelect: "none"
}}>
Advanced Settings
</summary>
<div style={{ marginTop: "12px", paddingLeft: "8px" }}>
{/* CPU Threads */}
<div className="m3-slider-group" style={{ marginTop: "12px" }}>
<div className="m3-slider-header">
<span className="m3-slider-label">CPU Threads</span>
<span className="m3-slider-value">{textSettings.threads || specs?.cpu_cores_physical || 4}</span>
</div>
<input
type="range"
className="m3-slider"
value={textSettings.threads || specs?.cpu_cores_physical || 4}
onChange={(e) => updateTextSetting("threads", parseInt(e.target.value))}
min="1"
max="64"
step="1"
/>
<span style={{ fontSize: "0.75rem", color: "var(--md-sys-color-outline)", lineHeight: "1.3" }}>
Lower = less oversaturation on GPU mode. Auto-detected: {specs?.cpu_cores_physical || 4} physical cores.
</span>
</div>
{/* Max Tokens */}
<div className="m3-slider-group" style={{ marginTop: "12px" }}>
<div className="m3-slider-header">
<span className="m3-slider-label">Max Tokens</span>
<span className="m3-slider-value">{textSettings.maxTokens || 1024}</span>
</div>
<input
type="range"
className="m3-slider"
value={textSettings.maxTokens || 1024}
onChange={(e) => updateTextSetting("maxTokens", parseInt(e.target.value))}
min="128"
max="4096"
step="128"
/>
<span style={{ fontSize: "0.75rem", color: "var(--md-sys-color-outline)", lineHeight: "1.3" }}>
Maximum tokens to generate per response.
</span>
</div>
{/* Top P */}
<div className="m3-slider-group" style={{ marginTop: "12px" }}>
<div className="m3-slider-header">
<span className="m3-slider-label">Top P</span>
<span className="m3-slider-value">{textSettings.topP || 0.95}</span>
</div>
<input
type="range"
className="m3-slider"
value={textSettings.topP || 0.95}
onChange={(e) => updateTextSetting("topP", parseFloat(e.target.value))}
min="0"
max="1"
step="0.05"
/>
</div>
{/* Top K */}
<div className="m3-slider-group" style={{ marginTop: "12px" }}>
<div className="m3-slider-header">
<span className="m3-slider-label">Top K</span>
<span className="m3-slider-value">{textSettings.topK || 40}</span>
</div>
<input
type="range"
className="m3-slider"
value={textSettings.topK || 40}
onChange={(e) => updateTextSetting("topK", parseInt(e.target.value))}
min="1"
max="100"
step="1"
/>
</div>
{/* Min P */}
<div className="m3-slider-group" style={{ marginTop: "12px" }}>
<div className="m3-slider-header">
<span className="m3-slider-label">Min P</span>
<span className="m3-slider-value">{textSettings.minP || 0.05}</span>
</div>
<input
type="range"
className="m3-slider"
value={textSettings.minP || 0.05}
onChange={(e) => updateTextSetting("minP", parseFloat(e.target.value))}
min="0"
max="1"
step="0.01"
/>
</div>
{/* Repeat Penalty */}
<div className="m3-slider-group" style={{ marginTop: "12px" }}>
<div className="m3-slider-header">
<span className="m3-slider-label">Repeat Penalty</span>
<span className="m3-slider-value">{textSettings.repeatPenalty || 1.1}</span>
</div>
<input
type="range"
className="m3-slider"
value={textSettings.repeatPenalty || 1.1}
onChange={(e) => updateTextSetting("repeatPenalty", parseFloat(e.target.value))}
min="0.5"
max="2.0"
step="0.05"
/>
</div>
{/* KV Cache Type K */}
<div className="m3-text-field" style={{ marginTop: "12px" }}>
<label className="m3-text-field-label">KV Cache Type K</label>
<select
value={textSettings.cacheTypeK || "q8_0"}
onChange={(e) => updateTextSetting("cacheTypeK", e.target.value)}
className="m3-input"
style={{ marginTop: "6px", height: "40px", cursor: "pointer" }}
>
<option value="f16">f16 (Highest quality, most memory)</option>
<option value="q8_0">q8_0 (Balanced, 2x memory reduction)</option>
<option value="q4_0">q4_0 (Aggressive, 4x memory reduction)</option>
</select>
</div>
{/* KV Cache Type V */}
<div className="m3-text-field" style={{ marginTop: "12px" }}>
<label className="m3-text-field-label">KV Cache Type V</label>
<select
value={textSettings.cacheTypeV || "q8_0"}
onChange={(e) => updateTextSetting("cacheTypeV", e.target.value)}
className="m3-input"
style={{ marginTop: "6px", height: "40px", cursor: "pointer" }}
>
<option value="f16">f16 (Highest quality, most memory)</option>
<option value="q8_0">q8_0 (Balanced, 2x memory reduction)</option>
<option value="q4_0">q4_0 (Aggressive, 4x memory reduction)</option>
</select>
</div>
{/* Flash Attention Toggle */}
<div style={{ marginTop: "12px" }}>
<label style={{ display: "flex", alignItems: "flex-start", gap: "10px", cursor: "pointer", fontSize: "0.85rem" }}>
<input
type="checkbox"
checked={textSettings.flashAttn !== false}
onChange={(e) => updateTextSetting("flashAttn", e.target.checked)}
style={{ width: "16px", height: "16px", marginTop: "3px", accentColor: "var(--md-sys-color-primary)", cursor: "pointer" }}
/>
<div>
<strong>Flash Attention</strong>
<div style={{ fontSize: "0.75rem", color: "var(--md-sys-color-outline)", marginTop: "2px" }}>
Memory-efficient attention for faster generation and lower VRAM usage.
</div>
</div>
</label>
</div>
{/* Memory Lock (mlock) Toggle */}
<div style={{ marginTop: "12px" }}>
<label style={{ display: "flex", alignItems: "flex-start", gap: "10px", cursor: "pointer", fontSize: "0.85rem" }}>
<input
type="checkbox"
checked={textSettings.mlock === true}
onChange={(e) => updateTextSetting("mlock", e.target.checked)}
style={{ width: "16px", height: "16px", marginTop: "3px", accentColor: "var(--md-sys-color-primary)", cursor: "pointer" }}
/>
<div>
<strong>Memory Lock (mlock)</strong>
<div style={{ fontSize: "0.75rem", color: "var(--md-sys-color-outline)", marginTop: "2px" }}>
Prevent OS from paging model to disk. Recommended for CPU mode.
</div>
</div>
</label>
</div>
{/* Memory Map (mmap) Toggle */}
<div style={{ marginTop: "12px" }}>
<label style={{ display: "flex", alignItems: "flex-start", gap: "10px", cursor: "pointer", fontSize: "0.85rem" }}>
<input
type="checkbox"
checked={textSettings.mmap !== false}
onChange={(e) => updateTextSetting("mmap", e.target.checked)}
style={{ width: "16px", height: "16px", marginTop: "3px", accentColor: "var(--md-sys-color-primary)", cursor: "pointer" }}
/>
<div>
<strong>Memory Map (mmap)</strong>
<div style={{ fontSize: "0.75rem", color: "var(--md-sys-color-outline)", marginTop: "2px" }}>
Faster model loading via memory-mapped files.
</div>
</div>
</label>
</div>
{/* Seed */}
<div className="m3-text-field" style={{ marginTop: "12px" }}>
<label className="m3-text-field-label">Seed (optional)</label>
<input
type="number"
value={textSettings.seed || ""}
onChange={(e) => updateTextSetting("seed", e.target.value ? parseInt(e.target.value) : null)}
placeholder="Random"
className="m3-input"
style={{ marginTop: "6px", height: "40px" }}
/>
<span style={{ fontSize: "0.75rem", color: "var(--md-sys-color-outline)", marginTop: "4px" }}>
Set for reproducible outputs. Leave empty for random.
</span>
</div>
</div>
</details>
{/* NPU Detection Badge */}
{specs?.npu?.detected && (
<div style={{
marginTop: "16px",
padding: "10px 14px",
background: "rgba(99, 102, 241, 0.08)",
border: "1px dashed var(--md-sys-color-primary)",
borderRadius: "8px",
fontSize: "0.75rem",
color: "var(--md-sys-color-on-surface)",
lineHeight: "1.45"
}}>
<strong>Intel NPU detected.</strong> NPU text generation via OpenVINO/IPEX-LLM is on the roadmap for future updates.
</div>
)}
</div>
</div>
+70 -26
View File
@@ -9,7 +9,7 @@ import {
stopLlm,
} from "../services/api";
const processMessageContent = (rawText, apiReasoning = "") => {
const processMessageContent = (rawText, apiReasoning = "", enableThinking = true) => {
let content = rawText;
let reasoning = apiReasoning || "";
@@ -47,21 +47,32 @@ const processMessageContent = (rawText, apiReasoning = "") => {
if (endIdx !== -1) {
const actualEndIdxInRaw = startIdx + matchedStartTag.length + endIdx;
const extractedReasoning = rawText.substring(startIdx + matchedStartTag.length, actualEndIdxInRaw).trim();
reasoning = (reasoning + "\n" + extractedReasoning).trim();
// Only extract reasoning if thinking is enabled
if (enableThinking) {
reasoning = (reasoning + "\n" + extractedReasoning).trim();
}
const afterEndText = rawText.substring(actualEndIdxInRaw + matchedEndTag.length);
content = (rawText.substring(0, startIdx) + afterEndText).trim();
return processMessageContent(content, reasoning);
return processMessageContent(content, reasoning, enableThinking);
} else {
const extractedReasoning = rawText.substring(startIdx + matchedStartTag.length).trim();
reasoning = (reasoning + "\n" + extractedReasoning).trim();
// Only extract reasoning if thinking is enabled
if (enableThinking) {
reasoning = (reasoning + "\n" + extractedReasoning).trim();
}
content = rawText.substring(0, startIdx).trim();
}
}
return { content, reasoning };
};
}
return { content, reasoning };
};
function ThinkingBlock({ reasoning, isComplete, thinkingDuration }) {
const [isExpanded, setIsExpanded] = useState(!isComplete);
@@ -143,6 +154,11 @@ function TextChat({
const chatMessagesRef = useRef(null);
const prevMessagesLengthRef = useRef(0);
const abortControllerRef = useRef(null);
// rAF batching: accumulate token updates and flush once per frame
const tokenBufferRef = useRef(null);
const rafRef = useRef(null);
// Debounced stats: only update stats pill every 250ms
const statsDebounceRef = useRef(null);
const [attachments, setAttachments] = useState([]);
const fileInputRef = useRef(null);
@@ -477,7 +493,12 @@ function TextChat({
const response = await streamChatWithLlm(requestMessages, {
temperature: textSettings?.temperature || 0.7,
maxTokens: 768,
maxTokens: textSettings?.maxTokens || 1024,
topP: textSettings?.topP,
topK: textSettings?.topK,
minP: textSettings?.minP,
repeatPenalty: textSettings?.repeatPenalty,
seed: textSettings?.seed,
signal: controller.signal,
}, (_token, fullText, _reasoningToken, fullReasoning) => {
const now = performance.now();
@@ -489,7 +510,7 @@ function TextChat({
? Math.max(0.05, (now - firstTokenAt) / 1000)
: Math.max(0.05, (now - requestStartedAt) / 1000);
const processed = processMessageContent(fullText, fullReasoning);
const processed = processMessageContent(fullText, fullReasoning, textSettings?.enableThinking !== false);
assistantText = processed.content;
assistantReasoning = processed.reasoning;
@@ -505,24 +526,46 @@ function TextChat({
? thinkingDuration
: (thinkingStartedAt ? (now - thinkingStartedAt) / 1000 : 0);
setMessages((prev) => {
const updated = [...prev];
if (updated.length > 0 && updated[updated.length - 1].role === "assistant") {
updated[updated.length - 1] = {
...updated[updated.length - 1],
content: processed.content,
reasoning: processed.reasoning,
thinkingDuration: currentThinkingDuration,
generationStats: {
status: "streaming",
tokens: streamedTokens,
tokensPerSecond: streamedTokens / generationSeconds,
seconds: (now - requestStartedAt) / 1000,
},
};
}
return updated;
});
// Debounced stats update: only update stats every 250ms for smoother UI
// while text still updates per-frame via rAF batching
const currentStats = {
status: "streaming",
tokens: streamedTokens,
tokensPerSecond: streamedTokens / generationSeconds,
seconds: (now - requestStartedAt) / 1000,
};
// rAF batching: accumulate updates and flush once per frame (~16ms)
// This reduces React re-renders from N per token to ~60/sec
tokenBufferRef.current = {
content: processed.content,
reasoning: processed.reasoning,
thinkingDuration: currentThinkingDuration,
stats: currentStats,
};
if (!rafRef.current) {
rafRef.current = requestAnimationFrame(() => {
const buffer = tokenBufferRef.current;
if (buffer) {
setMessages((prev) => {
const updated = [...prev];
if (updated.length > 0 && updated[updated.length - 1].role === "assistant") {
updated[updated.length - 1] = {
...updated[updated.length - 1],
content: buffer.content,
reasoning: buffer.reasoning,
thinkingDuration: buffer.thinkingDuration,
generationStats: buffer.stats,
};
}
return updated;
});
tokenBufferRef.current = null;
}
rafRef.current = null;
});
}
});
const completedAt = performance.now();
@@ -546,7 +589,7 @@ function TextChat({
seconds: exactSeconds,
};
const processed = processMessageContent(assistantText, response.reasoningContent || assistantReasoning);
const processed = processMessageContent(assistantText, response.reasoningContent || assistantReasoning, textSettings?.enableThinking !== false);
const finalMessages = [...nextMessages, {
role: "assistant",
content: processed.content,
@@ -758,7 +801,8 @@ function TextChat({
{messages.map((message, index) => {
const processed = processMessageContent(
Array.isArray(message.content) ? "" : (message.content || ""),
message.reasoning || ""
message.reasoning || "",
textSettings?.enableThinking !== false
);
const displayContent = Array.isArray(message.content) ? message.content : processed.content;
const displayReasoning = processed.reasoning;
+29
View File
@@ -365,6 +365,15 @@ export async function chatWithLlm(messages, options = {}) {
messages,
temperature: options.temperature,
max_tokens: options.maxTokens,
// New sampling parameters
top_p: options.topP,
top_k: options.topK,
min_p: options.minP,
repeat_penalty: options.repeatPenalty,
frequency_penalty: options.frequencyPenalty,
presence_penalty: options.presencePenalty,
seed: options.seed,
stop: options.stop,
}),
});
const data = await readJsonResponse(res, "The local text model returned an invalid response.");
@@ -385,6 +394,15 @@ export async function streamChatWithLlm(messages, options = {}, onToken = () =>
temperature: options.temperature,
max_tokens: options.maxTokens,
stream: true,
// New sampling parameters
top_p: options.topP,
top_k: options.topK,
min_p: options.minP,
repeat_penalty: options.repeatPenalty,
frequency_penalty: options.frequencyPenalty,
presence_penalty: options.presencePenalty,
seed: options.seed,
stop: options.stop,
}),
};
if (options.signal) {
@@ -477,6 +495,17 @@ export async function deleteLlmModel(filename) {
return await readJsonResponse(res, "The local server returned an invalid text model delete response.");
}
export async function getLlmRecommendations(useCase = "chat", limit = 10) {
try {
const res = await fetch(`/api/llm/recommend?useCase=${encodeURIComponent(useCase)}&limit=${limit}`);
const data = await res.json();
if (!res.ok || !data.ok) return null;
return data.recommendations;
} catch (_) {
return null;
}
}
export async function listGeneratedOutputs() {
try {
const res = await fetch("/api/outputs");
+383 -8
View File
@@ -11,6 +11,13 @@ const os = require("os");
const path = require("path");
const { spawn, spawnSync, execSync, exec } = require("child_process");
// HTTP keep-alive agent for llama-server (eliminates TCP handshake per request)
const llmHttpAgent = new http.Agent({
keepAlive: true,
maxSockets: 1,
keepAliveMsecs: 30000,
});
const HF_MODEL_CACHE_TTL_MS = 5 * 60 * 1000;
const hfModelCache = new Map();
@@ -80,9 +87,11 @@ if (!fs.existsSync(LLM_MODELS)) {
const LLM_BACKEND_PATHS = {
winCuda: path.join(ROOT, "app", "llm-backend", "win", "cuda", "llama-server.exe"),
winVulkan: path.join(ROOT, "app", "llm-backend", "win", "vulkan", "llama-server.exe"),
winSycl: path.join(ROOT, "app", "llm-backend", "win", "sycl", "llama-server.exe"),
winCpu: path.join(ROOT, "app", "llm-backend", "win", "cpu", "llama-server.exe"),
linuxCuda: path.join(ROOT, "app", "llm-backend", "linux", "cuda", "llama-server"),
linuxVulkan: path.join(ROOT, "app", "llm-backend", "linux", "vulkan", "llama-server"),
linuxSycl: path.join(ROOT, "app", "llm-backend", "linux", "sycl", "llama-server"),
linuxCpu: path.join(ROOT, "app", "llm-backend", "linux", "cpu", "llama-server"),
macArm64: path.join(ROOT, "app", "llm-backend", "mac", "arm64", "llama-server"),
macX64: path.join(ROOT, "app", "llm-backend", "mac", "x64", "llama-server"),
@@ -130,6 +139,16 @@ let llmSettings = {
backendMode: "",
backendBinary: "",
supportsVision: false,
flashAttn: true,
cacheTypeK: "q8_0",
cacheTypeV: "q8_0",
mlock: false,
mmap: true,
cachePrompt: true,
defragThold: 0.1,
batchSize: 512,
ubatchSize: 512,
performanceProfile: "balanced",
};
let backendLoadState = {
active: false,
@@ -172,6 +191,44 @@ function roundGb(bytes) {
return Math.round((bytes / (1024 ** 3)) * 100) / 100;
}
// Detect physical CPU cores (not logical/hyperthreaded cores)
// llama.cpp docs: "Do NOT set threads too high — major cause of oversaturation"
function getPhysicalCores() {
const cpus = os.cpus();
const logicalCores = cpus.length;
if (logicalCores <= 1) return 1;
// Check if hyperthreading is likely: compare unique core IDs vs total
// On Windows/Linux, os.cpus() lists each logical core separately
// Physical cores typically have the same model but different speeds can indicate HT
const uniqueModels = new Set(cpus.map(c => c.model)).size;
// If we have very few unique models relative to core count, likely HT
// Also check: if logical cores is exactly 2x a common physical core count
const commonPhysicalCounts = [2, 4, 6, 8, 10, 12, 16, 20, 24, 32];
const isLikelyHT = commonPhysicalCounts.some(physical => logicalCores === physical * 2);
if (isLikelyHT || uniqueModels < logicalCores / 2) {
return Math.max(1, Math.floor(logicalCores / 2));
}
return logicalCores;
}
// Get optimal thread count for llama.cpp
// GPU mode: fewer threads to avoid CPU-GPU contention (physical/2)
// CPU mode: use physical cores directly
function getOptimalThreads(isGpuMode) {
const physicalCores = getPhysicalCores();
if (isGpuMode) {
// llama.cpp benchmark: 4 threads on 7-core CPU + GPU = 9.1 t/s (optimal)
// vs 7 threads = 8.7 t/s (oversaturated)
return Math.max(1, Math.floor(physicalCores / 2));
}
return Math.max(1, physicalCores);
}
function getCpuSample() {
return os.cpus().reduce((acc, cpu) => {
const times = cpu.times;
@@ -298,6 +355,44 @@ function detectLlamaVulkanGpu() {
return cachedLlamaVulkanGpu;
}
let cachedLlamaSyclGpu = null;
let cachedLlamaSyclGpuChecked = false;
function detectLlamaSyclGpu() {
if (cachedLlamaSyclGpuChecked) return cachedLlamaSyclGpu;
cachedLlamaSyclGpuChecked = true;
const backendPath = osPlatform === "win32"
? LLM_BACKEND_PATHS.winSycl
: osPlatform === "linux"
? LLM_BACKEND_PATHS.linuxSycl
: "";
if (!backendPath || !fs.existsSync(backendPath)) return null;
try {
const result = spawnSync(backendPath, ["--list-devices"], {
encoding: "utf8",
windowsHide: true,
timeout: 10000,
maxBuffer: 1024 * 1024,
});
const output = `${result.stdout || ""}\n${result.stderr || ""}`;
const devices = [];
const devicePattern = /SYCL\d+\s*:\s*(.+?)\s+\(([\d.]+)\s+MiB(?:,\s*([\d.]+)\s+MiB free)?\)/gi;
let match;
while ((match = devicePattern.exec(output)) !== null) {
devices.push({
name: match[1].trim(),
vram_gb: Math.round((Number(match[2]) / 1024) * 100) / 100,
free_vram_gb: match[3] ? Math.round((Number(match[3]) / 1024) * 100) / 100 : null,
});
}
cachedLlamaSyclGpu = devices.sort((a, b) => b.vram_gb - a.vram_gb)[0] || null;
} catch (_) {
cachedLlamaSyclGpu = null;
}
return cachedLlamaSyclGpu;
}
function getGpuInfo() {
if (cachedGpuInfo) return cachedGpuInfo;
@@ -528,6 +623,80 @@ function getGpuInfo() {
return cachedGpuInfo;
}
// ── NPU Detection ─────────────────────────────────────────────────────────────
let cachedNpuInfo = null;
function detectNpu() {
if (cachedNpuInfo !== null) return cachedNpuInfo;
cachedNpuInfo = { detected: false, vendor: null, name: null };
if (osPlatform === "win32") {
try {
const output = execSync(
'powershell -NoProfile -Command "Get-PnpDevice | Where-Object { $_.FriendlyName -match \'Intel.*NPU\' -or $_.FriendlyName -match \'Neural\' } | Select-Object -First 1 FriendlyName"',
{ encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5000 }
).trim();
if (output && output.includes("NPU")) {
cachedNpuInfo = { detected: true, vendor: "intel", name: output.trim() };
}
} catch (_) {}
} else if (osPlatform === "linux") {
try {
const output = execSync("lspci | grep -i 'neural\|npu' || true", {
encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5000
}).trim();
if (output) {
const isIntel = output.toLowerCase().includes("intel");
cachedNpuInfo = {
detected: true,
vendor: isIntel ? "intel" : "unknown",
name: output.split("\n")[0].trim()
};
}
} catch (_) {}
}
// macOS: Apple Silicon Neural Engine is part of the SoC, not a separate NPU device
return cachedNpuInfo;
}
// ── GPU Layer Auto-Tuning ─────────────────────────────────────────────────────
// Calculate optimal GPU layer count from free VRAM to prevent OOM
function chooseAutoLayers(modelFilename, freeVramBytes, cacheTypeK = "q8_0", cacheTypeV = "q8_0") {
let modelSizeGb = 4;
let layerCount = 32;
try {
const modelPath = path.join(LLM_MODELS, modelFilename);
if (fs.existsSync(modelPath)) {
const stats = fs.statSync(modelPath);
modelSizeGb = stats.size / (1024 * 1024 * 1024);
}
} catch (_) {}
// Estimate layer count from model size (rough heuristic based on common architectures)
if (modelSizeGb < 2) layerCount = 24; // Small models (1-2B)
else if (modelSizeGb < 4) layerCount = 32; // Medium (3-4B)
else if (modelSizeGb < 8) layerCount = 40; // Large (7-8B)
else if (modelSizeGb < 20) layerCount = 80; // Very large (13-20B)
else if (modelSizeGb < 40) layerCount = 100; // Huge (30-40B)
else layerCount = 120; // Massive (70B+)
// Calculate approximate layer size
const layerSizeGb = modelSizeGb / layerCount;
// Account for KV cache memory with quantization
// q8_0 = 0.5x, q4_0 = 0.25x of f16
const kvCacheMultiplier = (cacheTypeK === "q4_0" || cacheTypeV === "q4_0") ? 0.25 :
(cacheTypeK === "q8_0" || cacheTypeV === "q8_0") ? 0.5 : 1.0;
// Leave 15% VRAM headroom for KV cache + overhead + OS
const usableVram = freeVramBytes * 0.85;
const maxLayers = Math.floor(usableVram / (layerSizeGb * 1024 * 1024 * 1024));
// Cap at total layers, return -1 if fits fully
if (maxLayers >= layerCount) return -1; // All layers fit
return Math.max(0, maxLayers);
}
let nvidiaSmiCmd = "nvidia-smi";
let hasNvidiaSmi = null;
@@ -636,6 +805,9 @@ function getHardwareSpecs() {
const gpu = getGpuInfo();
const ramTotalGb = roundGb(os.totalmem());
const gpuVramGb = gpu.vram_gb || 0;
const physicalCores = getPhysicalCores();
const logicalCores = cpus.length;
const npuInfo = detectNpu();
// Tiering logic
let tier = "low";
@@ -667,6 +839,52 @@ function getHardwareSpecs() {
}
}
// Recommended text settings per tier
const recommendedTextSettings = {
low: {
contextSize: 2048,
threads: Math.max(1, physicalCores),
gpuLayers: 0,
cacheTypeK: "q4_0",
cacheTypeV: "q4_0",
flashAttn: true,
mlock: true,
mmap: true,
cachePrompt: true,
batchSize: 256,
ubatchSize: 256,
performanceProfile: "potato",
},
mid: {
contextSize: 4096,
threads: Math.max(1, Math.floor(physicalCores / 2)),
gpuLayers: -1,
cacheTypeK: "q8_0",
cacheTypeV: "q8_0",
flashAttn: true,
mlock: false,
mmap: true,
cachePrompt: true,
batchSize: 512,
ubatchSize: 512,
performanceProfile: "balanced",
},
high: {
contextSize: 8192,
threads: Math.max(1, Math.floor(physicalCores / 2)),
gpuLayers: -1,
cacheTypeK: "q8_0",
cacheTypeV: "q8_0",
flashAttn: true,
mlock: false,
mmap: true,
cachePrompt: true,
batchSize: 1024,
ubatchSize: 1024,
performanceProfile: "high",
},
};
// Recommended models catalog matching contract exactly
let recommended_models = [];
if (tier === "high") {
@@ -731,12 +949,15 @@ function getHardwareSpecs() {
return {
os_name: `${os.type()} ${os.release()}`,
cpu_name: cpus[0]?.model || "Unavailable",
cpu_cores_physical: Math.max(1, Math.round(cpus.length / 2)),
cpu_cores_logical: cpus.length || 1,
cpu_cores_physical: physicalCores,
cpu_cores_logical: logicalCores,
ram_total_gb: ramTotalGb,
gpu_name: gpu.name,
gpu_vram_gb: gpuVramGb,
recommended_models
npu: npuInfo,
tier,
recommended_models,
recommended_text_settings: recommendedTextSettings[tier] || recommendedTextSettings.mid,
};
}
@@ -968,12 +1189,18 @@ function getLlmBackend() {
if (fs.existsSync(LLM_BACKEND_PATHS.winCuda) && detectLlamaCudaGpu()) {
return { path: LLM_BACKEND_PATHS.winCuda, mode: "Auto (CUDA/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.winSycl) && detectLlamaSyclGpu()) {
return { path: LLM_BACKEND_PATHS.winSycl, mode: "Auto (SYCL/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.winVulkan) && detectLlamaVulkanGpu()) {
return { path: LLM_BACKEND_PATHS.winVulkan, mode: "Auto (Vulkan/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.winCuda)) {
return { path: LLM_BACKEND_PATHS.winCuda, mode: "Auto (CUDA/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.winSycl)) {
return { path: LLM_BACKEND_PATHS.winSycl, mode: "Auto (SYCL/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.winVulkan)) {
return { path: LLM_BACKEND_PATHS.winVulkan, mode: "Auto (Vulkan/CPU)" };
}
@@ -987,12 +1214,18 @@ function getLlmBackend() {
if (fs.existsSync(LLM_BACKEND_PATHS.linuxCuda) && detectLlamaCudaGpu()) {
return { path: LLM_BACKEND_PATHS.linuxCuda, mode: "Auto (CUDA/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.linuxSycl) && detectLlamaSyclGpu()) {
return { path: LLM_BACKEND_PATHS.linuxSycl, mode: "Auto (SYCL/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.linuxVulkan) && detectLlamaVulkanGpu()) {
return { path: LLM_BACKEND_PATHS.linuxVulkan, mode: "Auto (Vulkan/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.linuxCuda)) {
return { path: LLM_BACKEND_PATHS.linuxCuda, mode: "Auto (CUDA/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.linuxSycl)) {
return { path: LLM_BACKEND_PATHS.linuxSycl, mode: "Auto (SYCL/CPU)" };
}
if (fs.existsSync(LLM_BACKEND_PATHS.linuxVulkan)) {
return { path: LLM_BACKEND_PATHS.linuxVulkan, mode: "Auto (Vulkan/CPU)" };
}
@@ -2182,6 +2415,17 @@ async function startLlm(settings = {}) {
backendBinary: path.basename(backend.path),
enableThinking: settings.enableThinking !== false,
supportsThinking: /deepseek|qwen3|gemma-4|gemma4|think|r1|e2b|reasoning/i.test(filename),
// New performance settings
flashAttn: settings.flashAttn !== false,
cacheTypeK: settings.cacheTypeK || llmSettings.cacheTypeK || "q8_0",
cacheTypeV: settings.cacheTypeV || llmSettings.cacheTypeV || "q8_0",
mlock: settings.mlock || llmSettings.mlock || false,
mmap: settings.mmap !== false && llmSettings.mmap !== false,
cachePrompt: settings.cachePrompt !== false && llmSettings.cachePrompt !== false,
defragThold: Number(settings.defragThold) || llmSettings.defragThold || 0.1,
batchSize: Math.max(128, Math.min(2048, Number(settings.batchSize) || llmSettings.batchSize || 512)),
ubatchSize: Math.max(128, Math.min(2048, Number(settings.ubatchSize) || llmSettings.ubatchSize || 512)),
performanceProfile: settings.performanceProfile || llmSettings.performanceProfile || "balanced",
};
let mmprojPath = null;
@@ -2260,11 +2504,38 @@ async function startLlm(settings = {}) {
"--threads", String(llmSettings.threads),
"--n-gpu-layers", String(llmSettings.gpuLayers),
"--parallel", "1",
"--cache-ram", "0",
"--no-warmup",
"--flash-attn", "on", // ✅ Memory-efficient attention (all backends)
"--cache-type-k", String(llmSettings.cacheTypeK), // ✅ KV cache quantization K
"--cache-type-v", String(llmSettings.cacheTypeV), // ✅ KV cache quantization V
"--cache-prompt", // ✅ Prompt caching for multi-turn (major UX win)
"--ctx-checkpoints", "8", // ✅ Context shifting recovery
"--poll", "30", // ✅ More aggressive polling
"--metrics", // ✅ Metrics endpoint for tuning
"--defrag-thold", String(llmSettings.defragThold), // ✅ KV cache defragmentation
"--batch-size", String(llmSettings.batchSize), // ✅ Prompt processing batch
"--ubatch-size", String(llmSettings.ubatchSize), // ✅ Micro-batch size
];
// CPU mode: lock memory to prevent OS paging (critical for consistent speed)
const isGpuMode = backend.mode.includes("GPU") || backend.mode.includes("CUDA") ||
backend.mode.includes("Vulkan") || backend.mode.includes("Metal") ||
backend.mode.includes("SYCL");
if (!isGpuMode && llmSettings.mlock) {
args.push("--mlock"); // ✅ Prevent OS swapping on CPU
}
// All modes: memory-mapped loading for faster startup
if (llmSettings.mmap) {
args.push("--mmap"); // ✅ Faster model loading
}
if (llmSettings.enableThinking === false) {
args.push("--reasoning-format", "none");
args.push("--reasoning", "off"); // ✅ Disable reasoning/thinking completely
} else if (llmSettings.supportsThinking) {
args.push("--reasoning", "on"); // ✅ Enable reasoning for supported models
}
if (llmSettings.enableThinking !== false && llmSettings.supportsThinking) {
args.push("--reasoning-format", "deepseek"); // ✅ Extract thoughts into reasoning_content
}
if (mmprojPath) {
args.push("--mmproj", mmprojPath);
@@ -2273,11 +2544,30 @@ async function startLlm(settings = {}) {
llmSettings.mmproj = mmprojPath ? path.basename(mmprojPath) : null;
const spawnEnv = { ...process.env };
const backendDir = path.dirname(backend.path);
// Platform library paths
if (osPlatform === "linux") {
spawnEnv.LD_LIBRARY_PATH = backendDir + (spawnEnv.LD_LIBRARY_PATH ? `:${spawnEnv.LD_LIBRARY_PATH}` : "");
} else if (osPlatform === "darwin") {
spawnEnv.DYLD_LIBRARY_PATH = backendDir + (spawnEnv.DYLD_LIBRARY_PATH ? `:${spawnEnv.DYLD_LIBRARY_PATH}` : "");
}
// CUDA-specific optimizations
if (backend.mode.includes("CUDA")) {
// Multi-GPU: increase command buffer size (reduces CPU stalls)
spawnEnv.CUDA_SCALE_LAUNCH_QUEUES = spawnEnv.CUDA_SCALE_LAUNCH_QUEUES || "4x";
// Linux: allow swapping to system RAM when VRAM exhausted
if (osPlatform === "linux") {
spawnEnv.GGML_CUDA_ENABLE_UNIFIED_MEMORY = spawnEnv.GGML_CUDA_ENABLE_UNIFIED_MEMORY || "1";
}
}
// SYCL-specific optimizations (Intel Arc/Graphics)
if (backend.mode.includes("SYCL")) {
spawnEnv.GGML_SYCL_ENABLE_FLASH_ATTN = "1";
spawnEnv.ZES_ENABLE_SYSMAN = "1";
}
console.log(" [llm] Starting:", backend.path, args.join(" "));
llmProc = spawn(backend.path, args, { stdio: "pipe", env: spawnEnv });
@@ -2287,6 +2577,7 @@ async function startLlm(settings = {}) {
process.stderr.write(" [llm-err] " + output);
if (/Vulkan\d+\s*:/i.test(output)) llmSettings.backendMode = "Vulkan GPU";
else if (/CUDA\d+\s*:/i.test(output)) llmSettings.backendMode = "CUDA GPU";
else if (/SYCL\d+\s*:/i.test(output)) llmSettings.backendMode = "SYCL GPU";
else if (/Metal/i.test(output) && /GPU|device/i.test(output)) llmSettings.backendMode = "Metal GPU";
else if (/\-\s+CPU\s+:/i.test(output) && llmSettings.backendMode.startsWith("Auto")) llmSettings.backendMode = "CPU";
if (/error|failed/i.test(output) && !/no error/i.test(output)) {
@@ -3459,8 +3750,17 @@ async function doLlmChat(req, res, body, retryCount = 0) {
model: llmSettings.model || "local-model",
messages: Array.isArray(body.messages) ? body.messages : [],
temperature: Number.isFinite(Number(body.temperature)) ? Number(body.temperature) : 0.7,
max_tokens: Math.max(1, Math.min(4096, Number(body.max_tokens) || 512)),
max_tokens: Math.max(1, Math.min(4096, Number(body.max_tokens) || Number(body.maxTokens) || 1024)),
stream: isStream,
// New sampling parameters
top_p: Number.isFinite(Number(body.top_p)) ? Number(body.top_p) : 0.95,
top_k: Number.isFinite(Number(body.top_k)) ? Number(body.top_k) : 40,
min_p: Number.isFinite(Number(body.min_p)) ? Number(body.min_p) : 0.05,
repeat_penalty: Number.isFinite(Number(body.repeat_penalty)) ? Number(body.repeat_penalty) : 1.1,
frequency_penalty: Number.isFinite(Number(body.frequency_penalty)) ? Number(body.frequency_penalty) : 0.0,
presence_penalty: Number.isFinite(Number(body.presence_penalty)) ? Number(body.presence_penalty) : 0.0,
seed: Number.isInteger(Number(body.seed)) ? Number(body.seed) : undefined,
stop: Array.isArray(body.stop) ? body.stop : (body.stop ? [body.stop] : undefined),
});
if (isStream) {
@@ -3472,7 +3772,8 @@ async function doLlmChat(req, res, body, retryCount = 0) {
headers: {
"Content-Type": "application/json",
"Content-Length": Buffer.byteLength(requestData),
}
},
agent: llmHttpAgent, // ✅ HTTP keep-alive: eliminates TCP handshake per turn
}, (clientRes) => {
if (clientRes.statusCode < 200 || clientRes.statusCode >= 300) {
let errorBody = "";
@@ -3556,6 +3857,71 @@ async function doLlmChat(req, res, body, retryCount = 0) {
}
}
// ── llmfit Integration ──────────────────────────────────────────────────────────
let cachedLlmfitResults = new Map();
function getHardwareHash() {
const cpus = os.cpus();
const gpu = getGpuInfo();
const ram = os.totalmem();
return `${cpus.length}-${cpus[0]?.model || 'unknown'}-${gpu.name}-${ram}`;
}
async function getLlmfitRecommendations(useCase = "chat", limit = 10) {
const hardwareHash = getHardwareHash();
const cacheKey = `${hardwareHash}:${useCase}:${limit}`;
const cached = cachedLlmfitResults.get(cacheKey);
if (cached && (Date.now() - cached.timestamp) < 3600000) { // 1 hour cache
return cached.data;
}
// Try to find llmfit binary
const llmfitPaths = [
path.join(ROOT, "app", "tools", "llmfit", osPlatform === "win32" ? "llmfit.exe" : "llmfit"),
"llmfit", // PATH
];
let llmfitPath = null;
for (const p of llmfitPaths) {
try {
if (fs.existsSync(p)) {
llmfitPath = p;
break;
}
if (osPlatform !== "win32") {
const whichResult = spawnSync("which", [p], { stdio: "ignore" });
if (whichResult.status === 0) {
llmfitPath = p;
break;
}
}
} catch (_) {}
}
if (!llmfitPath) return null; // Fallback to tier table
try {
const result = spawnSync(llmfitPath, [
"recommend", "--json", "--limit", String(limit),
"--use-case", useCase, "--force-runtime", "llamacpp"
], {
encoding: "utf8",
timeout: 8000,
maxBuffer: 1024 * 1024,
windowsHide: true,
});
if (result.status !== 0) return null;
const data = JSON.parse(result.stdout);
cachedLlmfitResults.set(cacheKey, { timestamp: Date.now(), data });
return data;
} catch (_) {
return null;
}
}
if (req.url === "/api/llm/chat" && req.method === "POST") {
const body = await readJsonBody(req, res);
if (!body) return;
@@ -3564,6 +3930,15 @@ async function doLlmChat(req, res, body, retryCount = 0) {
return;
}
// GET /api/llm/recommend — llmfit recommendations
if (req.url.startsWith("/api/llm/recommend") && req.method === "GET") {
const url = new URL(req.url, `http://${req.headers.host || "localhost"}`);
const useCase = url.searchParams.get("useCase") || "chat";
const limit = Math.min(20, Math.max(1, Number(url.searchParams.get("limit")) || 10));
const recommendations = await getLlmfitRecommendations(useCase, limit);
return json(res, 200, { ok: true, recommendations, source: recommendations ? "llmfit" : "fallback" });
}
// GET /api/hardware-specs
if (req.url === "/api/hardware-specs" && req.method === "GET") {
return json(res, 200, getHardwareSpecs());
+14 -1
View File
@@ -1,4 +1,4 @@
param([string]$Release = "b9631")
param([string]$Release = "b9668")
$ErrorActionPreference = "Stop"
$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
@@ -159,5 +159,18 @@ if (-not $hasNvidia) {
if ($hasNvidia) {
Install-LlamaArchive -Variant "cuda" -AssetName "llama-$Release-bin-win-cuda-12.4-x64.zip"
}
# Intel Arc/Graphics detection for SYCL backend
$hasIntel = $false
try {
$gpus = Get-CimInstance Win32_VideoController -ErrorAction SilentlyContinue
foreach ($gpu in $gpus) {
if ($gpu.Name -like "*Intel*") {
$hasIntel = $true
}
}
} catch {}
if ($hasIntel) {
Install-LlamaArchive -Variant "sycl" -AssetName "llama-$Release-bin-win-sycl-x64.zip"
}
Install-LlamaArchive -Variant "vulkan" -AssetName "llama-$Release-bin-win-vulkan-x64.zip"
Install-LlamaArchive -Variant "cpu" -AssetName "llama-$Release-bin-win-cpu-x64.zip"
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ROOT_DIR="$(dirname "$SCRIPT_DIR")"
APP_DIR="$ROOT_DIR/app"
TOOLS_DIR="$APP_DIR/tools"
RELEASE="${LLAMA_RELEASE:-b9631}"
RELEASE="${LLAMA_RELEASE:-b9668}"
PLATFORM="$(uname -s)"
ARCH="$(uname -m)"