Skip to content

Commit 202a38c

Browse files
SignalRTSignalRT
committed
Rename SafeMtmdWeights
1 parent 7c49483 commit 202a38c

File tree

12 files changed

+36
-36
lines changed

12 files changed

+36
-36
lines changed

‎LLama.Examples/Examples/BatchedExecutorMtmd.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static async Task Run()
3030
mtmdParams.UseGpu = false;
3131
var marker = mtmdParams.MediaMarker ?? NativeApi.MtmdDefaultMarker() ?? "<media>";
3232

33-
using var mtmd = await SafeMtmdWeights.LoadFromFileAsync(UserSettings.GetMMProjPath(), model, mtmdParams); // multimodal helper weights
33+
using var mtmd = await MtmdWeights.LoadFromFileAsync(UserSettings.GetMMProjPath(), model, mtmdParams); // multimodal helper weights
3434

3535
using var executor = new BatchedExecutor(model, parameters, mtmd); // drives batched token + chunk evaluation
3636

‎LLama.Examples/Examples/MtmdInteractiveModeExecute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static async Task Run()
3030
using var context = model.CreateContext(parameters);
3131

3232
// Mtmd Init
33-
using var clipModel = await SafeMtmdWeights.LoadFromFileAsync(multiModalProj, model, mtmdParameters );
33+
using var clipModel = await MtmdWeights.LoadFromFileAsync(multiModalProj, model, mtmdParameters );
3434

3535
var mediaMarker = mtmdParameters.MediaMarker ?? NativeApi.MtmdDefaultMarker() ?? "<media>";
3636

‎LLama.Unittest/MtmdExecutorTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class MtmdExecutorTests : IDisposable
1313
{
1414
private readonly LLamaWeights _weights;
1515
private readonly MtmdContextParams _mtmdParams;
16-
private readonly SafeMtmdWeights _mtmd;
16+
private readonly MtmdWeights _mtmd;
1717
private readonly ModelParams _modelParams;
1818

1919
public MtmdExecutorTests()
@@ -30,7 +30,7 @@ public MtmdExecutorTests()
3030
_mtmdParams.NThreads = Math.Max(1, Constants.CIGpuLayerCount);
3131
_mtmdParams.UseGpu = false;
3232

33-
_mtmd = SafeMtmdWeights.LoadFromFile(Constants.MtmdMmpPath, _weights, _mtmdParams);
33+
_mtmd = MtmdWeights.LoadFromFile(Constants.MtmdMmpPath, _weights, _mtmdParams);
3434
}
3535

3636
public void Dispose()

‎LLama.Unittest/MtmdWeightsTests.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public sealed class MtmdWeightTests
1212
: IDisposable
1313
{
1414
private readonly LLamaWeights _llamaWeights;
15-
private readonly SafeMtmdWeights _safeMtmdWeights;
15+
private readonly MtmdWeights _mtmdWeights;
1616
private readonly LLamaContext _context;
1717
private readonly MtmdContextParams _mtmdParams;
1818
private readonly string _mediaMarker;
@@ -33,20 +33,20 @@ public MtmdWeightTests()
3333

3434
_mediaMarker = _mtmdParams.MediaMarker ?? throw new InvalidOperationException("MTMD media marker unavailable.");
3535

36-
_safeMtmdWeights = SafeMtmdWeights.LoadFromFile(Constants.MtmdMmpPath, _llamaWeights, _mtmdParams);
36+
_mtmdWeights = MtmdWeights.LoadFromFile(Constants.MtmdMmpPath, _llamaWeights, _mtmdParams);
3737
_context = _llamaWeights.CreateContext(@params);
3838
}
3939

4040
public void Dispose()
4141
{
4242
_context.Dispose();
43-
_safeMtmdWeights.Dispose();
43+
_mtmdWeights.Dispose();
4444
_llamaWeights.Dispose();
4545
}
4646

4747
private SafeMtmdInputChunks TokenizeWithEmbed(Func<SafeMtmdEmbed> loadEmbed)
4848
{
49-
_safeMtmdWeights.ClearMedia();
49+
_mtmdWeights.ClearMedia();
5050

5151
var embed = loadEmbed();
5252
Assert.NotNull(embed);
@@ -58,7 +58,7 @@ private SafeMtmdInputChunks TokenizeWithEmbed(Func<SafeMtmdEmbed> loadEmbed)
5858
Assert.False(embed.IsAudio);
5959
Assert.True(embed.GetDataSpan().Length > 0);
6060

61-
var status = _safeMtmdWeights.Tokenize(_mediaMarker, addSpecial: true, parseSpecial: true, out var chunks);
61+
var status = _mtmdWeights.Tokenize(_mediaMarker, addSpecial: true, parseSpecial: true, out var chunks);
6262
Assert.Equal(0, status);
6363
Assert.NotNull(chunks);
6464

@@ -69,30 +69,30 @@ private SafeMtmdInputChunks TokenizeWithEmbed(Func<SafeMtmdEmbed> loadEmbed)
6969
private void AssertChunksEvaluate(SafeMtmdInputChunks chunks)
7070
{
7171
long nPast = 0;
72-
var eval = _safeMtmdWeights.EvaluateChunks(chunks, _context.NativeHandle, ref nPast, seqId: 0, nBatch: checked((int)_context.BatchSize), logitsLast: true);
72+
var eval = _mtmdWeights.EvaluateChunks(chunks, _context.NativeHandle, ref nPast, seqId: 0, nBatch: checked((int)_context.BatchSize), logitsLast: true);
7373
Assert.Equal(0, eval);
7474
Assert.True(nPast > 0);
7575
}
7676

7777
[Fact,Trait("Category", "NoCI")]
7878
public void EmbedImageAsFileName()
7979
{
80-
using var chunks = TokenizeWithEmbed(() => _safeMtmdWeights.LoadMedia(Constants.MtmdImage));
80+
using var chunks = TokenizeWithEmbed(() => _mtmdWeights.LoadMedia(Constants.MtmdImage));
8181
AssertChunksEvaluate(chunks);
8282
}
8383

8484
[Fact,Trait("Category", "NoCI")]
8585
public void EmbedImageAsBinary()
8686
{
8787
var imageBytes = File.ReadAllBytes(Constants.MtmdImage);
88-
using var chunks = TokenizeWithEmbed(() => _safeMtmdWeights.LoadMedia(imageBytes));
88+
using var chunks = TokenizeWithEmbed(() => _mtmdWeights.LoadMedia(imageBytes));
8989
AssertChunksEvaluate(chunks);
9090
}
9191

9292
[Fact,Trait("Category", "NoCI")]
9393
public void TokenizeProvidesChunkMetadata()
9494
{
95-
using var chunks = TokenizeWithEmbed(() => _safeMtmdWeights.LoadMedia(Constants.MtmdImage));
95+
using var chunks = TokenizeWithEmbed(() => _mtmdWeights.LoadMedia(Constants.MtmdImage));
9696

9797
Assert.True(chunks.Size > 0);
9898

@@ -128,12 +128,12 @@ public void TokenizeProvidesChunkMetadata()
128128

129129
Assert.True(imageChunks > 0);
130130
Assert.True(totalTokens > 0);
131-
Assert.Equal(totalTokens, _safeMtmdWeights.CountTokens(chunks));
132-
Assert.Equal(totalPositions, _safeMtmdWeights.CountPositions(chunks));
133-
Assert.True(_safeMtmdWeights.SupportsVision);
134-
Assert.False(_safeMtmdWeights.SupportsAudio);
131+
Assert.Equal(totalTokens, _mtmdWeights.CountTokens(chunks));
132+
Assert.Equal(totalPositions, _mtmdWeights.CountPositions(chunks));
133+
Assert.True(_mtmdWeights.SupportsVision);
134+
Assert.False(_mtmdWeights.SupportsAudio);
135135

136-
var audioBitrate = _safeMtmdWeights.AudioBitrate;
136+
var audioBitrate = _mtmdWeights.AudioBitrate;
137137
Assert.True(audioBitrate <= 0);
138138
}
139139
}

‎LLama/Abstractions/ILLamaExecutor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public interface ILLamaExecutor
2323
/// <summary>
2424
/// Multi-Modal Projections / Clip Model weights
2525
/// </summary>
26-
public SafeMtmdWeights? ClipModel { get; }
26+
public MtmdWeights? ClipModel { get; }
2727

2828
/// <summary>
2929
/// List of media: List of media for Multi-Modal models.

‎LLama/Batched/BatchedExecutor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ public BatchedExecutor(LLamaWeights model, IContextParams contextParams)
6565
{
6666
}
6767

