Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 2 additions & 1 deletion .devcontainer/Dockerfile-cuda
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ RUN pip install torch==2.1.0 nvidia-cuda-runtime
RUN ln -s /usr/local/lib/python3.10/dist-packages/nvidia/cuda_runtime/lib/libcudart.so{.12,}

# perf tool
RUN apt-get install -y linux-tools-`uname -r`
COPY install-perf.sh /tmp/install-perf.sh
RUN apt-get update && /tmp/install-perf.sh

RUN source /usr/local/nvm/nvm.sh && npm install -g yarn

Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile-prod-vllm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM rust:1.75.0-bookworm AS aicirt
FROM rust:1.81.0-bookworm AS aicirt

WORKDIR /workspace

RUN rustup target add wasm32-wasi
RUN rustup target add wasm32-wasip1
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
RUN apt-get install -y nodejs

Expand Down
5 changes: 3 additions & 2 deletions .devcontainer/Dockerfile-vllm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN pip install -r /tmp/requirements.txt

# Uninstall the transformer engine that comes with the base image.
# Otherwise it will cause error when importing vLLM (LLAVA models).
RUN pip uninstall -y transformer_engine
RUN pip uninstall -y transformer_engine

# crashes docker?
# RUN pip install -v -U git+https://github.com/facebookresearch/xformers.git@main#egg=xformers
Expand All @@ -28,6 +28,7 @@ RUN pip uninstall -y transformer_engine
RUN ln -s /usr/local/lib/python3.10/dist-packages/nvidia/cuda_runtime/lib/libcudart.so{.12,}

# perf tool
RUN apt-get install -y linux-tools-`uname -r`
COPY install-perf.sh /tmp/install-perf.sh
RUN apt-get update && /tmp/install-perf.sh

RUN source /usr/local/nvm/nvm.sh && npm install -g yarn
5 changes: 3 additions & 2 deletions .devcontainer/common.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ RUN cd /tmp && \
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.75.0
RUST_VERSION=1.81.0

RUN curl https://sh.rustup.rs -sSf | sh -s -- \
-y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION
RUN rustup target add wasm32-wasi
RUN rustup target add wasm32-wasip1
RUN rustup component add rustfmt
RUN cargo install wasm-tools@1.216.0

# run as root please; note that settings in devcontainer.json are also needed...
USER root
10 changes: 10 additions & 0 deletions .devcontainer/install-perf.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

set -euo pipefail

UNAME_R=$(uname -r)
if [[ $UNAME_R == *"-microsoft-standard-WSL2" ]]; then
apt-get install -y linux-tools-generic
else
apt-get install -y "linux-tools-$(uname -r)"
fi
2 changes: 1 addition & 1 deletion .github/workflows/aicirt-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- run: rustup target add wasm32-wasi
- run: rustup target add wasm32-wasip1
- uses: hendrikmuhs/ccache-action@v1.2
- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aicirt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- run: rustup target add wasm32-wasi
- run: rustup target add wasm32-wasip1
- uses: hendrikmuhs/ccache-action@v1.2
- uses: Swatinem/rust-cache@v2
with:
Expand Down
Loading