Merge pull request #5 from Deins:zig_13

Deins · web-flow · commit 8798dea5fcc6 · 2024-12-23T19:00:47.000+02:00
Update zig to 0.13.x
diff --git a/.gitignore b/.gitignore
@@ -48,8 +48,9 @@ temp
 # Cheers!
 # -andrewrk
 
-zig-cache/
-zig-out/
+zig-cache
+.zig-cache
+zig-out
 /release/
 /debug/
 /build/
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # llama.cpp.zig
-llama.cpp bindings and utilities for zig. Currently targeting zig `0.11.x`, there is high chance nightly works as well (`0.12.0-dev.1856+94c63f31f` when I checked) (using same branch, only few places have needed patching where @hasDecl was enough to support both versions).
+llama.cpp bindings and utilities for zig. Currently targeting zig `0.13.x`.
 
 * Implements llama.h for nicer interaction with zig.
     * Removes prefixes, changes naming for functions to camelCase. Group functions within most appropriete struct. etc.
diff --git a/build.zig b/build.zig
@@ -1,8 +1,8 @@
 const std = @import("std");
 const llama = @import("build_llama.zig");
-const CrossTarget = std.zig.CrossTarget;
+const Target = std.Build.ResolvedTarget;
 const ArrayList = std.ArrayList;
-const CompileStep = std.Build.CompileStep;
+const CompileStep = std.Build.Step.Compile;
 const ConfigHeader = std.Build.Step.ConfigHeader;
 const Mode = std.builtin.Mode;
 const TranslateCStep = std.Build.TranslateCStep;
