Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
text-generation-inference
Commits
8024ded5
Unverified
Commit
8024ded5
authored
Sep 24, 2024
by
Orhun Parmaksız
Committed by
GitHub
Sep 24, 2024
Browse files
Simplify crossterm imports (#2545)
parent
03263f5e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
11 deletions
+10
-11
benchmark/Cargo.toml
benchmark/Cargo.toml
+1
-2
benchmark/src/app.rs
benchmark/src/app.rs
+1
-1
benchmark/src/event.rs
benchmark/src/event.rs
+1
-1
benchmark/src/lib.rs
benchmark/src/lib.rs
+7
-7
No files found.
benchmark/Cargo.toml
View file @
8024ded5
...
@@ -16,7 +16,6 @@ path = "src/main.rs"
...
@@ -16,7 +16,6 @@ path = "src/main.rs"
[dependencies]
[dependencies]
average
=
"0.14"
average
=
"0.14"
clap
=
{
version
=
"4.4.5"
,
features
=
[
"derive"
,
"env"
]
}
clap
=
{
version
=
"4.4.5"
,
features
=
[
"derive"
,
"env"
]
}
crossterm
=
"0.28.1"
float-ord
=
"0.3.2"
float-ord
=
"0.3.2"
serde
=
{
version
=
"1.0.188"
,
features
=
["derive"]
}
serde
=
{
version
=
"1.0.188"
,
features
=
["derive"]
}
serde_json
=
"1.0"
serde_json
=
"1.0"
...
@@ -25,7 +24,7 @@ text-generation-client = { path = "../backends/client" }
...
@@ -25,7 +24,7 @@ text-generation-client = { path = "../backends/client" }
thiserror
=
"1.0.48"
thiserror
=
"1.0.48"
tokenizers
=
{
workspace
=
true
}
tokenizers
=
{
workspace
=
true
}
tokio
=
{
version
=
"1.32.0"
,
features
=
[
"rt"
,
"rt-multi-thread"
,
"parking_lot"
,
"signal"
,
"sync"
,
"macros"
]
}
tokio
=
{
version
=
"1.32.0"
,
features
=
[
"rt"
,
"rt-multi-thread"
,
"parking_lot"
,
"signal"
,
"sync"
,
"macros"
]
}
ratatui
=
{
version
=
"0.28.1"
,
default-features
=
false
,
features
=
["crossterm"]
}
ratatui
=
"0.28.1"
tracing
=
"0.1.37"
tracing
=
"0.1.37"
tracing-subscriber
=
{
version
=
"0.3.17"
,
features
=
[
"json"
,
"env-filter"
]
}
tracing-subscriber
=
{
version
=
"0.3.17"
,
features
=
[
"json"
,
"env-filter"
]
}
hf-hub
=
{
workspace
=
true
}
hf-hub
=
{
workspace
=
true
}
benchmark/src/app.rs
View file @
8024ded5
/// Inspired by https://github.com/hatoo/oha/blob/bb989ea3cd77727e7743e7daa60a19894bb5e901/src/monitor.rs
/// Inspired by https://github.com/hatoo/oha/blob/bb989ea3cd77727e7743e7daa60a19894bb5e901/src/monitor.rs
use
crate
::
generation
::{
Decode
,
Message
,
Prefill
};
use
crate
::
generation
::{
Decode
,
Message
,
Prefill
};
use
crossterm
::
event
::{
KeyCode
,
KeyEvent
,
KeyModifiers
};
use
ratatui
::
crossterm
::
event
::{
KeyCode
,
KeyEvent
,
KeyModifiers
};
use
ratatui
::
layout
::{
Alignment
,
Constraint
,
Direction
,
Layout
};
use
ratatui
::
layout
::{
Alignment
,
Constraint
,
Direction
,
Layout
};
use
ratatui
::
style
::{
Color
,
Modifier
,
Style
};
use
ratatui
::
style
::{
Color
,
Modifier
,
Style
};
use
ratatui
::
text
::{
Line
,
Span
};
use
ratatui
::
text
::{
Line
,
Span
};
...
...
benchmark/src/event.rs
View file @
8024ded5
/// Inspired by https://github.com/orhun/rust-tui-template/blob/472aa515119d4c94903eac12d9784417281dc7f5/src/event.rs
/// Inspired by https://github.com/orhun/rust-tui-template/blob/472aa515119d4c94903eac12d9784417281dc7f5/src/event.rs
use
crossterm
::
event
;
use
ratatui
::
crossterm
::
event
;
use
std
::
time
::{
Duration
,
Instant
};
use
std
::
time
::{
Duration
,
Instant
};
use
tokio
::
sync
::{
broadcast
,
mpsc
};
use
tokio
::
sync
::{
broadcast
,
mpsc
};
...
...
benchmark/src/lib.rs
View file @
8024ded5
...
@@ -6,7 +6,7 @@ mod utils;
...
@@ -6,7 +6,7 @@ mod utils;
use
crate
::
app
::
App
;
use
crate
::
app
::
App
;
use
crate
::
event
::
Event
;
use
crate
::
event
::
Event
;
use
crossterm
::
ExecutableCommand
;
use
ratatui
::
crossterm
::
ExecutableCommand
;
use
ratatui
::
backend
::
CrosstermBackend
;
use
ratatui
::
backend
::
CrosstermBackend
;
use
ratatui
::
Terminal
;
use
ratatui
::
Terminal
;
use
std
::
io
;
use
std
::
io
;
...
@@ -50,9 +50,9 @@ pub async fn run(
...
@@ -50,9 +50,9 @@ pub async fn run(
};
};
// Initialize terminal properties
// Initialize terminal properties
crossterm
::
terminal
::
enable_raw_mode
()
?
;
ratatui
::
crossterm
::
terminal
::
enable_raw_mode
()
?
;
io
::
stdout
()
.execute
(
crossterm
::
terminal
::
EnterAlternateScreen
)
?
;
io
::
stdout
()
.execute
(
ratatui
::
crossterm
::
terminal
::
EnterAlternateScreen
)
?
;
io
::
stdout
()
.execute
(
crossterm
::
cursor
::
Hide
)
?
;
io
::
stdout
()
.execute
(
ratatui
::
crossterm
::
cursor
::
Hide
)
?
;
// Initialize terminal
// Initialize terminal
let
mut
terminal
=
{
let
mut
terminal
=
{
...
@@ -128,9 +128,9 @@ pub async fn run(
...
@@ -128,9 +128,9 @@ pub async fn run(
let
_
=
shutdown_guard_receiver
.recv
()
.await
;
let
_
=
shutdown_guard_receiver
.recv
()
.await
;
// Revert terminal to original view
// Revert terminal to original view
io
::
stdout
()
.execute
(
crossterm
::
terminal
::
LeaveAlternateScreen
)
?
;
io
::
stdout
()
.execute
(
ratatui
::
crossterm
::
terminal
::
LeaveAlternateScreen
)
?
;
crossterm
::
terminal
::
disable_raw_mode
()
?
;
ratatui
::
crossterm
::
terminal
::
disable_raw_mode
()
?
;
io
::
stdout
()
.execute
(
crossterm
::
cursor
::
Show
)
?
;
io
::
stdout
()
.execute
(
ratatui
::
crossterm
::
cursor
::
Show
)
?
;
let
parameters_table
=
table
::
parameters_table
(
let
parameters_table
=
table
::
parameters_table
(
tokenizer_name
,
tokenizer_name
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment