feat(AI): MNN 4B 多模态一肩挑文本+视觉,合并为单模型(MLX 仍兜底)

利用 Qwen3.5-4B-MNN 本身是多模态(含 visual.mnn),让同一个 MNN 模型
同时做文本生成与拍照识别 → MNN 路径只需下 1 个模型(7.4GB→2.64GB)。
MLX(.llm/.vl)保留作兜底,尤其开发机 iPhone 15 Pro(A17 无 SME2)。

- MNN.xcframework 重建为 OMNI(MNN_BUILD_LLM_OMNI=ON,加 OpenCV 图像解码);
  构建脚本同步加 OMNI flag
- MNNLLMBridge.analyzeImages:把图片路径拼成 <img>路径</img> 标签 + response,
  Omni 内部 CV::imread 加载(无需桥接 include OpenCV);与 generateText 共用 runResponse
- MNNBackend.analyze:detached 线程跑 blocking VL 调用,聚合为字符串
- AIRuntime:engine=.mnn 且就绪时,prepareVL→prepareMNN、analyzeReport→mnn.analyze;
  否则回退 MLX VL

device + 模拟器 BUILD SUCCEEDED,0 error,OMNI 框架链接干净。
VL 实际识别质量需真机用化验单 A/B(demo 核心)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
link2026
2026-06-08 20:52:58 +08:00
parent cbacd9461a
commit ddfd474bb3
4 changed files with 65 additions and 16 deletions

View File

@@ -8,15 +8,16 @@
# #
# 关键 flag: # 关键 flag:
# MNN_BUILD_LLM=ON —— 编入 llm 引擎(并导出 llm/llm.hpp),自动开 MNN_LOW_MEMORY # MNN_BUILD_LLM=ON —— 编入 llm 引擎(并导出 llm/llm.hpp),自动开 MNN_LOW_MEMORY
# MNN_BUILD_LLM_OMNI=ON —— VL(图→文)所需:多模态 Omni + OpenCV 图像解码。
# 统一模型(Qwen3.5-4B-MNN 一肩挑文本+视觉)必须开。
# MNN_SME2=ON —— CMake 默认 ON,A19/iPhone17 运行时经 KleidiAI 自动启用,A17 回退 NEON # MNN_SME2=ON —— CMake 默认 ON,A19/iPhone17 运行时经 KleidiAI 自动启用,A17 回退 NEON
# MNN_METAL=OFF —— 考核走 CPU+SME2,关 Metal 保持精简 # MNN_METAL=OFF —— 考核走 CPU+SME2,关 Metal 保持精简
# MNN_BUILD_LLM_OMNI —— 如需 VL(图→文)再开,会额外拉 OpenCV/Audio(本脚本默认不开,文本优先)
set -e set -e
MNN_SRC="${MNN_SRC:-/Users/xuhuayong/apps/MNN-src}" MNN_SRC="${MNN_SRC:-/Users/xuhuayong/apps/MNN-src}"
OUT_DIR="$(cd "$(dirname "$0")/.." && pwd)/Frameworks" OUT_DIR="$(cd "$(dirname "$0")/.." && pwd)/Frameworks"
TOOLCHAIN_NEW="${MNN_SRC}/cmake/ios.toolchain.new.cmake" TOOLCHAIN_NEW="${MNN_SRC}/cmake/ios.toolchain.new.cmake"
EXTRA="-DMNN_BUILD_LLM=ON -DMNN_METAL=OFF -DMNN_ARM82=true -DMNN_SME2=ON" EXTRA="-DMNN_BUILD_LLM=ON -DMNN_BUILD_LLM_OMNI=ON -DMNN_METAL=OFF -DMNN_ARM82=true -DMNN_SME2=ON"
COMMON="-DCMAKE_BUILD_TYPE=Release -DENABLE_BITCODE=0 -DMNN_AAPL_FMWK=1 -DMNN_SEP_BUILD=0 -DMNN_BUILD_SHARED_LIBS=false -DMNN_USE_THREAD_POOL=OFF" COMMON="-DCMAKE_BUILD_TYPE=Release -DENABLE_BITCODE=0 -DMNN_AAPL_FMWK=1 -DMNN_SEP_BUILD=0 -DMNN_BUILD_SHARED_LIBS=false -DMNN_USE_THREAD_POOL=OFF"
export DEVELOPER_DIR="/Applications/Xcode.app/Contents/Developer" export DEVELOPER_DIR="/Applications/Xcode.app/Contents/Developer"

View File

