From f621ec67e80891ed8766aebae90dfe4a71d73b57 Mon Sep 17 00:00:00 2001 From: Martin Evans Date: Fri, 20 Oct 2023 15:04:18 +0100 Subject: [PATCH] Fixed serialization --- LLama/Abstractions/IModelParams.cs | 22 +++++++++++----------- LLama/Common/ModelParams.cs | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LLama/Abstractions/IModelParams.cs b/LLama/Abstractions/IModelParams.cs index c0abb0ca..d25b3cf0 100644 --- a/LLama/Abstractions/IModelParams.cs +++ b/LLama/Abstractions/IModelParams.cs @@ -108,12 +108,12 @@ namespace LLama.Abstractions public sealed class TensorSplitsCollection : IEnumerable { - private readonly float[] _splits = new float[NativeApi.llama_max_devices()]; + internal readonly float[] Splits = new float[NativeApi.llama_max_devices()]; /// /// The size of this array /// - public int Length => _splits.Length; + public int Length => Splits.Length; /// /// Get or set the proportion of work to do on the given device. @@ -123,8 +123,8 @@ namespace LLama.Abstractions /// public float this[int index] { - get => _splits[index]; - set => _splits[index] = value; + get => Splits[index]; + set => Splits[index] = value; } /// @@ -134,9 +134,9 @@ namespace LLama.Abstractions /// public TensorSplitsCollection(float[] splits) { - if (splits.Length != _splits.Length) - throw new ArgumentException($"tensor splits length must equal {_splits.Length}"); - _splits = splits; + if (splits.Length != Splits.Length) + throw new ArgumentException($"tensor splits length must equal {Splits.Length}"); + Splits = splits; } /// @@ -151,25 +151,25 @@ namespace LLama.Abstractions /// public void Clear() { - Array.Clear(_splits, 0, _splits.Length); + Array.Clear(Splits, 0, Splits.Length); } internal MemoryHandle Pin() { - return _splits.AsMemory().Pin(); + return Splits.AsMemory().Pin(); } #region IEnumerator /// public IEnumerator GetEnumerator() { - return ((IEnumerable)_splits).GetEnumerator(); + return ((IEnumerable)Splits).GetEnumerator(); } /// IEnumerator IEnumerable.GetEnumerator() { - return _splits.GetEnumerator(); + return Splits.GetEnumerator(); } #endregion } diff --git a/LLama/Common/ModelParams.cs b/LLama/Common/ModelParams.cs index 8fd22ee0..8f58e737 100644 --- a/LLama/Common/ModelParams.cs +++ b/LLama/Common/ModelParams.cs @@ -207,7 +207,7 @@ namespace LLama.Common public override void Write(Utf8JsonWriter writer, TensorSplitsCollection value, JsonSerializerOptions options) { - JsonSerializer.Serialize(writer, value.Data, options); + JsonSerializer.Serialize(writer, value.Splits, options); } } }