vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support omnivlm for ios

Browse source
This commit is contained in:
Te993 2025-01-10 13:53:23 +08:00
parent 1487d32b46
commit d3eeeae218
4 changed files with 137 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1 +1,2 @@
build/**
build/**
.build/**

202
Package.swift
View file

@ -3,87 +3,143 @@
import PackageDescription
var sources = [
"src/llama.cpp",
"src/llama-vocab.cpp",
"src/llama-grammar.cpp",
"src/llama-sampling.cpp",
"src/unicode.cpp",
"src/unicode-data.cpp",
"ggml/src/ggml.c",
"ggml/src/ggml-aarch64.c",
"ggml/src/ggml-alloc.c",
"ggml/src/ggml-backend.cpp",
"ggml/src/ggml-backend-reg.cpp",
"ggml/src/ggml-cpu/ggml-cpu.c",
"ggml/src/ggml-cpu/ggml-cpu.cpp",
"ggml/src/ggml-cpu/ggml-cpu-aarch64.c",
"ggml/src/ggml-cpu/ggml-cpu-quants.c",
"ggml/src/ggml-threading.cpp",
"ggml/src/ggml-quants.c",
"src/llama.cpp",
"src/llama-vocab.cpp",
"src/llama-grammar.cpp",
"src/llama-sampling.cpp",
"src/unicode.cpp",
"src/unicode-data.cpp",
"ggml/src/ggml.c",
"ggml/src/ggml-aarch64.c",
"ggml/src/ggml-alloc.c",
"ggml/src/ggml-backend.cpp",
"ggml/src/ggml-backend-reg.cpp",
"ggml/src/ggml-cpu/ggml-cpu.c",
"ggml/src/ggml-cpu/ggml-cpu.cpp",
"ggml/src/ggml-cpu/ggml-cpu-aarch64.c",
"ggml/src/ggml-cpu/ggml-cpu-quants.c",
"ggml/src/ggml-threading.cpp",
"ggml/src/ggml-quants.c",
]
var omniVlmSources = [
"common/log.h",
"common/log.cpp",
"common/arg.h",
"common/arg.cpp",
"common/common.cpp",
"common/common.h",
"common/json.hpp",
"common/json-schema-to-grammar.cpp",
"common/json-schema-to-grammar.h",
"src/llama-grammar.h",
"common/grammar-parser.cpp",
"common/grammar-parser.h",
"common/sampling.cpp",
"common/sampling.h",
"examples/omni-vlm/build-info.cpp",
"examples/omni-vlm/clip.cpp",
"examples/omni-vlm/clip.h",
"examples/omni-vlm/omni-vlm-wrapper.cpp",
"examples/omni-vlm/omni-vlm-wrapper.h",
"examples/omni-vlm/omni-vlm.h",
"examples/omni-vlm/omni-vlm.cpp",
"common/base64.cpp",
"ggml/include/ggml.h",
"ggml/include/ggml-alloc.h",
"ggml/include/ggml-backend.h",
"ggml/src/ggml-common.h",
]
var testSources = [
"tests/LlavaTests/LlavaTests.swift"
]
var resources: [Resource] = []
var linkerSettings: [LinkerSetting] = []
var cSettings: [CSetting] = [
.unsafeFlags(["-Wno-shorten-64-to-32", "-O3", "-DNDEBUG"]),
.unsafeFlags(["-fno-objc-arc"]),
.headerSearchPath("ggml/src"),
// NOTE: NEW_LAPACK will required iOS version 16.4+
// We should consider add this in the future when we drop support for iOS 14
// (ref: ref: https://developer.apple.com/documentation/accelerate/1513264-cblas_sgemm?language=objc)
// .define("ACCELERATE_NEW_LAPACK"),
// .define("ACCELERATE_LAPACK_ILP64")
var cSettings: [CSetting] = [
.unsafeFlags(["-Wno-shorten-64-to-32", "-O3", "-DNDEBUG"]),
.unsafeFlags(["-fno-objc-arc"]),
.headerSearchPath("."),
.headerSearchPath("ggml/src"),
.headerSearchPath("common"),
.unsafeFlags(["-framework", "Foundation"]),
.unsafeFlags(["-framework", "Accelerate"]),
]
#if canImport(Darwin)
sources.append("ggml/src/ggml-common.h")
sources.append("ggml/src/ggml-metal/ggml-metal.m")
resources.append(.process("ggml/src/ggml-metal/ggml-metal.metal"))
linkerSettings.append(.linkedFramework("Accelerate"))
cSettings.append(
contentsOf: [
.define("GGML_USE_ACCELERATE"),
.define("GGML_USE_METAL")
]
)
#if os(Linux)
cSettings.append(.define("_GNU_SOURCE"))
#endif
#if os(Linux)
cSettings.append(.define("_GNU_SOURCE"))
#endif
let baseSettings = cSettings + [
.headerSearchPath("."),
.headerSearchPath("src"),
.headerSearchPath("common"),
.headerSearchPath("examples/omni-vlm"),
.headerSearchPath("ggml/include"),
]
let llamaTarget = Target.target(
name: "llama",
dependencies: [],
path: ".",
exclude: [
"build", "cmake", "examples", "scripts", "models",
"tests", "CMakeLists.txt", "Makefile",
],
sources: sources,
resources: resources,
publicHeadersPath: "spm-headers",
cSettings: cSettings,
linkerSettings: linkerSettings
)
let omnivlmTarget = Target.target(
name: "omnivlm",
dependencies: ["llama"],
path: ".",
sources: omniVlmSources,
resources: resources,
publicHeadersPath: "spm/omnivlm",
cSettings: baseSettings + [
.headerSearchPath("ggml/src"),
],
cxxSettings: [.unsafeFlags(["-std=c++14"])],
linkerSettings: linkerSettings
)
let testTarget = Target.testTarget(
name: "LlavaTests",
dependencies: ["omnivlm"],
path: ".",
sources: testSources,
resources: resources,
cSettings: baseSettings + [
.headerSearchPath("ggml/src"),
],
linkerSettings: linkerSettings
)
let supportedPlatforms: [SupportedPlatform] = [
.macOS(.v12),
.iOS(.v14),
.watchOS(.v4),
.tvOS(.v14)
]
let products = [
Product.library(name: "llama", targets: ["llama"]),
Product.library(name: "omnivlm", targets: ["omnivlm"])
]
let package = Package(
name: "llama",
platforms: [
.macOS(.v12),
.iOS(.v14),
.watchOS(.v4),
.tvOS(.v14)
],
products: [
.library(name: "llama", targets: ["llama"]),
],
targets: [
.target(
name: "llama",
path: ".",
exclude: [
"build",
"cmake",
"examples",
"scripts",
"models",
"tests",
"CMakeLists.txt",
"Makefile",
"ggml/src/ggml-metal-embed.metal"
],
sources: sources,
resources: resources,
publicHeadersPath: "spm-headers",
cSettings: cSettings,
linkerSettings: linkerSettings
)
],
cxxLanguageStandard: .cxx11
name: "llama",
platforms: supportedPlatforms,
products: products,
targets: [
llamaTarget,
omnivlmTarget,
testTarget
],
cxxLanguageStandard: .cxx14
)

5
examples/omni-vlm/build-info.cpp Normal file
View file

@ -0,0 +1,5 @@
// src/build-info.cpp
int LLAMA_BUILD_NUMBER = 0;
const char* LLAMA_BUILD_TARGET = "ios-arm64";
const char* LLAMA_COMMIT = "unknown";
const char* LLAMA_COMPILER = "clang";

1
spm/omnivlm/omni-vlm-wrapper.h Symbolic link
View file

@ -0,0 +1 @@
../../examples/omni-vlm/omni-vlm-wrapper.h