Skip to content

Commit e506c93

Browse files
committed
Update rustc to latest stable 1.92
1 parent 07fe2e7 commit e506c93

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lukemathwalker/cargo-chef:latest-rust-1.85-bookworm AS chef
1+
FROM lukemathwalker/cargo-chef:latest-rust-1.92-bookworm AS chef
22
WORKDIR /usr/src
33

44
ENV SCCACHE=0.10.0

Dockerfile-cuda

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder
33
ENV SCCACHE=0.10.0
44
ENV RUSTC_WRAPPER=/usr/local/bin/sccache
55
ENV PATH="/root/.cargo/bin:${PATH}"
6-
# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.85-bookworm`
7-
ENV CARGO_CHEF=0.1.71
6+
# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.92-bookworm`
7+
ENV CARGO_CHEF=0.1.73
88

99
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
1010
curl \
@@ -51,15 +51,15 @@ RUN --mount=type=secret,id=actions_results_url,env=ACTIONS_RESULTS_URL \
5151
--mount=type=secret,id=actions_runtime_token,env=ACTIONS_RUNTIME_TOKEN \
5252
if [ ${CUDA_COMPUTE_CAP} -ge 75 -a ${CUDA_COMPUTE_CAP} -lt 80 ]; \
5353
then \
54-
nvprune --generate-code code=sm_${CUDA_COMPUTE_CAP} /usr/local/cuda/lib64/libcublas_static.a -o /usr/local/cuda/lib64/libcublas_static.a; \
54+
nvprune --generate-code code=sm_${CUDA_COMPUTE_CAP} /usr/local/cuda/lib64/libcublas_static.a -o /usr/local/cuda/lib64/libcublas_static.a; \
5555
elif [ ${CUDA_COMPUTE_CAP} -ge 80 -a ${CUDA_COMPUTE_CAP} -lt 90 ]; \
5656
then \
57-
nvprune --generate-code code=sm_80 --generate-code code=sm_${CUDA_COMPUTE_CAP} /usr/local/cuda/lib64/libcublas_static.a -o /usr/local/cuda/lib64/libcublas_static.a; \
57+
nvprune --generate-code code=sm_80 --generate-code code=sm_${CUDA_COMPUTE_CAP} /usr/local/cuda/lib64/libcublas_static.a -o /usr/local/cuda/lib64/libcublas_static.a; \
5858
elif [ ${CUDA_COMPUTE_CAP} -eq 90 ]; \
5959
then \
60-
nvprune --generate-code code=sm_90 /usr/local/cuda/lib64/libcublas_static.a -o /usr/local/cuda/lib64/libcublas_static.a; \
60+
nvprune --generate-code code=sm_90 /usr/local/cuda/lib64/libcublas_static.a -o /usr/local/cuda/lib64/libcublas_static.a; \
6161
else \
62-
echo "cuda compute cap ${CUDA_COMPUTE_CAP} is not supported"; exit 1; \
62+
echo "cuda compute cap ${CUDA_COMPUTE_CAP} is not supported"; exit 1; \
6363
fi;
6464

6565
COPY --from=planner /usr/src/recipe.json recipe.json
@@ -68,9 +68,9 @@ RUN --mount=type=secret,id=actions_results_url,env=ACTIONS_RESULTS_URL \
6868
--mount=type=secret,id=actions_runtime_token,env=ACTIONS_RUNTIME_TOKEN \
6969
if [ ${CUDA_COMPUTE_CAP} -ge 75 -a ${CUDA_COMPUTE_CAP} -lt 80 ]; \
7070
then \
71-
cargo chef cook --release --features candle-cuda-turing --features static-linking --no-default-features --recipe-path recipe.json && sccache -s; \
71+
cargo chef cook --release --features candle-cuda-turing --features static-linking --no-default-features --recipe-path recipe.json && sccache -s; \
7272
else \
73-
cargo chef cook --release --features candle-cuda --features static-linking --no-default-features --recipe-path recipe.json && sccache -s; \
73+
cargo chef cook --release --features candle-cuda --features static-linking --no-default-features --recipe-path recipe.json && sccache -s; \
7474
fi;
7575

