Browse Source

Fixed serialization

tags/v0.7.0
Martin Evans 2 years ago
parent
commit
f621ec67e8
2 changed files with 12 additions and 12 deletions
  1. +11
    -11
      LLama/Abstractions/IModelParams.cs
  2. +1
    -1
      LLama/Common/ModelParams.cs

+ 11
- 11
LLama/Abstractions/IModelParams.cs View File

@@ -108,12 +108,12 @@ namespace LLama.Abstractions
public sealed class TensorSplitsCollection
: IEnumerable<float>
{
private readonly float[] _splits = new float[NativeApi.llama_max_devices()];
internal readonly float[] Splits = new float[NativeApi.llama_max_devices()];

/// <summary>
/// The size of this array
/// </summary>
public int Length => _splits.Length;
public int Length => Splits.Length;

/// <summary>
/// Get or set the proportion of work to do on the given device.
@@ -123,8 +123,8 @@ namespace LLama.Abstractions
/// <returns></returns>
public float this[int index]
{
get => _splits[index];
set => _splits[index] = value;
get => Splits[index];
set => Splits[index] = value;
}

/// <summary>
@@ -134,9 +134,9 @@ namespace LLama.Abstractions
/// <exception cref="ArgumentException"></exception>
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;
}

/// <summary>
@@ -151,25 +151,25 @@ namespace LLama.Abstractions
/// </summary>
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
/// <inheritdoc />
public IEnumerator<float> GetEnumerator()
{
return ((IEnumerable<float>)_splits).GetEnumerator();
return ((IEnumerable<float>)Splits).GetEnumerator();
}

/// <inheritdoc />
IEnumerator IEnumerable.GetEnumerator()
{
return _splits.GetEnumerator();
return Splits.GetEnumerator();
}
#endregion
}

+ 1
- 1
LLama/Common/ModelParams.cs View File

@@ -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);
}
}
}

Loading…
Cancel
Save