Mirrors
/
hf_text-generation-inference
mirror of https://github.com/huggingface/text-generation-inference.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean both threads.

This commit is contained in:
Nicolas Patry 2024-10-21 14:49:07 +02:00
parent 009c4e0b94
commit fe8d55dba9
No known key found for this signature in database
GPG Key ID: D2920555C90F704C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/src/main.rs
View File

@ -1263,7 +1263,7 @@ fn download_convert_model(
let download_stdout = BufReader::new(download_process.stdout.take().unwrap()); let download_stdout = BufReader::new(download_process.stdout.take().unwrap());
let t = thread::spawn(move || { let stdout_thread = thread::spawn(move || {
log_lines(download_stdout); log_lines(download_stdout);
}); });
@ -1271,7 +1271,7 @@ fn download_convert_model(
// We read stderr in another thread as it seems that lines() can block in some cases // We read stderr in another thread as it seems that lines() can block in some cases
let (err_sender, err_receiver) = mpsc::channel(); let (err_sender, err_receiver) = mpsc::channel();
thread::spawn(move || { let stderr_thread = thread::spawn(move || {
for line in download_stderr.lines().map_while(Result::ok) { for line in download_stderr.lines().map_while(Result::ok) {
err_sender.send(line).unwrap_or(()); err_sender.send(line).unwrap_or(());
} }
@ -1305,7 +1305,8 @@ fn download_convert_model(
} }
sleep(Duration::from_millis(100)); sleep(Duration::from_millis(100));
} }
t.join().expect("Closing log reading thread"); stdout_thread.join().expect("Closing log reading thread");
stderr_thread.join().expect("Closing log reading thread");
Ok(()) Ok(())
} }