68-
public BatchedExecutor(LLamaWeights model, IContextParams contextParams, SafeMtmdWeights? clipModel)
68+
public BatchedExecutor(LLamaWeights model, IContextParams contextParams, MtmdWeights? clipModel)
6969
{
7070
Model = model;
7171
Context = model.CreateContext(contextParams);
7272
ClipModel = clipModel;
7373
Epoch = 1;
7474
}
7575

76-
public SafeMtmdWeights? ClipModel { get; }
76+
public MtmdWeights? ClipModel { get; }
7777

7878
/// <summary>
7979
/// Start a new <see cref="Conversation"/>
@@ -314,11 +314,11 @@ public Task<DecodeResult> DecodeAsync(LLamaContext ctx, CancellationToken token)
314314

315315
private class MtmdChunkBatch : IBatch
316316
{
317-
private readonly SafeMtmdWeights _clipModel;
317+
private readonly MtmdWeights _clipModel;
318318
private readonly Conversation _conversation;
319319
private readonly Conversation.MtmdChunkSequence _sequence;
320320

321-
public MtmdChunkBatch(SafeMtmdWeights clipModel, Conversation conversation, Conversation.MtmdChunkSequence sequence)
321+
public MtmdChunkBatch(MtmdWeights clipModel, Conversation conversation, Conversation.MtmdChunkSequence sequence)
322322
{
323323
_clipModel = clipModel;
324324
_conversation = conversation;

‎LLama/Batched/Conversation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private MtmdChunkSequence(SafeMtmdInputChunks chunks, List<LLamaToken> textToken
8686
TotalPositions = totalPositions;
8787
}
8888

89-
public static MtmdChunkSequence Create(SafeMtmdInputChunks chunks, SafeMtmdWeights clipModel)
89+
public static MtmdChunkSequence Create(SafeMtmdInputChunks chunks, MtmdWeights clipModel)
9090
{
9191
var textTokens = new List<LLamaToken>();
9292

‎LLama/LLamaExecutorBase.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public bool IsMultiModal
8181
}
8282

8383
/// <inheritdoc />
84-
public SafeMtmdWeights? ClipModel { get; }
84+
public MtmdWeights? ClipModel { get; }
8585

8686
/// <inheritdoc />
8787
public List<SafeMtmdEmbed> Embeds { get; }
@@ -117,12 +117,12 @@ protected StatefulExecutorBase(LLamaContext context, ILogger? logger = null)
117117
/// Initialize a multimodal executor with the supplied MTMD weights.
118118
/// </summary>
119119
/// <param name="context">LLama context used for all native interactions.</param>
120-
/// <param name="safeMtmdWeights">Multimodal weights to associate with this executor.</param>
120+
/// <param name="mtmdWeights">Multimodal weights to associate with this executor.</param>
121121
/// <param name="logger">Optional logger for diagnostic output.</param>
122-
public StatefulExecutorBase(LLamaContext context, SafeMtmdWeights safeMtmdWeights, ILogger? logger = null) :
122+
public StatefulExecutorBase(LLamaContext context, MtmdWeights mtmdWeights, ILogger? logger = null) :
123123
this( context, logger )
124124
{
125-
ClipModel = safeMtmdWeights;
125+
ClipModel = mtmdWeights;
126126
}
127127

128128
/// <summary>

‎LLama/LLamaInstructExecutor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public InstructExecutor(LLamaContext context,
4747
}
4848

4949
public InstructExecutor(LLamaContext context,
50-
SafeMtmdWeights clipModel,
50+
MtmdWeights clipModel,
5151
string instructionPrefix = "\n\n### Instruction:\n\n",
5252
string instructionSuffix = "\n\n### Response:\n\n",
5353
ILogger? logger = null)

‎LLama/LLamaInteractExecutor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public InteractiveExecutor(LLamaContext context, ILogger? logger = null)
4040
/// <param name="context">LLama context to operate against.</param>
4141
/// <param name="clipModel">Multimodal weights (MTMD) to attach to the executor.</param>
4242
/// <param name="logger">Optional logger for diagnostic output.</param>
43-
public InteractiveExecutor(LLamaContext context, SafeMtmdWeights clipModel, ILogger? logger = null)
43+
public InteractiveExecutor(LLamaContext context, MtmdWeights clipModel, ILogger? logger = null)
4444
: base(context, clipModel, logger)
4545
{
4646
}

0 commit comments

Comments
 (0)