diff --git a/zml/BUILD.bazel b/zml/BUILD.bazel index f52ecdd5..b3d9a006 100644 --- a/zml/BUILD.bazel +++ b/zml/BUILD.bazel @@ -73,6 +73,44 @@ zig_library( visibility = ["//visibility:public"], ) +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 = "zml", srcs = [ @@ -82,7 +120,6 @@ zig_library( "attention/attention.zig", "buffer.zig", "buffer/HostAccessible.zig", - "constants.zig", "dtype.zig", "exe.zig", "floats.zig", @@ -97,15 +134,12 @@ zig_library( "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", @@ -146,9 +180,10 @@ zig_library( "-freference-trace=20", ], deps = [ + ":constants", + ":meta", ":posix", - ":profiler_options", - ":profiling_traceme_lib", + ":profiling", ":xla_compile_options_upb", ":xla_data_upb", "//bazel", @@ -173,7 +208,6 @@ zig_library( "//platforms", "//platforms/tpu:ragged_paged", "//stdx", - "//tools/xspace_to_perfetto:xspace_to_perfetto_lib", "//upb", "//vfs", "//zml/tokenizer", diff --git a/zml/Compiler.zig b/zml/Compiler.zig index 93eafa8d..1bf994cc 100644 --- a/zml/Compiler.zig +++ b/zml/Compiler.zig @@ -2,11 +2,13 @@ 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"); @@ -14,12 +16,10 @@ 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/buffer.zig b/zml/buffer.zig index 8714d80f..70be7c83 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; diff --git a/zml/exe.zig b/zml/exe.zig index 32c0ac48..e370c708 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 ab8d8e6e..15e6c21d 100644 --- a/zml/io.zig +++ b/zml/io.zig @@ -1,7 +1,9 @@ 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; @@ -10,10 +12,8 @@ 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/mem.zig b/zml/mem.zig index a64ae968..3007044c 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 eceb316b..71474302 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"); diff --git a/zml/ops.zig b/zml/ops.zig index f8fdba7e..f1b0a8bd 100644 --- a/zml/ops.zig +++ b/zml/ops.zig @@ -1,7 +1,9 @@ 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"); @@ -11,10 +13,8 @@ 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; diff --git a/zml/ops/manual_computation.zig b/zml/ops/manual_computation.zig index a0ec0037..d39ef844 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("../meta.zig"); +const meta = @import("zml/meta"); const mlirx = @import("../mlirx.zig"); const Shape = @import("../shape.zig").Shape; const Sharding = @import("../Sharding.zig"); diff --git a/zml/pjrtx.zig b/zml/pjrtx.zig index 824d2bd1..3185b608 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 54fb90e4..7fb5c3d2 100644 --- a/zml/platform.zig +++ b/zml/platform.zig @@ -2,16 +2,16 @@ 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("zml.zig"); diff --git a/zml/profiling/profiling.zig b/zml/profiling/profiling.zig new file mode 100644 index 00000000..018f0e0c --- /dev/null +++ b/zml/profiling/profiling.zig @@ -0,0 +1,2 @@ +pub const profiler = @import("profiler.zig"); +pub const tracer = @import("tracer.zig"); diff --git a/zml/shape.zig b/zml/shape.zig index 386b594e..dddcdf63 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 9451165b..8b593bd2 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 ee084835..53c4ffe7 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; diff --git a/zml/zml.zig b/zml/zml.zig index dafc3a0f..89c6e5f5 100644 --- a/zml/zml.zig +++ b/zml/zml.zig @@ -8,16 +8,17 @@ const std = @import("std"); pub const bazel = @import("bazel"); const c = @import("c"); +pub const constants = @import("zml/constants"); +pub const meta = @import("zml/meta"); pub const pjrt = @import("pjrt"); const runfiles = @import("runfiles"); pub const stdx = @import("stdx"); pub const tokenizer = @import("zml/tokenizer"); +pub const tracer = @import("zml/profiling").tracer; pub const attention = @import("attention/attention.zig"); -pub const paged_attention = @import("kernels/paged_attention/paged_attention.zig"); 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; @@ -27,12 +28,12 @@ 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 moe = @import("kernels/moe/moe.zig"); +pub const paged_attention = @import("kernels/paged_attention/paged_attention.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"); @@ -40,7 +41,6 @@ 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");