Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-25 22:08:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix UTF-8 handling (including colors) (#79)

Browse Source
This commit is contained in:
Val Kharitonov 2023-03-13 12:24:18 -04:00 committed by GitHub
parent d1f224712d
commit 2a20f48efa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
convert-pth-to-ggml.py
View File

@ -22,7 +22,6 @@ import json
import struct import struct
import numpy as np import numpy as np
import torch import torch
from sentencepiece import SentencePieceProcessor from sentencepiece import SentencePieceProcessor
if len(sys.argv) < 3: if len(sys.argv) < 3:
@ -101,10 +100,26 @@ for p in range(n_parts):
# Is this correct?? # Is this correct??
for i in range(32000): for i in range(32000):
# TODO: this is probably wrong - not sure how this tokenizer works if tokenizer.is_unknown(i):
text = tokenizer.decode([29889, i]).encode('utf-8') # "<unk>" token (translated as ??)
# remove the first byte (it's always '.') text = " \u2047 ".encode("utf-8")
text = text[1:] fout.write(struct.pack("i", len(text)))
fout.write(text)
elif tokenizer.is_control(i):
# "<s>"/"</s>" tokens
fout.write(struct.pack("i", 0))
elif tokenizer.is_byte(i):
# "<U+XX>" tokens (which may be invalid UTF-8)
piece = tokenizer.id_to_piece(i)
if len(piece) != 6:
print("Invalid token: " + piece)
sys.exit(1)
byte_value = int(piece[3:-1], 16)
fout.write(struct.pack("i", 1))
fout.write(struct.pack("B", byte_value))
else:
# normal token. Uses U+2581 (LOWER ONE EIGHTH BLOCK) to represent spaces.
text = tokenizer.id_to_piece(i).replace("\u2581", " ").encode("utf-8")
fout.write(struct.pack("i", len(text))) fout.write(struct.pack("i", len(text)))
fout.write(text) fout.write(text)

9
main.cpp
View File

@ -939,6 +939,11 @@ int main(int argc, char ** argv) {
break; break;
} }
} }
// reset color to default if we there is no pending user input
if (!input_noecho && params.use_color && embd_inp.size() == input_consumed) {
printf(ANSI_COLOR_RESET);
}
} }
// display text // display text
@ -946,10 +951,6 @@ int main(int argc, char ** argv) {
for (auto id : embd) { for (auto id : embd) {
printf("%s", vocab.id_to_token[id].c_str()); printf("%s", vocab.id_to_token[id].c_str());
} }
// reset color to default if we there is no pending user input
if (params.use_color && embd_inp.size() <= input_consumed) {
printf(ANSI_COLOR_RESET);
}
fflush(stdout); fflush(stdout);
} }