Skip to content

Commit b8efdaa

Browse files
njhillnjhill
committed
Update various rust and python dependencies
tokenizers, tokio, rustls, prost transformers, grpc-io, protobuf Also update base UBI9 image to 9.2-755 Signed-off-by: Nick Hill <[email protected]>
1 parent 7d6ebcf commit b8efdaa

File tree

10 files changed

+299
-947
lines changed

10 files changed

+299
-947
lines changed

‎Cargo.lock

Lines changed: 44 additions & 694 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Global Args #################################################################
2-
ARG BASE_UBI_IMAGE_TAG=9.2-722.1692769367
3-
ARG PROTOC_VERSION=24.1
2+
ARG BASE_UBI_IMAGE_TAG=9.2-755
3+
ARG PROTOC_VERSION=24.3
44
#ARG PYTORCH_INDEX="https://download.pytorch.org/whl"
55
ARG PYTORCH_INDEX="https://download.pytorch.org/whl/nightly"
66
ARG PYTORCH_VERSION=2.1.0.dev20230904

‎integration_tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
gen-client:
22
# Compile protos
3-
pip install grpcio-tools==1.57.0 mypy-protobuf==3.4.0 'types-protobuf>=3.20.4' --no-cache-dir
3+
pip install grpcio-tools==1.58.0 mypy-protobuf==3.4.0 'types-protobuf>=3.20.4' --no-cache-dir
44
mkdir text_generation_tests/pb || true
55
python -m grpc_tools.protoc -I../proto --python_out=text_generation_tests/pb \
66
--grpc_python_out=text_generation_tests/pb --mypy_out=text_generation_tests/pb ../proto/generation.proto

‎integration_tests/poetry.lock

Lines changed: 109 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎integration_tests/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ authors = ["Nick Hill"]
88
python = "^3.9"
99

1010
[tool.poetry.group.dev.dependencies]
11-
protobuf = "^4.24.1"
12-
grpcio-tools = "^1.57.0"
11+
protobuf = "^4.24.3"
12+
grpcio-tools = "^1.58.0"
1313
pytest = "^7.4.0"
1414
pytest-asyncio = "^0.21.1"
1515
requests = "^2.31.0"

‎router/Cargo.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,18 @@ serde_json = "^1.0.103"
3535
# spin comes in via tonic->tokio-rustls->rustls->ring but this pins a specific old version 0.5.2 :(
3636
#spin = "=0.9.8"
3737
thiserror = "^1.0.43"
38-
tokenizers = "0.13.4"
38+
tokenizers = "0.14.0"
3939
tokio = { version = "^1.32.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
40+
tokio-rustls = "^0.24.1"
41+
rustls = "0.21.5"
4042
tracing = "^0.1.37"
4143
tracing-subscriber = { version = "0.3.16", features = ["json"] }
42-
prost = "^0.11.9"
43-
tonic = { version = "^0.9.2", features = ["tls"] }
44+
prost = "^0.12.0"
45+
tonic = { version = "^0.10.0", features = ["tls"] }
4446
tokio-stream ="^0.1.14"
4547
unicode-segmentation = "^1.10.1"
4648
unicode-truncate = "^0.2.0"
4749

4850
[build-dependencies]
49-
tonic-build = "0.9.2"
51+
tonic-build = "^0.10.0"
5052
tempfile = "^3.7.0" # Override 0.3.3 version from tonic-build/prost-build, due to RUSTSEC-2023-0018

‎router/client/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ build="build.rs"
66

77
[dependencies]
88
futures = "^0.3.28"
9-
prost = "^0.11.9"
9+
prost = "^0.12.0"
1010
thiserror = "^1.0.43"
1111
tokio = { version = "^1.32.0", features = ["sync"] }
12-
tonic = "^0.9.2"
12+
tonic = "^0.10.0"
1313
tower = "^0.4.13"
1414
tracing = "^0.1.37"
1515
tracing-error = "^0.2"
1616

1717
[build-dependencies]
18-
tonic-build = "0.9.2"
18+
tonic-build = "^0.10.0"

‎server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include Makefile-flash-att-v2
33

44
gen-server:
55
# Compile protos
6-
pip install grpcio-tools==1.57.0 mypy-protobuf==3.4.0 'types-protobuf>=3.20.4' --no-cache-dir
6+
pip install grpcio-tools==1.58.0 mypy-protobuf==3.4.0 'types-protobuf>=3.20.4' --no-cache-dir
77
mkdir text_generation_server/pb || true
88
python -m grpc_tools.protoc -I../proto --python_out=text_generation_server/pb \
99
--grpc_python_out=text_generation_server/pb --mypy_out=text_generation_server/pb ../proto/generate.proto

‎server/poetry.lock

Lines changed: 126 additions & 126 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ text-generation-server = 'text_generation_server.cli:app'
99

1010
[tool.poetry.dependencies]
1111
python = "^3.9"
12-
protobuf = "^4.24.1"
13-
grpcio = "^1.57.0"
14-
grpcio-reflection = "^1.57.0"
12+
protobuf = "^4.24.3"
13+
grpcio = "^1.58.0"
14+
grpcio-reflection = "^1.58.0"
1515
loguru = "^0.7.0"
1616
typer = "^0.9.0"
1717
accelerate = { version = "0.20.3", optional = true }
1818
bitsandbytes = { version = "^0.41.0", optional = true }
1919
safetensors = "^0.3.3"
2020
sentencepiece = "^0.1.99"
21-
transformers = "4.32.1"
21+
transformers = "4.33.1"
2222
optimum = { version = "1.11.0", extras = ["onnxruntime-gpu"], optional = true }
2323
onnxruntime = { version = "1.15.1", optional = true }
2424
onnxruntime-gpu = { version = "1.15.1", optional = true }
@@ -38,7 +38,7 @@ onnx = ["optimum", "onnxruntime", "onnx"]
3838
onnx-gpu = ["optimum", "onnxruntime-gpu", "onnx"]
3939

4040
[tool.poetry.group.dev.dependencies]
41-
grpcio-tools = "^1.57.0"
41+
grpcio-tools = "^1.58.0"
4242
pytest = "^7.4.0"
4343

4444
[build-system]

0 commit comments

Comments
 (0)