@@ -13,7 +13,7 @@ pub const clblast = @import("clblast");
 pub const llama_cpp_path_prefix = "llama.cpp/"; // point to where llama.cpp root is
 
 pub const Options = struct {
-    target: CrossTarget,
+    target: Target,
     optimize: Mode,
     opencl: ?clblast.OpenCL = null,
     clblast: bool = false,
@@ -47,7 +47,7 @@ pub const Context = struct {
 
         const llama_h_module = llama_cpp.moduleLlama();
         const ggml_h_module = llama_cpp.moduleGgml();
-        const deps: []const std.Build.ModuleDependency = &.{
+        const imports: []const std.Build.Module.Import = &.{
             .{
                 .name = "llama.h",
                 .module = llama_h_module,
@@ -62,8 +62,8 @@ pub const Context = struct {
             },
         };
         const mod = b.createModule(.{
-            .source_file = .{ .path = "llama.cpp.zig/llama.zig" },
-            .dependencies = deps,
+            .root_source_file = b.path("llama.cpp.zig/llama.zig"),
+            .imports = imports,
         });
 
         return .{
@@ -86,10 +86,10 @@ pub const Context = struct {
             .name = name,
             .target = self.options.target,
             .optimize = self.options.optimize,
-            .root_source_file = .{ .path = b.pathJoin(&.{ path, std.mem.join(b.allocator, "", &.{ name, ".zig" }) catch @panic("OOM") }) },
+            .root_source_file = b.path(b.pathJoin(&.{ path, std.mem.join(b.allocator, "", &.{ name, ".zig" }) catch @panic("OOM") })),
         });
         exe.stack_size = 32 * 1024 * 1024;
-        exe.addModule("llama", self.module);
+        exe.root_module.addImport("llama", self.module);
         self.link(exe);
         b.installArtifact(exe); // location when the user invokes the "install" step (the default step when running `zig build`).
 
@@ -128,12 +128,12 @@ pub fn build(b: *std.Build) !void {
 
     { // tests
         const main_tests = b.addTest(.{
-            .root_source_file = .{ .path = "llama.cpp.zig/llama.zig" },
+            .root_source_file = b.path("llama.cpp.zig/llama.zig"),
             .target = target,
             .optimize = optimize,
         });
         llama_zig.link(main_tests);
-        main_tests.addModule("llama.h", llama_zig.llama_h_module);
+        main_tests.root_module.addImport("llama.h", llama_zig.llama_h_module);
         const run_main_tests = b.addRunArtifact(main_tests);
 
         const test_step = b.step("test", "Run library tests");
diff --git a/build.zig.zon b/build.zig.zon
@@ -11,8 +11,10 @@
     },
     .dependencies = .{
         .clblast = .{
-            .url = "https://github.com/Deins/CLBlast.build.zig/archive/refs/tags/0.0.2.tar.gz",
-            .hash = "12206fa67c773ff701dd7c2a41d910b55be4637b2502c46c0522655ebd22a74b1b14",
+            .lazy = true,
+            //.path = "CLBlast.build.zig",
+            .url = "git+https://github.com/Deins/CLBlast.build.zig/?ref=HEAD#f625908b45de077604951084b9e8d989cedcf2d2",
+            .hash = "1220bb9caa813a519a5bf9f7facbb514c3772559adc6149d0bf4901bc1634c11d86c",
         },
     },
 }
diff --git a/build_llama.zig b/build_llama.zig
@@ -1,14 +1,14 @@
 const std = @import("std");
 const Builder = std.Build;
-const CrossTarget = std.zig.CrossTarget;
+const Target = std.Build.ResolvedTarget;
 const Mode = std.builtin.Mode;
-const CompileStep = std.Build.CompileStep;
+const CompileStep = std.Build.Step.Compile;
 const LazyPath = std.Build.LazyPath;
 const Module = std.Build.Module;
 pub const clblast = @import("clblast");
 
 pub const Options = struct {
-    target: CrossTarget,
+    target: Target,
     optimize: Mode,
     shared: bool, // static or shared lib
     opencl: ?clblast.OpenCL = null,
@@ -27,22 +27,28 @@ pub const Context = struct {
     pub fn init(b: *Builder, op: Options) Context {
         const path_prefix = b.pathJoin(&.{ thisPath(), "/llama.cpp" });
         const zig_version = @import("builtin").zig_version_string;
-        const exec = if (@hasDecl(std.ChildProcess, "exec")) std.ChildProcess.exec else std.ChildProcess.run; // zig 11 vs nightly compatibility
-        const commit_hash = exec(
+        const commit_hash = std.process.Child.run(
             .{ .allocator = b.allocator, .argv = &.{ "git", "rev-parse", "HEAD" } },
         ) catch |err| {
             std.log.err("Cant get git comiit hash! err: {}", .{err});
             unreachable;
         };
 
-        const build_info_path = b.pathJoin(&.{ "common", "build-info.cpp" });
-        const build_info = b.fmt(
+        const build_info_zig = true; // use cpp or zig file for build-info
+        const build_info_path = b.pathJoin(&.{ "common", "build-info." ++ if (build_info_zig) "zig" else "cpp" });
+        const build_info = b.fmt(if (build_info_zig)
+            \\pub export var LLAMA_BUILD_NUMBER : c_int = {};
+            \\pub export var LLAMA_COMMIT = "{s}";
+            \\pub export var LLAMA_COMPILER = "Zig {s}";
+            \\pub export var LLAMA_BUILD_TARGET = "{s}_{s}";
+            \\
+        else
             \\int LLAMA_BUILD_NUMBER = {};
             \\char const *LLAMA_COMMIT = "{s}";
             \\char const *LLAMA_COMPILER = "Zig {s}";
             \\char const *LLAMA_BUILD_TARGET = "{s}_{s}";
             \\
-        , .{ op.build_number, commit_hash.stdout[0 .. commit_hash.stdout.len - 1], zig_version, op.target.allocDescription(b.allocator) catch @panic("OOM"), @tagName(op.optimize) });
+        , .{ op.build_number, commit_hash.stdout[0 .. commit_hash.stdout.len - 1], zig_version, op.target.result.zigTriple(b.allocator) catch unreachable, @tagName(op.optimize) });
 
         return .{
             .b = b,
@@ -55,7 +61,7 @@ pub const Context = struct {
     /// just builds everything needed and links it to your target
     pub fn link(ctx: *Context, comp: *CompileStep) void {
         comp.linkLibrary(ctx.library());
-        if (ctx.options.opencl) |ocl| ocl.link(comp);
+        if (ctx.options.opencl) |ocl| ocl.link(ctx.b, comp);
     }
 
     /// build single library containing everything
@@ -64,12 +70,12 @@ pub const Context = struct {
         const lib_opt = .{ .name = "llama.cpp", .target = ctx.options.target, .optimize = ctx.options.optimize };
         const lib = if (ctx.options.shared) ctx.b.addSharedLibrary(lib_opt) else ctx.b.addStaticLibrary(lib_opt);
         ctx.addAll(lib);
-        if (ctx.options.target.getAbi() != .msvc)
+        if (ctx.options.target.result.abi != .msvc)
             lib.defineCMacro("_GNU_SOURCE", null);
         if (ctx.options.shared) {
             lib.defineCMacro("LLAMA_SHARED", null);
             lib.defineCMacro("LLAMA_BUILD", null);
-            if (ctx.options.target.getOsTag() == .windows) {
+            if (ctx.options.target.result.os.tag == .windows) {
                 std.log.warn("For shared linking to work, requires header llama.h modification:\n\'#    if defined(_WIN32) && (!defined(__MINGW32__) || defined(ZIG))'", .{});
                 lib.defineCMacro("ZIG", null);
             }
@@ -88,24 +94,26 @@ pub const Context = struct {
     /// zig module with translated headers
     pub fn moduleLlama(ctx: *Context) *Module {
         const tc = ctx.b.addTranslateC(.{
-            .source_file = ctx.path("llama.h"),
+            .root_source_file = ctx.path("llama.h"),
             .target = ctx.options.target,
             .optimize = ctx.options.optimize,
         });
-        if (ctx.options.shared) tc.defineCMacro("LLAMA_SHARED", null);
-        tc.defineCMacro("NDEBUG", null); // otherwise zig is unhappy about c ASSERT macro
+        if (ctx.options.shared) tcDefineCMacro(tc, "LLAMA_SHARED", null);
+        tcDefineCMacro(tc, "NDEBUG", null); // otherwise zig is unhappy about c ASSERT macro
         return tc.addModule("llama.h");
     }
 
     /// zig module with translated headers
     pub fn moduleGgml(ctx: *Context) *Module {
         const tc = ctx.b.addTranslateC(.{
-            .source_file = ctx.path("ggml.h"),
+            .root_source_file = ctx.path("ggml.h"),
             .target = ctx.options.target,
             .optimize = ctx.options.optimize,
         });
-        if (ctx.options.shared) tc.defineCMacro("LLAMA_SHARED", null);
-        tc.defineCMacro("NDEBUG", null); // otherwise zig is unhappy about c ASSERT macro
+
+        tcDefineCMacro(tc, "LLAMA_SHARED", null);
+        tcDefineCMacro(tc, "NDEBUG", null);
+
         return tc.addModule("ggml.h");
     }
 
@@ -133,7 +141,7 @@ pub const Context = struct {
                 .backend = .{ .opencl = ctx.options.opencl.? },
             });
             blast.link(compile);
-            ctx.options.opencl.?.link(compile);
+            ctx.options.opencl.?.link(ctx.b, compile);
         }
         for (sources) |src| compile.addCSourceFile(.{ .file = src, .flags = ctx.flags() });
         //if (ctx.cuda) compile.ctx.path("ggml-cuda.cu");
@@ -171,14 +179,14 @@ pub const Context = struct {
             if (install) b.installArtifact(exe);
             { // add all c/cpp files from example dir
                 const rpath = b.pathJoin(&.{ ctx.path_prefix, "examples", ex });
-                exe.addIncludePath(.{ .path = rpath });
+                exe.addIncludePath(.{ .cwd_relative = rpath });
                 var dir = if (@hasDecl(std.fs, "openIterableDirAbsolute")) try std.fs.openIterableDirAbsolute(b.pathFromRoot(rpath), .{}) else try std.fs.openDirAbsolute(b.pathFromRoot(rpath), .{ .iterate = true }); // zig 11 vs nightly compatibility
                 defer dir.close();
                 var dir_it = dir.iterate();
                 while (try dir_it.next()) |f| switch (f.kind) {
                     .file => if (std.ascii.endsWithIgnoreCase(f.name, ".c") or std.ascii.endsWithIgnoreCase(f.name, ".cpp")) {
                         const src = b.pathJoin(&.{ ctx.path_prefix, "examples", ex, f.name });
-                        exe.addCSourceFile(.{ .file = .{ .path = src }, .flags = &.{} });
+                        exe.addCSourceFile(.{ .file = .{ .cwd_relative = src }, .flags = &.{} });
                     },
                     else => {},
                 };
@@ -206,10 +214,16 @@ pub const Context = struct {
     }
 
     pub fn path(self: Context, p: []const u8) LazyPath {
-        return .{ .path = self.b.pathJoin(&.{ self.path_prefix, p }) };
+        return .{ .cwd_relative = self.b.pathJoin(&.{ self.path_prefix, p }) };
     }
 };
 
 fn thisPath() []const u8 {
     return std.fs.path.dirname(@src().file) orelse ".";
 }
+
+// TODO: idk, defineCMacro returns: TranslateC.zig:110:28: error: root struct of file 'Build' has no member named 'constructranslate_cMacro'
+// use raw macro for now
+fn tcDefineCMacro(tc: *std.Build.Step.TranslateC, comptime name: []const u8, comptime value: ?[]const u8) void {
+    tc.defineCMacroRaw(name ++ "=" ++ (value orelse "1"));
+}
diff --git a/examples/interactive.zig b/examples/interactive.zig
@@ -175,7 +175,7 @@ pub fn main() !void {
     try run(alloc, args);
 }
 
-pub const std_options = struct {
-    pub const log_level = std.log.Level.debug;
-    pub const log_scope_levels: []const std.log.ScopeLevel = &.{.{ .scope = .llama_cpp, .level = .info }};
+pub const std_options = std.Options{
+    .log_level = std.log.Level.debug,
+    .log_scope_levels = &.{.{ .scope = .llama_cpp, .level = .info }},
 };
diff --git a/examples/opencl_devices.zig b/examples/opencl_devices.zig
@@ -15,7 +15,7 @@ pub fn checkErr(status: opencl.cl_int) !void {
 /// read value from unaligned buffer
 pub fn castFromBuf(comptime T: type, buf: []const u8) T {
     var val: T = undefined;
-    std.mem.copy(u8, @as([*]u8, @ptrCast(&val))[0..@sizeOf(@TypeOf(val))], buf);
+    @memcpy(@as([*]u8, @ptrCast(&val))[0..@sizeOf(@TypeOf(val))], buf);
     return val;
 }
 
diff --git a/examples/simple.zig b/examples/simple.zig
@@ -103,7 +103,7 @@ pub fn main() !void {
     try run(alloc, args);
 }
 
-pub const std_options = struct {
-    pub const log_level = std.log.Level.debug;
-    pub const log_scope_levels: []const std.log.ScopeLevel = &.{.{ .scope = .llama_cpp, .level = .info }};
+pub const std_options = std.Options{
+    .log_level = std.log.Level.debug,
+    .log_scope_levels = &.{.{ .scope = .llama_cpp, .level = .info }},
 };

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ pub fn checkErr(status: opencl.cl_int) !void {`
`15`	`15`	`/// read value from unaligned buffer`
`16`	`16`	`pub fn castFromBuf(comptime T: type, buf: []const u8) T {`
`17`	`17`	`var val: T = undefined;`
`18`		`- std.mem.copy(u8, @as([*]u8, @ptrCast(&val))[0..@sizeOf(@TypeOf(val))], buf);`
	`18`	`+ @memcpy(@as([*]u8, @ptrCast(&val))[0..@sizeOf(@TypeOf(val))], buf);`
`19`	`19`	`return val;`
`20`	`20`	`}`
`21`	`21`