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

Dependency updates #80

Merged
merged 2 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
486 changes: 285 additions & 201 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Global Args #################################################################
ARG BASE_UBI_IMAGE_TAG=9.3-1610
ARG PROTOC_VERSION=25.2
ARG PROTOC_VERSION=25.3
ARG PYTORCH_INDEX="https://download.pytorch.org/whl"
# ARG PYTORCH_INDEX="https://download.pytorch.org/whl/nightly"
ARG AUTO_GPTQ_VERSION=0.7.1
Expand Down Expand Up @@ -86,7 +86,7 @@ ENV LIBRARY_PATH="$CUDA_HOME/lib64/stubs"

## Rust builder ################################################################
# Specific debian version so that compatible glibc version is used
FROM rust:1.77-bullseye as rust-builder
FROM rust:1.77.2-bullseye as rust-builder
ARG PROTOC_VERSION

ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gen-client:
# Compile protos
pip install grpcio-tools==1.60.0 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
pip install grpcio-tools==1.62.1 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
mkdir text_generation_tests/pb || true
python -m grpc_tools.protoc -I../proto --python_out=text_generation_tests/pb \
--grpc_python_out=text_generation_tests/pb --mypy_out=text_generation_tests/pb ../proto/generation.proto
Expand Down
573 changes: 276 additions & 297 deletions integration_tests/poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions launcher/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ authors = ["Olivier Dehaene"]
description = "Text Generation Launcher"

[dependencies]
clap = { version = "4.5.3", features = ["derive", "env"] }
clap = { version = "4.5.4", features = ["derive", "env"] }
ctrlc = { version = "3.4.4", features = ["termination"] }
nix = { version = "0.28.0", features = ["process", "signal"] }
serde_json = "^1.0.114"
serde_json = "^1.0.11"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }
24 changes: 12 additions & 12 deletions router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,33 @@ path = "src/main.rs"
axum = { version = "0.6.20", features = ["json"] }
axum-tracing-opentelemetry = "0.10.0"
text-generation-client = { path = "client" }
clap = { version = "^4.5.2", features = ["derive", "env"] }
clap = { version = "^4.5.4", features = ["derive", "env"] }
futures = "^0.3.30"
flume = "^0.11.0"
metrics = "0.21.1"
metrics-exporter-prometheus = { version = "0.12.2", features = [] }
moka = { version = "0.12.5", features = ["future"] }
moka = { version = "0.12.6", features = ["future"] }
nohash-hasher = "^0.2.0"
num = "^0.4.1"
num = "^0.4.2"
num_cpus = "^1.16.0"
hyper = "^0.14.28" # Override to address CVE-2023-26964
openssl = "^0.10.64" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
openssl-sys = "^0.9.101" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
openssl-sys = "^0.9.102" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
rustls-webpki = "0.102.2" # Override to address WS-2023-0305, CVE-2018-16875
rand = "^0.8.5"
serde = "^1.0.197"
serde_json = "^1.0.114"
serde = "^1.0.198"
serde_json = "^1.0.116"
thiserror = "^1.0.57"
tokenizers = "0.15.2"
tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
tokio-rustls = "^0.25.0"
rustls = "0.22.2"
tokenizers = "0.19.0"
tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
tokio-rustls = "^0.26.0"
rustls = "0.22.3"
tracing = "^0.1.40"
prost = "^0.12.3"
prost = "^0.12.4"
tonic = { version = "^0.11.0", features = ["tls"] }
tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
tracing-opentelemetry = "0.23.0"
tokio-stream ="^0.1.14"
tokio-stream ="^0.1.15"
unicode-segmentation = "^1.11.0"
unicode-truncate = "^0.2.0"
opentelemetry = "0.22.0"
Expand Down
4 changes: 2 additions & 2 deletions router/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ build="build.rs"

[dependencies]
futures = "^0.3.30"
prost = "^0.12.3"
prost = "^0.12.4"
thiserror = "^1.0.58"
tokio = { version = "1.36.0", features = ["sync"] }
tokio = { version = "1.37.0", features = ["sync"] }
tonic = "^0.11.0"
tower = "^0.4.13"
tracing = "^0.1.40"
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.77"
channel = "1.77.2"
components = ["rustfmt", "clippy"]
2 changes: 1 addition & 1 deletion server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ all: install run-dev
.PHONY: gen-server
gen-server:
# Compile protos
pip install grpcio-tools==1.60.0 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
pip install grpcio-tools==1.62.1 mypy-protobuf==3.5.0 'types-protobuf>=3.20.4' --no-cache-dir
mkdir -p text_generation_server/pb
python -m grpc_tools.protoc -I../proto \
--python_out=text_generation_server/pb \
Expand Down
535 changes: 292 additions & 243 deletions server/poetry.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ text-generation-server = 'text_generation_server.cli:app'

[tool.poetry.dependencies]
python = ">=3.11.0,<3.13"
# grpc is not yet compatible with newer protobuf
protobuf = "^4.25.3"
grpcio = "^1.62.1"
grpcio-reflection = "^1.62.1"
loguru = "^0.7.2"
typer = "^0.9.0"
typer = "^0.12.3"
accelerate = { version = "0.27.2", optional = true }
bitsandbytes = { version = "^0.42.0", optional = true }
scipy = "^1.11.4"
safetensors = "^0.4.2"
safetensors = "^0.4.3"
sentencepiece = "^0.2.0"
datasets = { version = "^2.15.0", optional = true }
texttable = { version = "^1.7.0", optional = true }
Expand Down