diff --git a/zml/BUILD.bazel b/zml/BUILD.bazel index b3d9a006..f52ecdd5 100644 --- a/zml/BUILD.bazel +++ b/zml/BUILD.bazel @@ -73,44 +73,6 @@ 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 = [ @@ -120,6 +82,7 @@ zig_library( "attention/attention.zig", "buffer.zig", "buffer/HostAccessible.zig", + "constants.zig", "dtype.zig", "exe.zig", "floats.zig", @@ -134,12 +97,15 @@ 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", @@ -180,10 +146,9 @@ zig_library( "-freference-trace=20", ], deps = [ - ":constants", - ":meta", ":posix", - ":profiling", + ":profiler_options", + ":profiling_traceme_lib", ":xla_compile_options_upb", ":xla_data_upb", "//bazel", @@ -208,6 +173,7 @@ 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 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/buffer.zig b/zml/buffer.zig index 70be7c83..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; 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 15e6c21d..ab8d8e6e 100644 --- a/zml/io.zig +++ b/zml/io.zig @@ -1,9 +1,7 @@ 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; @@ -12,8 +10,10 @@ 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 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 71474302..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"); diff --git a/zml/ops.zig b/zml/ops.zig index f1b0a8bd..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; diff --git a/zml/ops/manual_computation.zig b/zml/ops/manual_computation.zig index d39ef844..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"); 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 7fb5c3d2..54fb90e4 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 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/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 53c4ffe7..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; diff --git a/zml/zml.zig b/zml/zml.zig index 89c6e5f5..dafc3a0f 100644 --- a/zml/zml.zig +++ b/zml/zml.zig @@ -8,17 +8,16 @@ 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; @@ -28,12 +27,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"); @@ -41,6 +40,7 @@ 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");