diff --git a/zml/BUILD.bazel b/zml/BUILD.bazel index f5e8c79c..f52ecdd5 100644 --- a/zml/BUILD.bazel +++ b/zml/BUILD.bazel @@ -74,124 +74,19 @@ zig_library( ) zig_library( - name = "meta", - import_name = "zml/meta", - main = "meta.zig", - visibility = ["//visibility:public"], - deps = ["//stdx"], -) - -zig_library( - name = "constants", - import_name = "zml/constants", - main = "constants.zig", - visibility = ["//visibility:public"], -) - -zig_library( - name = "profiling", - srcs = [ - "profiling/profiler.zig", - "profiling/tracer.zig", - ], - import_name = "zml/profiling", - main = "profiling/profiling.zig", - tags = ["manual"], - visibility = ["//visibility:public"], - zigopts = ["-lc"], - deps = [ - ":profiler_options", - ":profiling_traceme_lib", - "//ffi:zig", - "//pjrt", - "//platforms", - "//stdx", - "//tools/xspace_to_perfetto:xspace_to_perfetto_lib", - "//upb", - ], -) - -zig_library( - name = "core", + name = "zml", srcs = [ "Compiler.zig", "Sharding.zig", + "attention/Options.zig", + "attention/attention.zig", "buffer.zig", "buffer/HostAccessible.zig", + "constants.zig", "dtype.zig", "exe.zig", "floats.zig", "io.zig", - "//zml/kernel", - "mem.zig", - "mlirx.zig", - "nn.zig", - "ops.zig", - "ops/manual_computation.zig", - "pjrtx.zig", - "platform.zig", - "quantization.zig", - "safetensors.zig", - "shape.zig", - "slice.zig", - "tensor.zig", - "testing.zig", - "//zml/kernels/moe/flashinfer_cutlass:runtime_srcs", - ], - import_name = "zml/core", - main = "core.zig", - tags = ["manual"], - visibility = ["//visibility:public"], - zigopts = [ - "-lc", - "-freference-trace=20", - ], - deps = [ - ":constants", - ":meta", - ":posix", - ":profiling", - ":xla_compile_options_upb", - ":xla_data_upb", - "//bazel", - "//dsl/cuda_tile:builder", - "//dsl/cute:builder", - "//dsl/fly:builder", - "//dsl/metal:builder", - "//dsl/mosaic_tpu:builder", - "//dsl/tcl:builder", - "//dsl/triton:builder", - "//ffi:zig", - "//mlir", - "//mlir/dialects/func", - "//mlir/dialects/mosaic_tpu", - "//mlir/dialects/shardy", - "//mlir/dialects/stablehlo", - "//pjrt", - "//platforms", - "//stdx", - "//upb", - "//vfs", - "@zio", - ] + select({ - "//platforms:neuron.enabled": [ - "//platforms/neuron:nki_kernel", - "//platforms/neuron:topology", - ], - "//conditions:default": [], - }) + select({ - "//platforms:cuda.enabled": [ - "//platforms/cuda/flashinfer_cutlass_moe", - ], - "//conditions:default": [], - }), -) - -zig_library( - name = "zml", - srcs = [ - "attention/Options.zig", - "attention/attention.zig", "kernels/flash_attention/flash_attention.zig", "kernels/flash_attention/tests.zig", "kernels/moe/api.zig", @@ -200,7 +95,25 @@ zig_library( "kernels/moe/weights.zig", "kernels/paged_attention/options.zig", "kernels/paged_attention/paged_attention.zig", + "logo.zig", + "mem.zig", + "meta.zig", + "mlirx.zig", + "nn.zig", + "ops.zig", + "ops/manual_computation.zig", + "pjrtx.zig", + "platform.zig", + "profiling/profiler.zig", + "profiling/tracer.zig", + "quantization.zig", + "safetensors.zig", + "shape.zig", + "slice.zig", + "tensor.zig", + "testing.zig", "zml.zig", + "//zml/kernel", "//zml/kernels/flash_attention/cute", "//zml/kernels/flash_attention/metal", "//zml/kernels/flash_attention/nki", @@ -233,22 +146,43 @@ zig_library( "-freference-trace=20", ], deps = [ - ":core", - ":logo", + ":posix", + ":profiler_options", + ":profiling_traceme_lib", + ":xla_compile_options_upb", + ":xla_data_upb", + "//bazel", + "//dsl/cuda_tile:builder", + "//dsl/cute:builder", + "//dsl/fly:builder", + "//dsl/metal:builder", "//dsl/mosaic_tpu:builder", "//dsl/tcl:builder", + "//dsl/triton:builder", + "//ffi:zig", "//mlir", + "//mlir/dialects/func", "//mlir/dialects/llvm", + "//mlir/dialects/mosaic_tpu", "//mlir/dialects/nvvm", + "//mlir/dialects/shardy", + "//mlir/dialects/stablehlo", "//mlir/dialects/ttir", "//mlir/dialects/vector", + "//pjrt", "//platforms", "//platforms/tpu:ragged_paged", "//stdx", + "//tools/xspace_to_perfetto:xspace_to_perfetto_lib", + "//upb", + "//vfs", "//zml/tokenizer", + "@rules_zig//zig/runfiles", + "@zio", ] + select({ "//platforms:neuron.enabled": [ "//platforms/neuron:nki_kernel", + "//platforms/neuron:topology", ], "//conditions:default": [], }) + select({ diff --git a/zml/Compiler.zig b/zml/Compiler.zig index 1bf994cc..93eafa8d 100644 --- a/zml/Compiler.zig +++ b/zml/Compiler.zig @@ -2,13 +2,11 @@ const std = @import("std"); const c = @import("c"); const func = @import("mlir/dialects/func"); -const meta = @import("zml/meta"); const mlir = @import("mlir"); const pjrt = @import("pjrt"); const shardy = @import("mlir/dialects/shardy"); const stablehlo = @import("mlir/dialects/stablehlo"); const stdx = @import("stdx"); -const tracer = @import("zml/profiling").tracer; const upb = @import("upb"); const zio = @import("zio"); @@ -16,10 +14,12 @@ const Buffer = @import("buffer.zig").Buffer; const DataType = @import("dtype.zig").DataType; const Exe = @import("exe.zig").Exe; const Memory = @import("platform.zig").Memory; +const meta = @import("meta.zig"); const mlirx = @import("mlirx.zig"); const ops = @import("ops.zig"); const pjrtx = @import("pjrtx.zig"); const Platform = @import("platform.zig").Platform; +const tracer = @import("profiling/tracer.zig"); const Shape = @import("shape.zig").Shape; const Sharding = @import("Sharding.zig"); const Tensor = @import("tensor.zig").Tensor; diff --git a/zml/Sharding.zig b/zml/Sharding.zig index 1f05b4df..040216bc 100644 --- a/zml/Sharding.zig +++ b/zml/Sharding.zig @@ -3249,7 +3249,7 @@ test "GSPMD attributes preserve folded logical axis order" { test "GSPMD executes a reduction across a folded logical axis" { if (comptime !Target.cpu.isEnabled()) return error.SkipZigTest; - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const io = std.testing.io; const allocator = std.testing.allocator; diff --git a/zml/buffer.zig b/zml/buffer.zig index 81112de9..8714d80f 100644 --- a/zml/buffer.zig +++ b/zml/buffer.zig @@ -1,14 +1,14 @@ const std = @import("std"); -const constants = @import("zml/constants"); -const meta = @import("zml/meta"); const pjrt = @import("pjrt"); const platforms = @import("platforms"); const stdx = @import("stdx"); +const constants = @import("constants.zig"); const DataType = @import("dtype.zig").DataType; const mem = @import("mem.zig"); const Memory = @import("platform.zig").Memory; +const meta = @import("meta.zig"); const pjrtx = @import("pjrtx.zig"); const Platform = @import("platform.zig").Platform; const Shape = @import("shape.zig").Shape; @@ -376,7 +376,7 @@ pub const Buffer = struct { }; test "device round-trip" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const io = std.testing.io; const allocator = std.testing.allocator; const platform = zml.testing.env(); diff --git a/zml/buffer/HostAccessible.zig b/zml/buffer/HostAccessible.zig index db17ae7b..b3e82a9c 100644 --- a/zml/buffer/HostAccessible.zig +++ b/zml/buffer/HostAccessible.zig @@ -1878,7 +1878,7 @@ fn expectDevicesReadShards(platform: *const Platform, shape_: Shape) !void { } test "HostAccessible executions read shared inputs on every device" { - const zml = @import("../core.zig"); + const zml = @import("../zml.zig"); const allocator = std.testing.allocator; const io = std.testing.io; const platform = testing.env(); @@ -2107,7 +2107,7 @@ test "HostAccessible.View copies across layouts, shards and replicas" { } test "HostAccessible await after executable donation permits the next host update" { - const zml = @import("../core.zig"); + const zml = @import("../zml.zig"); const allocator = std.testing.allocator; const io = std.testing.io; const platform = testing.env(); @@ -2159,7 +2159,7 @@ test "HostAccessible await after executable donation permits the next host updat } test "HostAccessible await follows an output that doesn't reuse the pinned allocation" { - const zml = @import("../core.zig"); + const zml = @import("../zml.zig"); const allocator = std.testing.allocator; const io = std.testing.io; const platform = testing.env(); diff --git a/zml/core.zig b/zml/core.zig deleted file mode 100644 index 65154db0..00000000 --- a/zml/core.zig +++ /dev/null @@ -1,82 +0,0 @@ -const std = @import("std"); - -pub const bazel = @import("bazel"); -pub const constants = @import("zml/constants"); -pub const meta = @import("zml/meta"); -pub const pjrt = @import("pjrt"); -pub const stdx = @import("stdx"); -pub const tracer = @import("zml/profiling").tracer; - -pub const Buffer = @import("buffer.zig").Buffer; -pub const Compiler = @import("Compiler.zig"); -pub const dtype = @import("dtype.zig"); -pub const Data = dtype.Data; -pub const DataType = dtype.DataType; -pub const exe = @import("exe.zig"); -pub const Exe = exe.Exe; -pub const FnExe = exe.FnExe; -pub const floats = @import("floats.zig"); -pub const io = @import("io.zig"); -pub const kernel = @import("kernel/kernel.zig"); -pub const mem = @import("mem.zig"); -pub const Bufferized = mem.Bufferized; -pub const mlir = @import("mlirx.zig"); -pub const nn = @import("nn.zig"); -pub const ops = @import("ops.zig"); -pub const pjrtx = @import("pjrtx.zig"); -pub const platform = @import("platform.zig"); -pub const Memory = platform.Memory; -pub const Platform = platform.Platform; -pub const Target = platform.Target; -pub const quantization = @import("quantization.zig"); -pub const Quantization = quantization.Quantization; -pub const safetensors = @import("safetensors.zig"); -pub const shape = @import("shape.zig"); -pub const Shape = shape.Shape; -pub const Sharding = @import("Sharding.zig"); -pub const Mesh = Sharding.Mesh; -pub const slice = @import("slice.zig"); -pub const Slice = slice.Slice; -pub const tensor = @import("tensor.zig"); -pub const Tensor = tensor.Tensor; -pub const testing = @import("testing.zig"); - -// Platform owns registration and runner lifetime until these are separated from core. -pub const flashinfer_cutlass = struct { - pub const contract = @import("kernels/moe/flashinfer_cutlass/contract.zig"); - pub const runtime = @import("kernels/moe/flashinfer_cutlass/runtime.zig"); -}; - -/// Deprecated, use `zml.Compiler` instead -pub const module = struct { - pub const CompilationContext = Compiler; - pub const CompileError = Compiler.Error; - pub const CompilationOptions = Compiler.Options; - - /// Deprecated, use `platform.compileFn` or `zml.Compiler.compile` - pub fn compile( - allocator: std.mem.Allocator, - io_: std.Io, - comptime func: anytype, - args: std.meta.ArgsTuple(@TypeOf(func)), - platform_: *const Platform, - opts: Compiler.Options, - ) Compiler.Error!Exe { - return Compiler.compile(allocator, io_, platform_, func, args, opts); - } -}; - -test "core" { - std.testing.refAllDecls(@This()); -} - -pub const KiB = 1024; -pub const MiB = 1024 * KiB; -pub const GiB = 1024 * MiB; -pub const TiB = 1024 * GiB; - -comptime { - // Forces zig to compile `@zml//bazel` module even when users don't depend on it even indirectly. - // Otherwise exported functions declared in `bazel` aren't compiled. - std.testing.refAllDecls(bazel); -} diff --git a/zml/exe.zig b/zml/exe.zig index e370c708..32c0ac48 100644 --- a/zml/exe.zig +++ b/zml/exe.zig @@ -1,15 +1,15 @@ const std = @import("std"); const builtin = @import("builtin"); -const meta = @import("zml/meta"); const pjrt = @import("pjrt"); const stdx = @import("stdx"); -const tracer = @import("zml/profiling").tracer; const Buffer = @import("buffer.zig").Buffer; const Compiler = @import("Compiler.zig"); const mem = @import("mem.zig"); +const meta = @import("meta.zig"); const Platform = @import("platform.zig").Platform; +const tracer = @import("profiling/tracer.zig"); const Shape = @import("shape.zig").Shape; const Sharding = @import("Sharding.zig"); const Tensor = @import("tensor.zig").Tensor; diff --git a/zml/io.zig b/zml/io.zig index 93829541..ab8d8e6e 100644 --- a/zml/io.zig +++ b/zml/io.zig @@ -1,19 +1,19 @@ const std = @import("std"); -const meta = @import("zml/meta"); const pjrt = @import("pjrt"); const stdx = @import("stdx"); -const tracer = @import("zml/profiling").tracer; pub const VFS = @import("vfs"); const Buffer = @import("buffer.zig").Buffer; -const Bufferized = @import("core.zig").Bufferized; +const Bufferized = @import("zml.zig").Bufferized; const CreateOptions = @import("platform.zig").CreateOptions; const Exe = @import("exe.zig").Exe; const mem = @import("mem.zig"); const Memory = @import("platform.zig").Memory; +const meta = @import("meta.zig"); const pjrtx = @import("pjrtx.zig"); const Platform = @import("platform.zig").Platform; +const tracer = @import("profiling/tracer.zig"); const safetensors = @import("safetensors.zig"); const Shape = @import("shape.zig").Shape; const Sharding = @import("Sharding.zig"); diff --git a/zml/kernel/fly/test.zig b/zml/kernel/fly/test.zig index 6b77ad3e..ae788d96 100644 --- a/zml/kernel/fly/test.zig +++ b/zml/kernel/fly/test.zig @@ -3,7 +3,7 @@ const std = @import("std"); const fly_builder = @import("dsl/fly/builder"); const fly = @import("fly.zig"); -const zml = @import("../../core.zig"); +const zml = @import("../../zml.zig"); /// C = A + B over (M, N) f32, 128-bit vectorized and predicated on the /// ragged edge. diff --git a/zml/kernel/metal/test.zig b/zml/kernel/metal/test.zig index a184869c..0a342af0 100644 --- a/zml/kernel/metal/test.zig +++ b/zml/kernel/metal/test.zig @@ -1,7 +1,7 @@ const std = @import("std"); const metal = @import("metal.zig"); -const zml = @import("../../core.zig"); +const zml = @import("../../zml.zig"); /// `out[i] = a[i] * scale + b[i]` over `n` floats. const MetalAxpy = struct { diff --git a/zml/kernel/tcl/test.zig b/zml/kernel/tcl/test.zig index 20804b8b..b9ae1875 100644 --- a/zml/kernel/tcl/test.zig +++ b/zml/kernel/tcl/test.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const zml = @import("../../core.zig"); +const zml = @import("../../zml.zig"); const tcl = @import("tcl.zig"); /// `furiosa.tcl.examples.softmax` over f32. diff --git a/zml/kernels/flash_attention/metal/flash_attn.zig b/zml/kernels/flash_attention/metal/flash_attn.zig index 4d584dab..de4b68da 100644 --- a/zml/kernels/flash_attention/metal/flash_attn.zig +++ b/zml/kernels/flash_attention/metal/flash_attn.zig @@ -4,7 +4,7 @@ const std = @import("std"); -const metal = @import("zml/core").kernel.metal; +const metal = @import("../../../kernel/kernel.zig").metal; const ArgSpec = metal.ArgSpec; const Builder = metal.Builder; diff --git a/zml/kernels/moe/api.zig b/zml/kernels/moe/api.zig index b11ac1d5..b66593c1 100644 --- a/zml/kernels/moe/api.zig +++ b/zml/kernels/moe/api.zig @@ -2,7 +2,7 @@ const std = @import("std"); const stdx = @import("stdx"); -const Tensor = @import("zml/core").Tensor; +const Tensor = @import("../../tensor.zig").Tensor; const log = std.log.scoped(.@"zml/moe"); diff --git a/zml/kernels/moe/flashinfer_cutlass/BUILD.bazel b/zml/kernels/moe/flashinfer_cutlass/BUILD.bazel index d94ff51b..c9c5d9a6 100644 --- a/zml/kernels/moe/flashinfer_cutlass/BUILD.bazel +++ b/zml/kernels/moe/flashinfer_cutlass/BUILD.bazel @@ -2,13 +2,9 @@ package(default_visibility = ["//zml:__pkg__"]) filegroup( name = "flashinfer_cutlass", - srcs = ["flashinfer_cutlass.zig"], -) - -filegroup( - name = "runtime_srcs", srcs = [ "contract.zig", + "flashinfer_cutlass.zig", "runtime.zig", ], ) diff --git a/zml/kernels/moe/flashinfer_cutlass/flashinfer_cutlass.zig b/zml/kernels/moe/flashinfer_cutlass/flashinfer_cutlass.zig index 715198f9..92317c7c 100644 --- a/zml/kernels/moe/flashinfer_cutlass/flashinfer_cutlass.zig +++ b/zml/kernels/moe/flashinfer_cutlass/flashinfer_cutlass.zig @@ -9,9 +9,9 @@ const GlobalOptions = @import("../api.zig").Options; const Activation = @import("../api.zig").Activation; const LocalRouting = @import("../api.zig").LocalRouting; const unpackedWeight = @import("../weights.zig").unpackedWeight; -const contract = @import("zml/core").flashinfer_cutlass.contract; +const contract = @import("contract.zig"); const Attributes = contract.Attributes; -const runtime = @import("zml/core").flashinfer_cutlass.runtime; +const runtime = @import("runtime.zig"); const log = std.log.scoped(.@"zml/moe/flashinfer_cutlass"); diff --git a/zml/kernels/moe/weights.zig b/zml/kernels/moe/weights.zig index 69036523..0e288856 100644 --- a/zml/kernels/moe/weights.zig +++ b/zml/kernels/moe/weights.zig @@ -1,5 +1,5 @@ -const nn = @import("zml/core").nn; -const Tensor = @import("zml/core").Tensor; +const nn = @import("../../nn.zig"); +const Tensor = @import("../../tensor.zig").Tensor; pub fn unpackedWeight(linear: nn.Linear) Tensor { const quantization = linear.quantization orelse return linear.weight; diff --git a/zml/kernels/paged_attention/metal/paged_attn.zig b/zml/kernels/paged_attention/metal/paged_attn.zig index 10a088e5..04f4c1ac 100644 --- a/zml/kernels/paged_attention/metal/paged_attn.zig +++ b/zml/kernels/paged_attention/metal/paged_attn.zig @@ -3,7 +3,7 @@ const std = @import("std"); -const metal = @import("zml/core").kernel.metal; +const metal = @import("../../../kernel/kernel.zig").metal; const ArgSpec = metal.ArgSpec; const Builder = metal.Builder; diff --git a/zml/kernels/paged_attention/options.zig b/zml/kernels/paged_attention/options.zig index 159da9b2..35ad4049 100644 --- a/zml/kernels/paged_attention/options.zig +++ b/zml/kernels/paged_attention/options.zig @@ -1,4 +1,4 @@ -const Tensor = @import("zml/core").Tensor; +const Tensor = @import("../../tensor.zig").Tensor; pub const AttentionMask = union(enum) { standard: struct { diff --git a/zml/mem.zig b/zml/mem.zig index 3007044c..a64ae968 100644 --- a/zml/mem.zig +++ b/zml/mem.zig @@ -3,12 +3,12 @@ const Allocator = std.mem.Allocator; const Alignment = std.mem.Alignment; const assert = std.debug.assert; -const meta = @import("zml/meta"); const pjrt = @import("pjrt"); const Buffer = @import("buffer.zig").Buffer; const Device = @import("platform.zig").Device; const Memory = @import("platform.zig").Memory; +const meta = @import("meta.zig"); const Platform = @import("platform.zig").Platform; const Tensor = @import("tensor.zig").Tensor; diff --git a/zml/nn.zig b/zml/nn.zig index 592efa2e..eceb316b 100644 --- a/zml/nn.zig +++ b/zml/nn.zig @@ -1,13 +1,13 @@ //! Common layer definition and functions for Neural Networks (NN) const std = @import("std"); -const constants = @import("zml/constants"); -const meta = @import("zml/meta"); const mlir = @import("mlir"); const stablehlo = @import("mlir/dialects/stablehlo"); const stdx = @import("stdx"); +const constants = @import("constants.zig"); const DataType = @import("dtype.zig").DataType; +const meta = @import("meta.zig"); const mlirx = @import("mlirx.zig"); const ops = @import("ops.zig"); const quantization = @import("quantization.zig"); @@ -15,7 +15,7 @@ pub const Quantization = quantization.Quantization; const Shape = @import("shape.zig").Shape; const Slice = @import("slice.zig").Slice; const Tensor = @import("tensor.zig").Tensor; -const zml = @import("core.zig"); +const zml = @import("zml.zig"); const log = std.log.scoped(.@"zml/nn"); diff --git a/zml/ops.zig b/zml/ops.zig index 59f5130a..f8fdba7e 100644 --- a/zml/ops.zig +++ b/zml/ops.zig @@ -1,9 +1,7 @@ const std = @import("std"); const builtin = @import("builtin"); -const constants = @import("zml/constants"); const func = @import("mlir/dialects/func"); -const meta = @import("zml/meta"); const mlir = @import("mlir"); const pjrt = @import("pjrt"); const platforms = @import("platforms"); @@ -13,8 +11,10 @@ const stdx = @import("stdx"); const Buffer = @import("buffer.zig").Buffer; const Bufferized = @import("mem.zig").Bufferized; const Compiler = @import("Compiler.zig"); +const constants = @import("constants.zig"); const CustomCallBuffer = @import("pjrtx.zig").CustomCallBuffer; const DataType = @import("dtype.zig").DataType; +const meta = @import("meta.zig"); const mlirx = @import("mlirx.zig"); const manual_computation = @import("ops/manual_computation.zig"); pub const manualComputation = manual_computation.manualComputation; @@ -667,7 +667,7 @@ pub fn @"while"( pub const while_ = @"while"; test @"while" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const While = struct { @@ -812,7 +812,7 @@ pub fn @"if"( } test "if" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const allocator = std.testing.allocator; @@ -893,7 +893,7 @@ pub fn if2( } test if2 { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const allocator = std.testing.allocator; @@ -1107,7 +1107,7 @@ pub fn fly(inputs: anytype, outputs: anytype, opts: FlyOps) [outputs.len]Tensor } test "fly custom call, both entry ABIs" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); if (platform.target != .rocm) return error.SkipZigTest; @@ -1298,7 +1298,7 @@ pub fn neuronNki(inputs: anytype, outputs: anytype, opts: NeuronNkiOps) [outputs } test "triton" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); if (platform.target != .cuda and platform.target != .rocm and platform.target != .oneapi) return error.SkipZigTest; @@ -1617,7 +1617,7 @@ pub fn cute(inputs: anytype, outputs: anytype, opts: CuteOps) [outputs.len]Tenso } test "cute" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); if (platform.target != .cuda) return error.SkipZigTest; @@ -1682,7 +1682,7 @@ test "cute" { } test "cuda_tile" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); if (platform.target != .cuda) return error.SkipZigTest; @@ -1741,7 +1741,7 @@ test "cuda_tile" { } test "cuda_tile grid" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); if (platform.target != .cuda) return error.SkipZigTest; @@ -1808,7 +1808,7 @@ test "cuda_tile grid" { } test "cuda_tile zeroed_outputs" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); if (platform.target != .cuda) return error.SkipZigTest; @@ -2107,7 +2107,7 @@ fn scatterConfig( } test scatterConfig { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); var comp: zml.Compiler = .init(std.testing.allocator, std.testing.io, platform, .{}); @@ -2984,7 +2984,7 @@ fn customCallArgsFromPjrtCallFrame(I: type, O: type, A: type, call_frame: *pjrt. } test customCall { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const tp = zml.testing.tpMesh(); diff --git a/zml/ops/manual_computation.zig b/zml/ops/manual_computation.zig index 68dfaccf..a0ec0037 100644 --- a/zml/ops/manual_computation.zig +++ b/zml/ops/manual_computation.zig @@ -6,7 +6,7 @@ const stablehlo = @import("mlir/dialects/stablehlo"); const stdx = @import("stdx"); const Compiler = @import("../Compiler.zig"); -const meta = @import("zml/meta"); +const meta = @import("../meta.zig"); const mlirx = @import("../mlirx.zig"); const Shape = @import("../shape.zig").Shape; const Sharding = @import("../Sharding.zig"); @@ -376,7 +376,7 @@ const gspmd = struct { }; test manualComputation { - const zml = @import("../core.zig"); + const zml = @import("../zml.zig"); const allocator = std.testing.allocator; const io = std.testing.io; const platform = zml.testing.env(); @@ -436,7 +436,7 @@ test manualComputation { } test "manualComputation composes across logical and physical meshes" { - const zml = @import("../core.zig"); + const zml = @import("../zml.zig"); if (comptime !zml.Target.cpu.isEnabled()) return error.SkipZigTest; const allocator = std.testing.allocator; const io = std.testing.io; @@ -505,7 +505,7 @@ test "manualComputation composes across logical and physical meshes" { } test "partitionSpecs preserves optional tensors and active cache variants" { - const zml = @import("../core.zig"); + const zml = @import("../zml.zig"); const Logical = Sharding.Partitioning.Logical; const Inputs = struct { layers: []const Tensor, diff --git a/zml/pjrtx.zig b/zml/pjrtx.zig index 3185b608..824d2bd1 100644 --- a/zml/pjrtx.zig +++ b/zml/pjrtx.zig @@ -1,11 +1,11 @@ const std = @import("std"); -const meta = @import("zml/meta"); const mlir = @import("mlir"); const pjrt = @import("pjrt"); const stablehlo = @import("mlir/dialects/stablehlo"); pub const DataType = @import("dtype.zig").DataType; +const meta = @import("meta.zig"); const Shape = @import("shape.zig").Shape; const Tensor = @import("tensor.zig").Tensor; diff --git a/zml/platform.zig b/zml/platform.zig index f4547988..54fb90e4 100644 --- a/zml/platform.zig +++ b/zml/platform.zig @@ -2,18 +2,18 @@ const std = @import("std"); const builtin = @import("builtin"); const c = @import("c"); -const constants = @import("zml/constants"); const pjrt = @import("pjrt"); -const profiler_ = @import("zml/profiling").profiler; const stdx = @import("stdx"); pub const Target = @import("platforms").Platform; +const constants = @import("constants.zig"); const Exe = @import("exe.zig").Exe; const flashinfer_cutlass_contract = @import("kernels/moe/flashinfer_cutlass/contract.zig"); const flashinfer_cutlass_runtime = @import("kernels/moe/flashinfer_cutlass/runtime.zig"); const pjrtx = @import("pjrtx.zig"); +const profiler_ = @import("profiling/profiler.zig"); const Sharding = @import("Sharding.zig"); -const zml = @import("core.zig"); +const zml = @import("zml.zig"); const log = std.log.scoped(.zml); diff --git a/zml/profiling/profiling.zig b/zml/profiling/profiling.zig deleted file mode 100644 index 018f0e0c..00000000 --- a/zml/profiling/profiling.zig +++ /dev/null @@ -1,2 +0,0 @@ -pub const profiler = @import("profiler.zig"); -pub const tracer = @import("tracer.zig"); diff --git a/zml/quantization.zig b/zml/quantization.zig index 5c616080..db20619a 100644 --- a/zml/quantization.zig +++ b/zml/quantization.zig @@ -3,7 +3,7 @@ const std = @import("std"); const stdx = @import("stdx"); -const zml = @import("core.zig"); +const zml = @import("zml.zig"); const DataType = @import("dtype.zig").DataType; const platform_mod = @import("platform.zig"); diff --git a/zml/shape.zig b/zml/shape.zig index dddcdf63..386b594e 100644 --- a/zml/shape.zig +++ b/zml/shape.zig @@ -2,9 +2,9 @@ const std = @import("std"); const testing = std.testing; const builtin = @import("builtin"); -const constants = @import("zml/constants"); const stdx = @import("stdx"); +const constants = @import("constants.zig"); const DataType = @import("dtype.zig").DataType; const Sharding = @import("Sharding.zig"); diff --git a/zml/slice.zig b/zml/slice.zig index 8b593bd2..9451165b 100644 --- a/zml/slice.zig +++ b/zml/slice.zig @@ -1,12 +1,12 @@ const std = @import("std"); -const builtin = @import("builtin"); -const constants = @import("zml/constants"); const stdx = @import("stdx"); +const constants = @import("constants.zig"); const DataType = @import("dtype.zig").DataType; const floats = @import("floats.zig"); const Shape = @import("shape.zig").Shape; +const builtin = @import("builtin"); pub fn isBytes(comptime T: type) bool { const type_info = @typeInfo(T); diff --git a/zml/tensor.zig b/zml/tensor.zig index 686f9683..ee084835 100644 --- a/zml/tensor.zig +++ b/zml/tensor.zig @@ -1,17 +1,17 @@ const std = @import("std"); const builtin = @import("builtin"); -const constants = @import("zml/constants"); -const meta = @import("zml/meta"); const mlir = @import("mlir"); const shardy = @import("mlir/dialects/shardy"); const stablehlo = @import("mlir/dialects/stablehlo"); const stdx = @import("stdx"); const Compiler = @import("Compiler.zig"); +const constants = @import("constants.zig"); const DataType = @import("dtype.zig").DataType; const mem = @import("mem.zig"); const Memory = @import("platform.zig").Memory; +const meta = @import("meta.zig"); const mlirx = @import("mlirx.zig"); const ops = @import("ops.zig"); const Platform = @import("platform.zig").Platform; @@ -322,7 +322,7 @@ pub const Tensor = struct { } test toMemory { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const io = std.testing.io; @@ -479,7 +479,7 @@ pub const Tensor = struct { } test reuseBuffer { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const io = std.testing.io; @@ -617,7 +617,7 @@ pub const Tensor = struct { } test fmod { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const inputs: [2][6]f32 = .{ .{ -3.0, -2, -1, 1, 2, 3 }, .{ 1, 2, 3, 4, 5, -5 } }; @@ -799,7 +799,7 @@ pub const Tensor = struct { } test "Tensor.fft IRFFT restores RFFT last dimension" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const rfft_input_len: i64 = 10; @@ -909,7 +909,7 @@ pub const Tensor = struct { } test uniform { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const Stats = struct { const Stats = @This(); @@ -1007,7 +1007,7 @@ pub const Tensor = struct { } test gumbel { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const Stats = struct { const Stats = @This(); @@ -1382,7 +1382,7 @@ pub const Tensor = struct { test "convert f32 -> f4e2m1" { const floats = @import("floats.zig"); - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const x_f32 = [_]f32{ 0.0, 0.5, 1, 1.5, 2, 3, 4, 6, -0.0, -0.5, -1, -1.5, -2, -3, -4, -6 }; var x_f4: [x_f32.len / 2]floats.Float4E2M1.Packed = undefined; @@ -1415,7 +1415,7 @@ pub const Tensor = struct { } test "convert f32 -> f8e3m4" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const x = [_]f32{ 1.1 / 4.0, 1.1 / 8.0, 1.1 / 16.0, 1.1 / 32.0, 1.1 / 64.0, 1.1 / 128.0 }; @@ -1446,7 +1446,7 @@ pub const Tensor = struct { } test "convert u2 -> u8" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const x_u2: [2]stdx.Packed(u2) = .{ .pack(0, 1, 2, 3), .pack(3, 2, 1, 0) }; comptime std.debug.assert(@sizeOf(@TypeOf(x_u2)) == 2); @@ -1476,7 +1476,7 @@ pub const Tensor = struct { test "convert f4e2m1 -> f32" { const floats = @import("floats.zig"); - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const x_f4_packed = [_]floats.Float4E2M1.Packed{ .fromF32(0, 0.5), .fromF32(1, 1.5), .fromF32(2, 3), .fromF32(4, 6) }; @@ -1570,7 +1570,7 @@ pub const Tensor = struct { } test dot { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); inline for (.{ @@ -1719,7 +1719,7 @@ pub const Tensor = struct { } test leakyReLU { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const input: Tensor = .init(.{2}, .f32); @@ -1757,7 +1757,7 @@ pub const Tensor = struct { } test swiglu { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const input: Tensor = .init(.{ .d = 4 }, .f32); @@ -2030,7 +2030,7 @@ pub const Tensor = struct { } test cumulativeSum { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -2338,7 +2338,7 @@ pub const Tensor = struct { } test slice { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const x: Tensor = .init(.{ 2, 5 }, .f32); @@ -2378,7 +2378,7 @@ pub const Tensor = struct { } test "dynamic slices" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -2498,7 +2498,7 @@ pub const Tensor = struct { } test repeat1d { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -2561,7 +2561,7 @@ pub const Tensor = struct { } test stutter1d { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -2684,7 +2684,7 @@ pub const Tensor = struct { } test arange { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const exe = try zml.module.compile( @@ -2770,7 +2770,7 @@ pub const Tensor = struct { } test scalar { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -3063,7 +3063,7 @@ pub const Tensor = struct { } test gather { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -3217,7 +3217,7 @@ pub const Tensor = struct { } test gatherSlices { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -3426,7 +3426,7 @@ pub const Tensor = struct { } test scatterSlices { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -3648,7 +3648,7 @@ pub const Tensor = struct { } test argMax { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const allocator = std.testing.allocator; const ArgMaxTest = struct { @@ -3720,7 +3720,7 @@ pub const Tensor = struct { } test argsort { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -3991,7 +3991,7 @@ pub const Tensor = struct { } test chunkExact { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); // Only test shapes @@ -4044,7 +4044,7 @@ pub const Tensor = struct { } test chunkAllowTrailing { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); // Only test shapes @@ -4102,7 +4102,7 @@ pub const Tensor = struct { } test split { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -4236,7 +4236,7 @@ pub const Tensor = struct { } test dynamicUpdateSlice { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); { @@ -4432,7 +4432,7 @@ pub const Tensor = struct { } test toDiagonal { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -4485,7 +4485,7 @@ pub const Tensor = struct { } test triangular { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { @@ -4663,7 +4663,7 @@ pub const Tensor = struct { } test cartesianProduct { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const x: Tensor = .init(.{6}, .i32); @@ -4741,7 +4741,7 @@ pub const Tensor = struct { } test cartesianProductStacked { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const x: Tensor = .init(.{6}, .i32); const y: Tensor = .init(.{4}, .i32); @@ -4887,7 +4887,7 @@ fn getComparisonType(ctx: *mlir.Context, dtype: DataType) *const stablehlo.Compa } test "Tensor.maxPool1d" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const MaxPool = struct { @@ -4929,7 +4929,7 @@ test "Tensor.maxPool1d" { } test "Tensor.maxPool2d" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const MaxPool = struct { @@ -5038,7 +5038,7 @@ test transposeIsJustAReshape { } test "unused tensor" { - const zml = @import("core.zig"); + const zml = @import("zml.zig"); const platform = zml.testing.env(); const Local = struct { diff --git a/zml/testing.zig b/zml/testing.zig index b2671935..5e3d6333 100644 --- a/zml/testing.zig +++ b/zml/testing.zig @@ -6,7 +6,7 @@ const stdx = @import("stdx"); const Platform = @import("platform.zig").Platform; const Sharding = @import("Sharding.zig"); const Slice = @import("slice.zig").Slice; -const zml = @import("core.zig"); +const zml = @import("zml.zig"); const log = std.log.scoped(.@"zml/testing"); diff --git a/zml/zml.zig b/zml/zml.zig index 2649eb31..dafc3a0f 100644 --- a/zml/zml.zig +++ b/zml/zml.zig @@ -5,62 +5,85 @@ // Namespaces const std = @import("std"); -const core = @import("zml/core"); -pub const bazel = core.bazel; -pub const constants = core.constants; -pub const meta = core.meta; -pub const pjrt = core.pjrt; -pub const stdx = core.stdx; +pub const bazel = @import("bazel"); +const c = @import("c"); +pub const pjrt = @import("pjrt"); +const runfiles = @import("runfiles"); +pub const stdx = @import("stdx"); pub const tokenizer = @import("zml/tokenizer"); -pub const tracer = core.tracer; pub const attention = @import("attention/attention.zig"); -pub const Buffer = core.Buffer; -pub const Compiler = core.Compiler; -pub const dtype = core.dtype; -pub const Data = core.Data; -pub const DataType = core.DataType; -pub const exe = core.exe; -pub const Exe = core.Exe; -pub const FnExe = core.FnExe; -pub const floats = core.floats; -pub const io = core.io; -pub const kernel = core.kernel; -pub const moe = @import("kernels/moe/moe.zig"); pub const paged_attention = @import("kernels/paged_attention/paged_attention.zig"); -pub const logo = @import("zml/logo"); -pub const mem = core.mem; -pub const Bufferized = core.Bufferized; -pub const mlir = core.mlir; -pub const nn = core.nn; -pub const ops = core.ops; -pub const pjrtx = core.pjrtx; -pub const platform = core.platform; -pub const Memory = core.Memory; -pub const Platform = core.Platform; -pub const Target = core.Target; -pub const quantization = core.quantization; -pub const Quantization = core.Quantization; -pub const safetensors = core.safetensors; -pub const shape = core.shape; -pub const Shape = core.Shape; -pub const Sharding = core.Sharding; -pub const Mesh = core.Mesh; -pub const slice = core.slice; -pub const Slice = core.Slice; -pub const tensor = core.tensor; -pub const Tensor = core.Tensor; -pub const testing = core.testing; +pub const Buffer = @import("buffer.zig").Buffer; +pub const Compiler = @import("Compiler.zig"); +pub const constants = @import("constants.zig"); +pub const dtype = @import("dtype.zig"); +pub const Data = dtype.Data; +pub const DataType = dtype.DataType; +pub const exe = @import("exe.zig"); +pub const Exe = exe.Exe; +pub const FnExe = exe.FnExe; +pub const floats = @import("floats.zig"); +pub const io = @import("io.zig"); +pub const kernel = @import("kernel/kernel.zig"); +pub const logo = @import("logo.zig"); +pub const mem = @import("mem.zig"); +pub const Bufferized = mem.Bufferized; +pub const meta = @import("meta.zig"); +pub const mlir = @import("mlirx.zig"); +pub const moe = @import("kernels/moe/moe.zig"); +pub const nn = @import("nn.zig"); +pub const ops = @import("ops.zig"); +pub const pjrtx = @import("pjrtx.zig"); +pub const platform = @import("platform.zig"); +pub const Memory = platform.Memory; +pub const Platform = platform.Platform; +pub const Target = platform.Target; +pub const tracer = @import("profiling/tracer.zig"); +pub const quantization = @import("quantization.zig"); +pub const Quantization = quantization.Quantization; +pub const safetensors = @import("safetensors.zig"); +pub const shape = @import("shape.zig"); +pub const Shape = shape.Shape; +pub const Sharding = @import("Sharding.zig"); +pub const Mesh = Sharding.Mesh; +pub const slice = @import("slice.zig"); +pub const Slice = slice.Slice; +pub const tensor = @import("tensor.zig"); +pub const Tensor = tensor.Tensor; +pub const testing = @import("testing.zig"); /// Deprecated, use `zml.Compiler` instead -pub const module = core.module; +pub const module = struct { + pub const CompilationContext = Compiler; + pub const CompileError = Compiler.Error; + pub const CompilationOptions = Compiler.Options; + + /// Deprecated, use `platform.compileFn` or `zml.Compiler.compile` + pub fn compile( + allocator: std.mem.Allocator, + io_: std.Io, + comptime func: anytype, + args: std.meta.ArgsTuple(@TypeOf(func)), + platform_: *const Platform, + opts: Compiler.Options, + ) Compiler.Error!Exe { + return Compiler.compile(allocator, io_, platform_, func, args, opts); + } +}; test "zml" { std.testing.refAllDecls(@This()); } -pub const KiB = core.KiB; -pub const MiB = core.MiB; -pub const GiB = core.GiB; -pub const TiB = core.TiB; +pub const KiB = 1024; +pub const MiB = 1024 * KiB; +pub const GiB = 1024 * MiB; +pub const TiB = 1024 * GiB; + +comptime { + // Forces zig to compile `@zml//bazel` module even when users don't depend on it even indirectly. + // Otherwise exported functions declared in `bazel` aren't compiled. + std.testing.refAllDecls(bazel); +}