Skip to content

Commit 11b8402

Browse files
committed
Update various rust and python dependencies, including pytorch 2.1.1
Addresses some new CVEs
1 parent 9df74cd commit 11b8402

File tree

9 files changed

+608
-618
lines changed

9 files changed

+608
-618
lines changed

Cargo.lock

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

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
## Global Args #################################################################
22
ARG BASE_UBI_IMAGE_TAG=9.3-1361.1699548029
3-
ARG PROTOC_VERSION=25.0
3+
ARG PROTOC_VERSION=25.1
44
ARG PYTORCH_INDEX="https://download.pytorch.org/whl"
55
#ARG PYTORCH_INDEX="https://download.pytorch.org/whl/nightly"
6-
ARG PYTORCH_VERSION=2.1.0
6+
ARG PYTORCH_VERSION=2.1.1
77

88
## Base Layer ##################################################################
99
FROM registry.access.redhat.com/ubi9/ubi:${BASE_UBI_IMAGE_TAG} as base
@@ -178,7 +178,7 @@ ARG PYTORCH_VERSION
178178
RUN dnf install -y unzip git ninja-build && dnf clean all
179179

180180
RUN cd ~ && \
181-
curl -L -O https://repo.anaconda.com/miniconda/Miniconda3-py311_23.9.0-0-Linux-x86_64.sh && \
181+
curl -L -O https://repo.anaconda.com/miniconda/Miniconda3-py311_23.10.0-1-Linux-x86_64.sh && \
182182
chmod +x Miniconda3-*-Linux-x86_64.sh && \
183183
bash ./Miniconda3-*-Linux-x86_64.sh -bf -p /opt/miniconda
184184

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.59.2 mypy-protobuf==3.4.0 'types-protobuf>=3.20.4' --no-cache-dir
3+
pip install grpcio-tools==1.59.3 mypy-protobuf==3.5.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/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.11"
99

1010
[tool.poetry.group.dev.dependencies]
11-
protobuf = "^4.25.0"
12-
grpcio-tools = "^1.59.2"
11+
protobuf = "^4.25.1"
12+
grpcio-tools = "^1.59.3"
1313
pytest = "^7.4.3"
1414
pytest-asyncio = "^0.21.1"
1515
requests = "^2.31.0"

launcher/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = ["Olivier Dehaene"]
66
description = "Text Generation Launcher"
77

88
[dependencies]
9-
clap = { version = "4.4.7", features = ["derive", "env"] }
9+
clap = { version = "4.4.10", features = ["derive", "env"] }
1010
ctrlc = { version = "3.4.1", features = ["termination"] }
1111
subprocess = "0.2.9"
1212
tracing = "0.1.40"

router/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ path = "src/main.rs"
1616
[dependencies]
1717
axum = { version = "0.6.20", features = ["json"] }
1818
text-generation-client = { path = "client" }
19-
clap = { version = "^4.4.7", features = ["derive", "env"] }
19+
clap = { version = "^4.4.10", features = ["derive", "env"] }
2020
futures = "^0.3.29"
2121
flume = "^0.11.0"
2222
metrics = "0.21.1"
@@ -30,18 +30,18 @@ openssl = "^0.10.59" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0
3030
openssl-sys = "^0.9.95" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195
3131
rustls-webpki = "^0.101.7" # Override to address WS-2023-0305, CVE-2018-16875
3232
rand = "^0.8.5"
33-
serde = "^1.0.173"
34-
serde_json = "^1.0.103"
33+
serde = "^1.0.193"
34+
serde_json = "^1.0.108"
3535
# Pin sct to avoid WS-2023-0094 in older 0.5.2 version of spin sub-dependency
3636
sct = "=0.7.1"
3737
thiserror = "^1.0.50"
38-
tokenizers = "0.14.1"
38+
tokenizers = "0.15.0"
3939
tokio = { version = "1.34.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
4040
tokio-rustls = "^0.24.1"
4141
rustls = "0.21.8"
4242
tracing = "^0.1.40"
4343
tracing-subscriber = { version = "0.3.17", features = ["json"] }
44-
prost = "^0.12.1"
44+
prost = "^0.12.3"
4545
tonic = { version = "^0.10.2", features = ["tls"] }
4646
tokio-stream ="^0.1.14"
4747
unicode-segmentation = "^1.10.1"

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.59.2 mypy-protobuf==3.4.0 'types-protobuf>=3.20.4' --no-cache-dir
6+
pip install grpcio-tools==1.59.3 mypy-protobuf==3.5.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

0 commit comments

Comments
 (0)