Skip to content
Merged
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
11 changes: 6 additions & 5 deletions .claude/skills/install-miles-diffusion/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@ Two packages cannot be reproduced at all: `deep_ep` and `flash_mla` are compiled
an unresolvable `file://` path. `refresh.sh` rewrites it to the release asset the Dockerfile
pulls from (`FA3_WHEELS_REPO` / `FA3_WHEELS_TAG`), so pip installs it like any other pin.

## sglang and miles are anchored to main
## sglang and miles are anchored to the refs the Dockerfile builds from

Both come from `main` upstream, as in the Dockerfile (`SGLANG_DIFFUSION_BRANCH=main`,
`MILES_DIFFUSION_COMMIT=main`). The difference is that the Dockerfile follows the branch tip at
build time while this pins a commit and checks it is an ancestor of the branch. That check
matters: the first capture pinned a local cherry-pick that exists in no remote.
sglang comes from the `sglang-miles-h3` integration branch and miles from `main`, as in the
Dockerfile (`SGLANG_DIFFUSION_BRANCH=sglang-miles-h3`, `MILES_DIFFUSION_COMMIT=main`). The
difference is that the Dockerfile follows the branch tip at build time while this pins a commit
and checks it is an ancestor of the branch. That check matters: the first capture pinned a local
cherry-pick that exists in no remote.

Because the ancestor check needs real history, the checkout is a blob-filtered full clone rather
than the image's `--depth=1`, so setuptools_scm reports a different commit count for the same
Expand Down
2 changes: 1 addition & 1 deletion .claude/skills/install-miles-diffusion/snapshot/pins.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PY_VER="${PY_VER:-3.12}"
PIP_VER="${PIP_VER:-26.1.1}"

SGLANG_REPO="${SGLANG_REPO:-https://github.com/sgl-project/sglang.git}"
SGLANG_BRANCH="${SGLANG_BRANCH:-main}"
SGLANG_BRANCH="${SGLANG_BRANCH:-sglang-miles-h3}"
SGLANG_DIR="${SGLANG_DIR:-/sgl-workspace/sglang}"
SGLANG_COMMIT="${SGLANG_COMMIT:-94eef833fe40460230cd6856e2602e038c8305e0}"

Expand Down
6 changes: 4 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ RUN mkdir -p /tmp/fa3-wheel && \
python -c "import flash_attn_interface" && \
rm -rf /tmp/fa3-wheel

# sglang-diffusion is merged upstream: track sgl-project/sglang main; SGLANG_DIFFUSION_COMMIT=<sha> pins, "none" follows the branch tip.
# sglang-diffusion is merged upstream, but the diffusion RL rollouts this repo drives land on the
# sglang-miles-h3 integration branch before upstream main, so build the engine from there.
# SGLANG_DIFFUSION_COMMIT=<sha> pins, "none" follows the branch tip.
ARG SGLANG_DIFFUSION_REPO=https://github.com/sgl-project/sglang.git
ARG SGLANG_DIFFUSION_BRANCH=main
ARG SGLANG_DIFFUSION_BRANCH=sglang-miles-h3
ARG SGLANG_DIFFUSION_COMMIT=none
# SGLANG_BUILD_RUST_EXTS=none skips the gRPC Rust extension: unused here and the base image has no Rust toolchain.
RUN cd /sgl-workspace/sglang && \
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Useful build args:
| Arg | Default | What it does |
|---|---|---|
| `SGLANG_IMAGE_TAG` | `v0.5.12-cu129` | Base `lmsysorg/sglang` image. |
| `SGLANG_DIFFUSION_BRANCH` | `main` | sglang branch the rollout engine is built from. |
| `SGLANG_DIFFUSION_BRANCH` | `sglang-miles-h3` | sglang branch the rollout engine is built from; carries upstream `main` plus the diffusion rollouts this repo needs ahead of it. |
| `SGLANG_DIFFUSION_COMMIT` | `none` | Pin a sglang sha; `none` follows the branch tip. |
| `FA3_WHEELS_TAG` | `cu129-x86_64` | Which prebuilt FlashAttention-3 wheel to pull. |
| `MILES_DIFFUSION_COMMIT` | `main` | Ref of miles_diffusion baked into the image. |
Expand Down
Loading