Skip to content

Fix CoreBPE::new type inference failure #558

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
fallintoplace wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix CoreBPE::new type inference failure #558

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
18 changes: 14 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,15 +598,14 @@ impl CoreBPE {
(tokens, completions)
}

pub fn new<E, SE, NSE>(
pub fn new<E, SE>(
encoder: E,
special_tokens_encoder: SE,
pattern: &str,
) -> Result<Self, Box<dyn std::error::Error + Send + Sync>>
where
E: IntoIterator<Item = (Vec<u8>, Rank)>,
SE: IntoIterator<Item = (String, Rank)>,
NSE: IntoIterator<Item = (String, (Rank, Rank))>,
{
Self::new_internal(
HashMap::from_iter(encoder),
Expand Down Expand Up @@ -677,10 +676,9 @@ impl CoreBPE {

#[cfg(test)]
mod tests {
use fancy_regex::Regex;
use rustc_hash::FxHashMap as HashMap;

use crate::{Rank, byte_pair_split};
use crate::{CoreBPE, Rank, byte_pair_split};

fn setup_ranks() -> HashMap<Vec<u8>, Rank> {
HashMap::from_iter([(b"ab".to_vec(), 0), (b"cd".to_vec(), 1)])
Expand All @@ -699,4 +697,16 @@ mod tests {
let res = byte_pair_split(b"abab", &ranks);
assert_eq!(res, vec![b"ab", b"ab"]);
}

#[test]
fn test_public_constructor_is_callable() {
let bpe = CoreBPE::new(
vec![(b"ab".to_vec(), 0)],
Vec::<(String, Rank)>::new(),
r".+",
)
.unwrap();

assert_eq!(bpe.encode_ordinary("ab"), vec![0]);
}
}