7676
COPY backends backends
@@ -85,9 +85,9 @@ RUN --mount=type=secret,id=actions_results_url,env=ACTIONS_RESULTS_URL \
8585
--mount=type=secret,id=actions_runtime_token,env=ACTIONS_RUNTIME_TOKEN \
8686
if [ ${CUDA_COMPUTE_CAP} -ge 75 -a ${CUDA_COMPUTE_CAP} -lt 80 ]; \
8787
then \
88-
cargo build --release --bin text-embeddings-router -F candle-cuda-turing -F static-linking -F http --no-default-features && sccache -s; \
88+
cargo build --release --bin text-embeddings-router -F candle-cuda-turing -F static-linking -F http --no-default-features && sccache -s; \
8989
else \
90-
cargo build --release --bin text-embeddings-router -F candle-cuda -F static-linking -F http --no-default-features && sccache -s; \
90+
cargo build --release --bin text-embeddings-router -F candle-cuda -F static-linking -F http --no-default-features && sccache -s; \
9191
fi;
9292

9393
FROM builder AS grpc-builder
@@ -108,9 +108,9 @@ RUN --mount=type=secret,id=actions_results_url,env=ACTIONS_RESULTS_URL \
108108
--mount=type=secret,id=actions_runtime_token,env=ACTIONS_RUNTIME_TOKEN \
109109
if [ ${CUDA_COMPUTE_CAP} -ge 75 -a ${CUDA_COMPUTE_CAP} -lt 80 ]; \
110110
then \
111-
cargo build --release --bin text-embeddings-router -F candle-cuda-turing -F static-linking -F grpc --no-default-features && sccache -s; \
111+
cargo build --release --bin text-embeddings-router -F candle-cuda-turing -F static-linking -F grpc --no-default-features && sccache -s; \
112112
else \
113-
cargo build --release --bin text-embeddings-router -F candle-cuda -F static-linking -F grpc --no-default-features && sccache -s; \
113+
cargo build --release --bin text-embeddings-router -F candle-cuda -F static-linking -F grpc --no-default-features && sccache -s; \
114114
fi;
115115

116116
FROM nvidia/cuda:12.2.0-base-ubuntu22.04 AS base

Dockerfile-cuda-all

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 AS base-builder
33
ENV SCCACHE=0.10.0
44
ENV RUSTC_WRAPPER=/usr/local/bin/sccache
55
ENV PATH="/root/.cargo/bin:${PATH}"
6-
# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.85-bookworm`
7-
ENV CARGO_CHEF=0.1.71
6+
# aligned with `cargo-chef` version in `lukemathwalker/cargo-chef:latest-rust-1.92-bookworm`
7+
ENV CARGO_CHEF=0.1.73
88

99
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
1010
curl \

Dockerfile-intel

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG PLATFORM=cpu
2-
FROM lukemathwalker/cargo-chef:latest-rust-1.85-bookworm AS chef
2+
FROM lukemathwalker/cargo-chef:latest-rust-1.92-bookworm AS chef
33
WORKDIR /usr/src
44

55
ENV SCCACHE=0.10.0
@@ -64,12 +64,12 @@ ENV HUGGINGFACE_HUB_CACHE=/data \
6464
PORT=80
6565

6666
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
67-
build-essential \
68-
git \
69-
cmake \
70-
ninja-build \
71-
python3-dev &&\
72-
rm -rf /var/lib/apt/lists/*
67+
build-essential \
68+
git \
69+
cmake \
70+
ninja-build \
71+
python3-dev &&\
72+
rm -rf /var/lib/apt/lists/*
7373

7474
WORKDIR /usr/src
7575
COPY backends backends
@@ -88,12 +88,12 @@ ENV HUGGINGFACE_HUB_CACHE=/data \
8888
ENV PT_HPU_LAZY_MODE=1
8989

9090
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
91-
build-essential \
92-
git \
93-
cmake \
94-
ninja-build \
95-
python3-dev &&\
96-
rm -rf /var/lib/apt/lists/*
91+
build-essential \
92+
git \
93+
cmake \
94+
ninja-build \
95+
python3-dev &&\
96+
rm -rf /var/lib/apt/lists/*
9797

9898
WORKDIR /usr/src
9999
COPY backends backends
@@ -114,7 +114,7 @@ RUN wget http://nz2.archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.
114114
RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | gpg --dearmor | tee /usr/share/keyrings/intel-graphics.gpg > /dev/null
115115

116116
RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
117-
| gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list
117+
| gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list
118118

119119
RUN apt-get update && apt install -y intel-basekit cmake vim python3-dev ninja-build pciutils
120120
WORKDIR /usr/src

0 commit comments

Comments
 (0)