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

Merge 6b45680f21 into a5e47592b6

Browse source
This commit is contained in:
Brian 2024-11-21 16:51:57 -06:00 • committed by GitHub
commit 6021be4e60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Package.swift
View file

@ -24,7 +24,7 @@ var sources = [
var resources: [Resource] = [] var resources: [Resource] = []
var linkerSettings: [LinkerSetting] = [] var linkerSettings: [LinkerSetting] = []
var cSettings: [CSetting] = [ var cSettings: [CSetting] = [
.unsafeFlags(["-Wno-shorten-64-to-32", "-O3", "-DNDEBUG"]), .unsafeFlags(["-Wno-shorten-64-to-32", "-O3", "-DNDEBUG"]),
.unsafeFlags(["-fno-objc-arc"]), .unsafeFlags(["-fno-objc-arc"]),
.headerSearchPath("ggml/src"), .headerSearchPath("ggml/src"),
@ -34,6 +34,8 @@ var cSettings: [CSetting] = [
// .define("ACCELERATE_NEW_LAPACK"), // .define("ACCELERATE_NEW_LAPACK"),
// .define("ACCELERATE_LAPACK_ILP64") // .define("ACCELERATE_LAPACK_ILP64")
] ]
var cxxSettings: [CXXSetting] = []
var cxxStandard: CXXLanguageStandard = .cxx11
#if canImport(Darwin) #if canImport(Darwin)
sources.append("ggml/src/ggml-common.h") sources.append("ggml/src/ggml-common.h")
@ -52,6 +54,14 @@ cSettings.append(
cSettings.append(.define("_GNU_SOURCE")) cSettings.append(.define("_GNU_SOURCE"))
#endif #endif
#if canImport(WinSDK)
// See https://github.com/llvm/llvm-project/issues/40056
cxxSettings.append(.unsafeFlags(["-Xclang", "-fno-split-cold-code"]))
// MSVC errors below C++ 14
cxxStandard = .cxx14
#endif
let package = Package( let package = Package(
name: "llama", name: "llama",
platforms: [ platforms: [
@ -82,8 +92,9 @@ let package = Package(
resources: resources, resources: resources,
publicHeadersPath: "spm-headers", publicHeadersPath: "spm-headers",
cSettings: cSettings, cSettings: cSettings,
cxxSettings: cxxSettings,
linkerSettings: linkerSettings linkerSettings: linkerSettings
) )
], ],
cxxLanguageStandard: .cxx11 cxxLanguageStandard: cxxStandard
) )