-
Notifications
You must be signed in to change notification settings - Fork 350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
The log levels defined on llama.cpp and LlamaSharp side were not aligned anymore (issue #995) #997
Merged
martindevans
merged 2 commits into
SciSharp:master
from
LoicDagnas:hotfix/align-loglevel-with-llamacpp
Nov 26, 2024
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
using LLama.Common; | ||
using LLama.Native; | ||
using Microsoft.Extensions.Logging; | ||
|
||
namespace LLama.Unittest | ||
{ | ||
public sealed class LLamaContextWithCustomLoggerTests | ||
: IDisposable | ||
{ | ||
private sealed class CustomLogger : ILogger | ||
{ | ||
public IDisposable? BeginScope<TState>(TState state) where TState : notnull => default; | ||
|
||
public void Log<TState>( | ||
LogLevel logLevel, | ||
EventId eventId, | ||
TState state, | ||
Exception? exception, | ||
Func<TState, Exception, string> formatter) | ||
{ | ||
} | ||
|
||
public bool IsEnabled(LogLevel logLevel) => true; | ||
} | ||
|
||
private readonly LLamaWeights _weights; | ||
private readonly LLamaContext _context; | ||
|
||
public LLamaContextWithCustomLoggerTests() | ||
{ | ||
var @params = new ModelParams(Constants.GenerativeModelPath) | ||
{ | ||
ContextSize = 128, | ||
GpuLayerCount = Constants.CIGpuLayerCount, | ||
}; | ||
|
||
// This unit test used to fail when loading the weights with such a naive logger set. | ||
// | ||
// See https://github.com/SciSharp/LLamaSharp/issues/995 | ||
// | ||
// So the unit test here doesn't check that the logger is actually used | ||
// but at least that setting one doesn't crash the weights load. | ||
NativeLogConfig.llama_log_set(new CustomLogger()); | ||
|
||
_weights = LLamaWeights.LoadFromFile(@params); | ||
_context = _weights.CreateContext(@params); | ||
} | ||
|
||
public void Dispose() | ||
{ | ||
_weights.Dispose(); | ||
_context.Dispose(); | ||
} | ||
|
||
[Fact] | ||
public void CheckProperties() | ||
{ | ||
Assert.Equal(128u, _context.ContextSize); | ||
Assert.Equal(2048, _context.EmbeddingSize); | ||
Assert.Equal(128256, _context.VocabCount); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Note that I haven't tested this, but hopefully it illustrates what I mean)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it, good idea