@@ -255,6 +255,11 @@ actor AIRuntime {
/// VL , load /// VL , load
func prepareVL() async throws { func prepareVL() async throws {
// MNN :VL MNN (+), prepareMNN
if InferenceEngine.current == .mnn, ModelStore.shared.isComplete(for: .mnnLLM) {
try await prepareMNN()
return
}
while vlStatus == .loading { while vlStatus == .loading {
try await Task.sleep(nanoseconds: 80_000_000) try await Task.sleep(nanoseconds: 80_000_000)
} }
@@ -314,6 +319,16 @@ actor AIRuntime {
func analyzeReport(imageURLs: [URL], func analyzeReport(imageURLs: [URL],
prompt: String, prompt: String,
maxTokens: Int = 512) async throws -> String { maxTokens: Int = 512) async throws -> String {
// MNN : MNN
if InferenceEngine.current == .mnn, mnnStatus == .ready {
await acquireGate()
defer { releaseGate() }
do {
return try await mnn.analyze(imageURLs: imageURLs, prompt: prompt, maxTokens: maxTokens)
} catch {
throw AIRuntimeError.inferenceFailed("\(error)")
}
}
guard vlStatus == .ready, let session = vlSession else { guard vlStatus == .ready, let session = vlSession else {
throw AIRuntimeError.notReady throw AIRuntimeError.notReady
} }

View File

@@ -135,28 +135,39 @@ private:
- (void)cancel { _cancel = true; } - (void)cancel { _cancel = true; }
- (MNNGenerateStats *)generateText:(NSString *)prompt // 统一生成:full 已是最终 prompt(文本,或含 <img>路径</img> 标签)。
// 多模态模型 createLLM 返回 Omni,response 解析 <img> 标签并对路径 CV::imread(OMNI 框架内)。
- (MNNGenerateStats *)runResponse:(NSString *)full
maxTokens:(int)maxTokens maxTokens:(int)maxTokens
onToken:(void (^)(NSString *))onToken { onToken:(void (^)(NSString *))onToken {
_cancel = false; _cancel = false;
TokenStreamBuf buf(onToken, &_cancel); TokenStreamBuf buf(onToken, &_cancel);
std::ostream os(&buf); std::ostream os(&buf);
if (_llm) { if (_llm) {
_llm->response(std::string(prompt.UTF8String), &os, nullptr, maxTokens); _llm->response(std::string(full.UTF8String), &os, nullptr, maxTokens);
} }
buf.flush(); buf.flush();
return [self statsFromContext]; return [self statsFromContext];
} }
- (MNNGenerateStats *)generateText:(NSString *)prompt
maxTokens:(int)maxTokens
onToken:(void (^)(NSString *))onToken {
return [self runResponse:prompt maxTokens:maxTokens onToken:onToken];
}
- (nullable MNNGenerateStats *)analyzeImages:(NSArray<NSString *> *)imagePaths - (nullable MNNGenerateStats *)analyzeImages:(NSArray<NSString *> *)imagePaths
prompt:(NSString *)prompt prompt:(NSString *)prompt
maxTokens:(int)maxTokens maxTokens:(int)maxTokens
onToken:(void (^)(NSString *))onToken onToken:(void (^)(NSString *))onToken
error:(NSError **)error { error:(NSError **)error {
// VL 需 MNN_BUILD_LLM_OMNI 构建(OpenCV 解码图像)。当前文本构建不含,显式报错 // 在 prompt 前拼 <img>本地路径</img>;Omni 解析标签并对路径 imread(需 OMNI 框架)
if (error) *error = [NSError errorWithDomain:@"MNN" code:-2 NSMutableString *full = [NSMutableString string];
userInfo:@{NSLocalizedDescriptionKey: @"当前 MNN 构建未含 VL(OMNI),请用 OMNI 框架"}]; for (NSString *p in imagePaths) {
return nil; [full appendFormat:@"<img>%@</img>", p];
}
[full appendString:prompt];
return [self runResponse:full maxTokens:maxTokens onToken:onToken];
} }
- (MNNGenerateStats *)statsFromContext { - (MNNGenerateStats *)statsFromContext {

View File

@@ -47,10 +47,32 @@ actor MNNBackend {
} }
} }
/// (VL) MNN OMNI,退 MLX VL /// (VL)(JSON ) <img> ,
func analyze(imageURLs: [URL], prompt: String, maxTokens: Int) throws -> String { /// MNN Omni imread ( OMNI );blocking detached 线
throw AIRuntimeError.inferenceFailed("MNN 当前构建不支持 VL(需 OMNI)") func analyze(imageURLs: [URL], prompt: String, maxTokens: Int) async throws -> String {
guard let bridge else { throw AIRuntimeError.notReady }
let paths = imageURLs.map(\.path)
let box = MNNUncheckedBox(bridge)
return try await withCheckedThrowingContinuation { cont in
Task.detached(priority: .userInitiated) {
let sink = MNNTextSink()
do {
_ = try box.value.analyzeImages(paths, prompt: prompt, maxTokens: Int32(maxTokens)) { piece in
sink.append(piece)
} }
cont.resume(returning: sink.text)
} catch {
cont.resume(throwing: AIRuntimeError.inferenceFailed(error.localizedDescription))
}
}
}
}
}
/// 线,
private nonisolated final class MNNTextSink: @unchecked Sendable {
private(set) var text = ""
func append(_ s: String) { text += s }
} }
/// Sendable ObjC detached /// Sendable ObjC detached