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

update build.zig to master build

Browse source
This commit is contained in:
Hasan Mukhlis 2024-02-04 01:19:45 +08:00
parent 52bb63c708
commit a19a4b2a2f
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
build.zig
View file

@ -3,12 +3,12 @@ const std = @import("std");
const ArrayList = std.ArrayList; const ArrayList = std.ArrayList;
const Compile = std.Build.Step.Compile; const Compile = std.Build.Step.Compile;
const ConfigHeader = std.Build.Step.ConfigHeader; const ConfigHeader = std.Build.Step.ConfigHeader;
const Mode = std.builtin.Mode; const Mode = std.builtin.OptimizeMode;
const CrossTarget = std.zig.CrossTarget; const Target = std.Build.ResolvedTarget;
const Maker = struct { const Maker = struct {
builder: *std.build.Builder, builder: *std.Build,
target: CrossTarget, target: Target,
optimize: Mode, optimize: Mode,
enable_lto: bool, enable_lto: bool,
@ -34,10 +34,10 @@ const Maker = struct {
try m.addCxxFlag(flag); try m.addCxxFlag(flag);
} }
fn init(builder: *std.build.Builder) !Maker { fn init(builder: *std.Build) !Maker {
const target = builder.standardTargetOptions(.{}); const target = builder.standardTargetOptions(.{});
const zig_version = @import("builtin").zig_version_string; const zig_version = @import("builtin").zig_version_string;
const commit_hash = try std.ChildProcess.exec( const commit_hash = try std.ChildProcess.run(
.{ .allocator = builder.allocator, .argv = &.{ "git", "rev-parse", "HEAD" } }, .{ .allocator = builder.allocator, .argv = &.{ "git", "rev-parse", "HEAD" } },
); );
try std.fs.cwd().writeFile("common/build-info.cpp", builder.fmt( try std.fs.cwd().writeFile("common/build-info.cpp", builder.fmt(
@ -46,7 +46,7 @@ const Maker = struct {
\\char const *LLAMA_COMPILER = "Zig {s}"; \\char const *LLAMA_COMPILER = "Zig {s}";
\\char const *LLAMA_BUILD_TARGET = "{s}"; \\char const *LLAMA_BUILD_TARGET = "{s}";
\\ \\
, .{ 0, commit_hash.stdout[0 .. commit_hash.stdout.len - 1], zig_version, try target.allocDescription(builder.allocator) })); , .{ 0, commit_hash.stdout[0 .. commit_hash.stdout.len - 1], zig_version, try target.query.zigTriple(builder.allocator) }));
var m = Maker{ var m = Maker{
.builder = builder, .builder = builder,
.target = target, .target = target,
@ -67,15 +67,15 @@ const Maker = struct {
fn obj(m: *const Maker, name: []const u8, src: []const u8) *Compile { fn obj(m: *const Maker, name: []const u8, src: []const u8) *Compile {
const o = m.builder.addObject(.{ .name = name, .target = m.target, .optimize = m.optimize }); const o = m.builder.addObject(.{ .name = name, .target = m.target, .optimize = m.optimize });
if (o.target.getAbi() != .msvc) if (m.target.result.abi != .msvc)
o.defineCMacro("_GNU_SOURCE", null); o.defineCMacro("_GNU_SOURCE", null);
if (std.mem.endsWith(u8, src, ".c")) { if (std.mem.endsWith(u8, src, ".c")) {
o.addCSourceFiles(&.{src}, m.cflags.items); o.addCSourceFiles(.{ .files = &.{src}, .flags = m.cflags.items });
o.linkLibC(); o.linkLibC();
} else { } else {
o.addCSourceFiles(&.{src}, m.cxxflags.items); o.addCSourceFiles(.{ .files = &.{src}, .flags = m.cxxflags.items });
if (o.target.getAbi() == .msvc) { if (m.target.result.abi == .msvc) {
o.linkLibC(); // need winsdk + crt o.linkLibC(); // need winsdk + crt
} else { } else {
// linkLibCpp already add (libc++ + libunwind + libc) // linkLibCpp already add (libc++ + libunwind + libc)
@ -89,13 +89,13 @@ const Maker = struct {
fn exe(m: *const Maker, name: []const u8, src: []const u8, deps: []const *Compile) *Compile { fn exe(m: *const Maker, name: []const u8, src: []const u8, deps: []const *Compile) *Compile {
const e = m.builder.addExecutable(.{ .name = name, .target = m.target, .optimize = m.optimize }); const e = m.builder.addExecutable(.{ .name = name, .target = m.target, .optimize = m.optimize });
e.addCSourceFiles(&.{src}, m.cxxflags.items); e.addCSourceFiles(.{ .files = &.{src}, .flags = m.cxxflags.items });
for (deps) |d| e.addObject(d); for (deps) |d| e.addObject(d);
for (m.objs.items) |o| e.addObject(o); for (m.objs.items) |o| e.addObject(o);
for (m.include_dirs.items) |i| e.addIncludePath(.{ .path = i }); for (m.include_dirs.items) |i| e.addIncludePath(.{ .path = i });
// https://github.com/ziglang/zig/issues/15448 // https://github.com/ziglang/zig/issues/15448
if (e.target.getAbi() == .msvc) { if (m.target.result.abi == .msvc) {
e.linkLibC(); // need winsdk + crt e.linkLibC(); // need winsdk + crt
} else { } else {
// linkLibCpp already add (libc++ + libunwind + libc) // linkLibCpp already add (libc++ + libunwind + libc)
@ -107,7 +107,7 @@ const Maker = struct {
} }
}; };
pub fn build(b: *std.build.Builder) !void { pub fn build(b: *std.Build) !void {
var make = try Maker.init(b); var make = try Maker.init(b);
make.enable_lto = b.option(bool, "lto", "Enable LTO optimization, (default: false)") orelse false; make.enable_lto = b.option(bool, "lto", "Enable LTO optimization, (default: false)") orelse false;
@ -132,7 +132,7 @@ pub fn build(b: *std.build.Builder) !void {
_ = make.exe("train-text-from-scratch", "examples/train-text-from-scratch/train-text-from-scratch.cpp", &.{ ggml, ggml_alloc, ggml_backend, ggml_quants, llama, common, buildinfo, train }); _ = make.exe("train-text-from-scratch", "examples/train-text-from-scratch/train-text-from-scratch.cpp", &.{ ggml, ggml_alloc, ggml_backend, ggml_quants, llama, common, buildinfo, train });
const server = make.exe("server", "examples/server/server.cpp", &.{ ggml, ggml_alloc, ggml_backend, ggml_quants, llama, common, buildinfo, sampling, grammar_parser, clip }); const server = make.exe("server", "examples/server/server.cpp", &.{ ggml, ggml_alloc, ggml_backend, ggml_quants, llama, common, buildinfo, sampling, grammar_parser, clip });
if (server.target.isWindows()) { if (make.target.result.os.tag == .windows) {
server.linkSystemLibrary("ws2_32"); server.linkSystemLibrary("ws2_32");
} }
} }