Skip to content

Commit 04587b2

Browse files
committed
Merge branch 'main' into rjain/trtllm-spec-dec
Signed-off-by: jain-ria <riajain@NVIDIA.com>
2 parents 7868600 + a3f7a39 commit 04587b2

File tree

539 files changed

+74465
-72029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+74465
-72029
lines changed

.devcontainer/post-create.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ export CARGO_TARGET_DIR=$HOME/dynamo/.build/target
5252
cargo build --locked --profile dev --features mistralrs
5353
cargo doc --no-deps
5454

55-
# create symlinks for the binaries in the deploy directory
56-
mkdir -p $HOME/dynamo/deploy/sdk/src/dynamo/sdk/cli/bin
57-
ln -sf $HOME/dynamo/.build/target/debug/dynamo-run $HOME/dynamo/deploy/sdk/src/dynamo/sdk/cli/bin/dynamo-run
58-
5955
# install the python bindings
6056
cd $HOME/dynamo/lib/bindings/python && retry maturin develop
6157

.github/workflows/pre-merge-rust.yml

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,34 @@ jobs:
4747
run: |
4848
sudo apt-get update -y
4949
sudo apt-get install -y protobuf-compiler
50-
- name: Cache Cargo Registry
51-
uses: actions/cache@v3
52-
with:
53-
path: ~/.cargo/registry
54-
key: ${{ runner.os }}-cargo-registry-${{ github.head_ref || github.ref_name }}-${{ hashFiles('**/Cargo.lock') }}
55-
- name: Cache Cargo Tools
56-
uses: actions/cache@v3
50+
51+
- name: Free runner disk space
52+
run: |
53+
echo "Disk space before:"
54+
df -h
55+
rm -rf \
56+
/host_usr/share/dotnet /host_usr/local/lib/android /opt/ghc \
57+
/host_usr/local/share/powershell /host_usr/share/swift /host_usr/local/.ghcup \
58+
/host_usr/lib/jvm /opt/hostedtoolcache
59+
echo "Disk space after:"
60+
df -h
61+
62+
# TODO: Caching target/ dir handles most of the build caching improvements
63+
# currently, so sccache artifacts are mostly duplicates wasting disk space.
64+
# Revisit this to see if sccache can improve current caching behavior.
65+
# TODO: Consider single target/ directory for all subdirectories/crates instead.
66+
- name: Cache cargo artifacts
67+
uses: actions/cache@v4
5768
with:
58-
path: ~/.cargo/bin
59-
key: ${{ runner.os }}-cargo-tools-${{ github.head_ref || github.ref_name }}-${{ hashFiles('**/Cargo.lock') }}
69+
path: |
70+
~/.cargo/bin/
71+
~/.cargo/registry/index/
72+
~/.cargo/registry/cache/
73+
~/.cargo/git/db/
74+
${{ matrix.dir }}/target/
75+
key: ${{ runner.os }}-cargo-${{ matrix.dir }}-${{ hashFiles('**/Cargo.lock') }}
76+
restore-keys: ${{ runner.os }}-cargo-${{ matrix.dir }}-
77+
6078
- name: Install Rust in dev environment
6179
# Install Rust only to run GitHub Local Actions in (dev environment) using the `ACT` environment variable.
6280
# See act usage: https://nektosact.com/introduction.html
@@ -68,10 +86,6 @@ jobs:
6886
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
6987
- name: Set up Rust Toolchain Components
7088
run: rustup component add rustfmt clippy
71-
- name: Run Cargo Check
72-
working-directory: ${{ matrix.dir }}
73-
run: cargo check --locked
74-
timeout-minutes: 5
7589
- name: Verify Code Formatting
7690
working-directory: ${{ matrix.dir }}
7791
run: cargo fmt -- --check
@@ -83,6 +97,10 @@ jobs:
8397
run: |
8498
cargo-deny --version || cargo install cargo-deny@0.16.4
8599
cargo-deny --no-default-features check --hide-inclusion-graph licenses bans --config ${{ github.workspace }}/deny.toml
100+
# Have an explicit step to build tests first to separate time spent on build vs execution.
101+
- name: Compile Tests
102+
working-directory: ${{ matrix.dir }}
103+
run: cargo test --locked --no-run
86104
- name: Run Doc Tests
87105
working-directory: ${{ matrix.dir }}
88106
run: cargo doc --no-deps && cargo test --locked --doc

.github/workflows/trigger_ci.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ jobs:
4747
filters: |
4848
vllm:
4949
- 'container/Dockerfile.vllm'
50-
- 'container/Dockerfile.vllm_nixl'
51-
- 'examples/python/llm/**'
52-
- 'examples/python_rs/llm/**'
5350
- 'container/deps/requirements.vllm.txt'
5451
- 'container/deps/vllm/**'
52+
- 'components/backends/vllm/**'
5553
- 'tests/serve/test_vllm.py'
5654
trtllm:
5755
- 'container/Dockerfile.tensorrt_llm'
@@ -62,6 +60,12 @@ jobs:
6260
- 'tests/serve/test_trtllm.py'
6361
sdk:
6462
- 'deploy/**'
63+
sglang:
64+
- 'container/Dockerfile.sglang'
65+
- 'container/Dockerfile.sglang-deepep'
66+
- 'components/backends/sglang/**'
67+
- 'container/build.sh'
68+
- 'tests/serve/test_sglang.py'
6569
- name: Check if Validation Workflow has run
6670
id: check_workflow
6771
uses: actions/github-script@v6
@@ -104,6 +108,10 @@ jobs:
104108
ci_variables["RUN_TENSORRTLLM"]="true"
105109
fi
106110
111+
if [ "${{ steps.src_changes.outputs.sglang }}" == "true" ]; then
112+
ci_variables["RUN_SGLANG"]="true"
113+
fi
114+
107115
if [ "${{ steps.src_changes.outputs.sdk }}" == "true" ]; then
108116
ci_variables["RUN_SDK_CI"]="true"
109117
fi

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,4 @@ generated-values.yaml
8989
TensorRT-LLM
9090

9191
# Local build artifacts for devcontainer
92-
.build/
93-
# Copied binaries to ignore
94-
deploy/sdk/src/dynamo/sdk/cli/bin
92+
.build/

0 commit comments

Comments
 (0)