huggingface/candle
1
0
Fork 0
mirror of https://github.com/huggingface/candle.git synced 2025-06-16 10:38:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from LaurentMazare/add_number_of_tokens

Browse Source 
Add number of tokens.
This commit is contained in:
Nicolas Patry
2023-07-26 14:45:53 +01:00
committed by GitHub
parent 8b1d12bead 81bfa46702
commit 46f2d9f0ac
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
candle-wasm-examples/llama2-c/src/app.rs
View File

@ -43,8 +43,10 @@ pub struct CurrentDecode {
pub struct App {
status: String,
loaded: bool,
temperature: std::rc::Rc<std::cell::RefCell<f64>>,
generated: String,
n_tokens: usize,
current_decode: Option<CurrentDecode>,
worker: Box<dyn Bridge<Worker>>,
}
@ -75,10 +77,12 @@ impl Component for App {
let worker = Worker::bridge(std::rc::Rc::new(cb));
Self {
status,
n_tokens: 0,
temperature: std::rc::Rc::new(std::cell::RefCell::new(0.)),
generated: String::new(),
current_decode: None,
worker,
loaded: false,
}
}
@ -100,6 +104,7 @@ impl Component for App {
match msg {
Msg::SetModel(md) => {
self.status = "weights loaded succesfully!".to_string();
self.loaded = true;
console_log!("loaded weights");
self.worker.send(WorkerInput::ModelData(md));
true
@ -111,6 +116,7 @@ impl Component for App {
let start_time = performance_now();
self.current_decode = Some(CurrentDecode { start_time });
self.status = "generating...".to_string();
self.n_tokens = 0;
self.generated.clear();
let temp = *self.temperature.borrow();
console_log!("temp: {}", temp);
@ -134,11 +140,18 @@ impl Component for App {
});
self.status = match dt {
None => "generation succeeded!".to_string(),
Some(dt) => format!("generation succeeded in {:.2}s", dt),
Some(dt) => format!(
"generation succeeded in {:.2}s ({:.1} ms/token)",
dt,
dt * 1000.0 / (self.n_tokens as f64)
),
};
self.current_decode = None
}
Ok(WorkerOutput::Generated(token)) => self.generated.push_str(&token),
Ok(WorkerOutput::Generated(token)) => {
self.n_tokens += 1;
self.generated.push_str(&token)
}
Err(err) => {
self.status = format!("error in worker {err:?}");
}
@ -176,7 +189,15 @@ impl Component for App {
</p>
</div>
{"temperature: "}<input type="range" min="0." max="1.2" step="0.1" value={self.temperature.borrow().to_string()} {oninput} id="temp"/>
<button class="button" onclick={ctx.link().callback(move |_| Msg::Run)}> { "run" }</button>
<br/ >
{
if self.loaded{
html!(<button class="button" onclick={ctx.link().callback(move |_| Msg::Run)}> { "run" }</button>)
}else{
html! { <progress id="progress-bar" aria-label="Loading weights..."></progress> }
}
}
<br/ >
<h3>
{&self.status}

12
candle-wasm-examples/whisper/src/app.rs
View File

@ -47,6 +47,7 @@ pub struct CurrentDecode {
pub struct App {
status: String,
loaded: bool,
segments: Vec<Segment>,
current_decode: Option<CurrentDecode>,
worker: Box<dyn Bridge<Worker>>,
@ -86,6 +87,7 @@ impl Component for App {
segments: vec![],
current_decode: None,
worker,
loaded: false,
}
}
@ -107,6 +109,7 @@ impl Component for App {
match msg {
Msg::SetDecoder(md) => {
self.status = "weights loaded succesfully!".to_string();
self.loaded = true;
console_log!("loaded weights");
self.worker.send(WorkerInput::ModelData(md));
true
@ -186,7 +189,10 @@ impl Component for App {
<tr>
<th>{name}</th>
<th><audio controls=true src={format!("./{name}")}></audio></th>
<th><button class="button" onclick={ctx.link().callback(move |_| Msg::Run(i))}> { "run" }</button></th>
{ if self.loaded {
html!(<th><button class="button" onclick={ctx.link().callback(move |_| Msg::Run(i))}> { "run" }</button></th>)
}else{html!()}
}
</tr>
}
}).collect::<Html>()
@ -197,7 +203,9 @@ impl Component for App {
{&self.status}
</h2>
{
if self.current_decode.is_some() {
if !self.loaded{
html! { <progress id="progress-bar" aria-label="loading weights…"></progress> }
} else if self.current_decode.is_some() {
html! { <progress id="progress-bar" aria-label="decoding…"></progress> }
} else { html!{
<blockquote>