Skip to content
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

Removes spurious \r in output that causes logging in journalctl to tr… #10771

Merged
merged 1 commit into from
Dec 13, 2024

Conversation

cduk
Copy link
Contributor

@cduk cduk commented Dec 10, 2024

…eat lines as binary and therefore hidden by default

Make sure to read the contributing guidelines before submitting a PR

…eat lines as binary and therefore hidden by default

Signed-off-by: Charles Darke <[email protected]>
@ngxson
Copy link
Collaborator

ngxson commented Dec 10, 2024

@ggerganov Do you know why we have \r here? It's a bit surprise to me because we use \n everywhere else. Is it something to do with windows?

@m18coppola
Copy link
Contributor

I'd rather llama.cpp break windows rather than breaking systemd logs on Linux. Here's how it looks in journalctl before this PR:
Screenshot_20241210_211034

@ngxson
Copy link
Collaborator

ngxson commented Dec 11, 2024

Yeah in fact I'm ok with removing \r, just curious to know why it's there in the first place

Copy link
Owner

@ggerganov ggerganov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably a remnant from the json log era, not sure.

@ngxson ngxson merged commit 56eea07 into ggerganov:master Dec 13, 2024
47 checks passed
netrunnereve pushed a commit to netrunnereve/llama.cpp that referenced this pull request Dec 16, 2024
…eat lines as binary and therefore hidden by default (ggerganov#10771)

Signed-off-by: Charles Darke <[email protected]>
Co-authored-by: Charles Darke <[email protected]>
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Dec 20, 2024
…eat lines as binary and therefore hidden by default (ggerganov#10771)

Signed-off-by: Charles Darke <[email protected]>
Co-authored-by: Charles Darke <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants