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

Add an example #357

Merged
merged 2 commits into from
May 29, 2024
Merged

Add an example #357

merged 2 commits into from
May 29, 2024

Conversation

EricLBuehler
Copy link
Owner

Also some fixes

Copy link

Code Metrics Report
  ===============================================================================
 Language            Files        Lines         Code     Comments       Blanks
===============================================================================
 Dockerfile              1           34           25            0            9
 Happy                   1          442          369            0           73
 JSON                    5            9            9            0            0
 Python                 21          741          622           21           98
 TOML                   15          389          352            1           36
-------------------------------------------------------------------------------
 Jupyter Notebooks       1            0            0            0            0
 |- Markdown             1           60           30           22            8
 |- Python               1           96           87            1            8
 (Total)                            156          117           23           16
-------------------------------------------------------------------------------
 Markdown               15         1050            0          777          273
 |- BASH                 6          203          190            0           13
 |- Python               6          121          110            0           11
 |- Rust                 3          185          172            9            4
 (Total)                           1559          472          786          301
-------------------------------------------------------------------------------
 Rust                   85        28309        25914          370         2025
 |- Markdown            42          439            0          427           12
 (Total)                          28748        25914          797         2037
===============================================================================
 Total                 145        30974        27291         1169         2514
===============================================================================
  

@EricLBuehler EricLBuehler merged commit 9273f2a into master May 29, 2024
11 checks passed
@EricLBuehler EricLBuehler deleted the examples branch May 29, 2024 01:20
Comment on lines +363 to +377
let ConversionResult {
tokenizer,
bos,
eos,
unk,
} = if paths.get_tokenizer_filename().to_string_lossy().is_empty() {
convert_ggml_to_hf_tokenizer(&model)?
} else {
ConversionResult {
tokenizer: get_tokenizer(paths.get_tokenizer_filename())?,
bos: None,
eos: None,
unk: None,
}
};
Copy link
Contributor

Choose a reason for hiding this comment

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

I really don't want to deal with resolving conflicts again, this will be annoying for me to rebase against like the debug addition was.

Copy link
Contributor

Choose a reason for hiding this comment

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

and... you just merged it 😑

Copy link
Owner Author

Choose a reason for hiding this comment

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

Ah, sorry! I didn't see the comment in time. Is there anything I can do to help it?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not really, but due to the number of commits and my change being early at the point straight after this addition, I get conflicts rippled through the history.

I'll probably be lazy and just use a merge commit to resolve instead of a proper rebase. I raised the PR before going to bed since there is a lot of activity recently on the files I was refactoring and it's starting to get tedious, so best to get what I've done so far in when you have time to review 👍

Copy link
Owner Author

Choose a reason for hiding this comment

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

Ok, sounds good, a merge commit is fine. I'll make a review now and then maybe you can do the rebase/merge?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants