Skip to content

make decoder and sorted_token_bytes re-use existing memory #352

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −10
Open

make decoder and sorted_token_bytes re-use existing memory #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ const MAX_NUM_THREADS: usize = 128;
struct CoreBPE {
encoder: HashMap<Vec<u8>, Rank>,
special_tokens_encoder: HashMap<String, Rank>,
decoder: HashMap<Rank, Vec<u8>>,
decoder: HashMap<Rank, &'static [u8]>,
special_tokens_decoder: HashMap<Rank, Vec<u8>>,
regex_tls: Vec<Regex>,
special_regex_tls: Vec<Regex>,
sorted_token_bytes: Vec<Vec<u8>>,
sorted_token_bytes: Vec<&'static [u8]>,
}

impl CoreBPE {
Expand All @@ -191,6 +191,7 @@ impl CoreBPE {
None => self
.special_tokens_decoder
.get(&token)
.map(|v| v.as_slice())
.ok_or(DecodeKeyError { token })?,
};
ret.extend(token_bytes);
Expand Down Expand Up @@ -341,12 +342,12 @@ impl CoreBPE {
// Separating this from the loop below helps with performance in a common case.
let mut point = self
.sorted_token_bytes
.partition_point(|x| x.as_slice() < unstable_bytes.as_slice());
.partition_point(|x| *x < unstable_bytes.as_slice());
while point < self.sorted_token_bytes.len()
&& self.sorted_token_bytes[point].starts_with(&unstable_bytes)
{
completions.insert(vec![
self.encoder[self.sorted_token_bytes[point].as_slice()],
self.encoder[self.sorted_token_bytes[point]],
]);
point += 1;
}
Expand All @@ -359,12 +360,12 @@ impl CoreBPE {
let suffix = &unstable_bytes[i..];
let mut point = self
.sorted_token_bytes
.partition_point(|x| x.as_slice() < suffix);
.partition_point(|x| *x < suffix);
// TODO: Perf optimisation if suffix starts with " "?
while point < self.sorted_token_bytes.len()
&& self.sorted_token_bytes[point].starts_with(suffix)
{
let possibility = [prefix, self.sorted_token_bytes[point].as_slice()].concat();
let possibility = [prefix, self.sorted_token_bytes[point]].concat();
let encoded = match std::str::from_utf8(&possibility) {
// Morally, this is byte_pair_encode(&possibility, &self.encoder)
// But we might have introduced a regex split which would prevent merges.
Expand Down Expand Up @@ -447,8 +448,14 @@ impl CoreBPE {
.map_err(|e| PyErr::new::<exceptions::PyValueError, _>(e.to_string()))?
};

let decoder: HashMap<Rank, Vec<u8>> =
encoder.iter().map(|(k, v)| (*v, k.clone())).collect();
let decoder: HashMap<Rank, &'static [u8]> = encoder
.iter()
.map(|(k, v)| {
let bytes: &[u8] = k.as_slice();
let static_bytes: &'static [u8] = unsafe { std::mem::transmute(bytes) };
(*v, static_bytes)
})
.collect();

assert!(
encoder.len() == decoder.len(),
Expand All @@ -460,8 +467,14 @@ impl CoreBPE {
.map(|(k, v)| (*v, k.as_bytes().to_vec()))
.collect();

// Clone because I don't know how to tell Rust I'm not going to change the map
let mut sorted_token_bytes: Vec<Vec<u8>> = encoder.keys().cloned().collect();
let mut sorted_token_bytes: Vec<&'static [u8]> = encoder
.keys()
.map(|k| {
let bytes: &[u8] = k.as_slice();
let static_bytes: &'static [u8] = unsafe { std::mem::transmute(bytes) };
static_bytes
})
.collect();
sorted_token_bytes.sort();

Ok(CoreBPE {
Expand Down