From 4d8d9b8efd92353e807259d68a5611a617cc2ace Mon Sep 17 00:00:00 2001 From: Yineng Zhang Date: Fri, 20 Jun 2025 16:38:54 -0700 Subject: [PATCH] chore: upgrade mooncake-transfer-engine 0.3.4 (#7401) --- .github/workflows/release-docker-dev.yml | 13 +- docker/Dockerfile | 232 ++++++++++++++++++++++- docker/Dockerfile.dev | 231 ---------------------- 3 files changed, 241 insertions(+), 235 deletions(-) delete mode 100644 docker/Dockerfile.dev diff --git a/.github/workflows/release-docker-dev.yml b/.github/workflows/release-docker-dev.yml index b0963427b..fcc1d8866 100644 --- a/.github/workflows/release-docker-dev.yml +++ b/.github/workflows/release-docker-dev.yml @@ -9,6 +9,15 @@ jobs: build-dev: if: ${{ github.repository == 'sgl-project/sglang' }} runs-on: ubuntu-22.04 + strategy: + matrix: + variant: + - version: 12.6.1 + type: all + tag: dev + - version: 12.8.1 + type: blackwell + tag: blackwell steps: - name: Checkout repository uses: actions/checkout@v4 @@ -32,5 +41,5 @@ jobs: - name: Build and Push Dev Image run: | - docker buildx build --output type=image,compression=zstd . -f docker/Dockerfile.dev -t lmsysorg/sglang:dev --no-cache - docker push lmsysorg/sglang:dev + docker buildx build --output type=image,compression=zstd . -f docker/Dockerfile --build-arg CUDA_VERSION=${{ matrix.variant.version }} --build-arg BUILD_TYPE=${{ matrix.variant.type }} -t lmsysorg/sglang:${{ matrix.variant.tag }} --no-cache + docker push lmsysorg/sglang:${{ matrix.variant.tag }} diff --git a/docker/Dockerfile b/docker/Dockerfile index 0d403a8ce..2d86b5f3c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -85,7 +85,7 @@ RUN wget https://developer.download.nvidia.com/compute/redist/nvshmem/3.2.5/sour # Python tools RUN python3 -m pip install --no-cache-dir \ datamodel_code_generator \ - mooncake_transfer_engine==0.3.3.post2 \ + mooncake_transfer_engine==0.3.4 \ pre-commit \ pytest \ black \ @@ -95,4 +95,232 @@ RUN python3 -m pip install --no-cache-dir \ wheel \ scikit-build-core -ENV DEBIAN_FRONTEND=interactive +# Install development tools and utilities +RUN apt-get update && apt-get install -y \ + gdb \ + ninja-build \ + vim \ + tmux \ + htop \ + wget \ + curl \ + locales \ + lsof \ + git \ + git-lfs \ + zsh \ + tree \ + silversearcher-ag \ + cloc \ + unzip \ + pkg-config \ + libssl-dev \ + bear \ + ccache \ + less \ + && apt install -y rdma-core infiniband-diags openssh-server perftest ibverbs-providers libibumad3 libibverbs1 libnl-3-200 libnl-route-3-200 librdmacm1 \ + && rm -rf /var/lib/apt/lists/* \ + && apt-get clean + +RUN apt update -y \ + && apt install -y --no-install-recommends gnupg \ + && echo "deb http://developer.download.nvidia.com/devtools/repos/ubuntu2004/amd64 /" | tee /etc/apt/sources.list.d/nvidia-devtools.list \ + && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub \ + && apt update -y \ + && apt install nsight-systems-cli -y + +# Set up locale +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + +# Install minimal Python packages +RUN python3 -m pip install --no-cache-dir --break-system-packages \ + pytest \ + black \ + isort \ + icdiff \ + scikit_build_core \ + uv \ + pre-commit + +# Install diff-so-fancy +RUN curl -LSso /usr/local/bin/diff-so-fancy https://github.com/so-fancy/diff-so-fancy/releases/download/v1.4.4/diff-so-fancy \ + && chmod +x /usr/local/bin/diff-so-fancy + +# Install clang-format +RUN curl -LSso /usr/local/bin/clang-format https://github.com/muttleyxd/clang-tools-static-binaries/releases/download/master-32d3ac78/clang-format-16_linux-amd64 \ + && chmod +x /usr/local/bin/clang-format + +# Install clangd +RUN curl -L https://github.com/clangd/clangd/releases/download/18.1.3/clangd-linux-18.1.3.zip -o clangd.zip \ + && unzip clangd.zip \ + && cp -r clangd_18.1.3/bin/* /usr/local/bin/ \ + && cp -r clangd_18.1.3/lib/* /usr/local/lib/ \ + && rm -rf clangd_18.1.3 clangd.zip + +# Install CMake +RUN wget https://github.com/Kitware/CMake/releases/download/v3.31.1/cmake-3.31.1-linux-x86_64.tar.gz \ + && tar -xzf cmake-3.31.1-linux-x86_64.tar.gz \ + && cp -r cmake-3.31.1-linux-x86_64/bin/* /usr/local/bin/ \ + && cp -r cmake-3.31.1-linux-x86_64/share/* /usr/local/share/ \ + && rm -rf cmake-3.31.1-linux-x86_64 cmake-3.31.1-linux-x86_64.tar.gz + +# Add yank script +COPY --chown=root:root <<-"EOF" /usr/local/bin/yank +#!/bin/bash +put() { + esc=$1 + test -n "$TMUX" -o -z "${TERM##screen*}" && esc="\033Ptmux;\033$esc\033\\" + printf "$esc" +} +put "\033]52;c;!\a" +buf=$( cat "$@" ) +len=$( printf %s "$buf" | wc -c ) max=74994 +test $len -gt $max && echo "$0: input is $(( len - max )) bytes too long" >&2 +put "\033]52;c;$( printf %s "$buf" | head -c $max | base64 | tr -d '\r\n' )\a" +test -n "$TMUX" && tmux set-buffer "$buf" ||: +EOF + +RUN chmod +x /usr/local/bin/yank + +# Install oh-my-zsh and plugins +RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended \ + && git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions \ + && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting + +# Configure Vim +COPY --chown=root:root <<-"EOF" /root/.vimrc +function! Yank(text) abort + let escape = system('yank', a:text) + if v:shell_error + echoerr escape + else + call writefile([escape], '/dev/tty', 'b') + endif +endfunction + +noremap y y:call Yank(@0) + +" automatically run yank(1) whenever yanking in Vim +function! CopyYank() abort + call Yank(join(v:event.regcontents, "\n")) +endfunction + +autocmd TextYankPost * call CopyYank() + +" Basic settings +set number +syntax on +set mouse=a +filetype indent on + +" Indentation +set autoindent nosmartindent +set smarttab +set expandtab +set shiftwidth=4 +set softtabstop=4 + +" Visual guides +set colorcolumn=120 +highlight ColorColumn ctermbg=5 + +" Status line +set laststatus=2 +set statusline=%<%f\ %h%m%r%=%{\"[\".(&fenc==\"\"?&enc:&fenc).((exists(\"+bomb\")\ &&\ &bomb)?\",B\":\"\").\"]\ \"}%k\ %-14.(%l,%c%V%)\ %P + +" Backspace behavior +set backspace=2 + +" Encoding +set encoding=utf-8 +set fileencoding=utf-8 +EOF + +# Configure tmux +COPY --chown=root:root <<-"EOF" /root/.tmux.conf +# Pane border styling +set -g pane-border-style fg='#742727',bg=black +set -g pane-active-border-style fg=red,bg=black + +# Status bar styling +set -g status-style bg='#0C8A92',fg=black + +# Change prefix key to backtick +set-option -g prefix ` +unbind C-b +bind-key ` send-prefix + +# Split panes using - and = with current path +unbind '"' +bind - splitw -v -c '#{pane_current_path}' +unbind '%' +bind = splitw -h -c '#{pane_current_path}' + +# Vi mode settings +bind-key -T copy-mode-vi Y send-keys -X copy-pipe 'yank > #{pane_tty}' +set-window-option -g mode-keys vi + +# Other settings +set-option -g escape-time 0 +set-option -g base-index 1 +set-window-option -g mouse on +EOF + +# Configure Git +RUN git config --global core.editor "vim" \ + && git config --global core.whitespace "fix,-indent-with-non-tab,trailing-space,cr-at-eol" \ + && git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX" \ + && git config --global color.ui true \ + && git config --global color."diff-highlight".oldNormal "red bold" \ + && git config --global color."diff-highlight".oldHighlight "red bold 52" \ + && git config --global color."diff-highlight".newNormal "green bold" \ + && git config --global color."diff-highlight".newHighlight "green bold 22" \ + && git config --global color.diff.meta "11" \ + && git config --global color.diff.frag "magenta bold" \ + && git config --global color.diff.commit "yellow bold" \ + && git config --global color.diff.old "red bold" \ + && git config --global color.diff.new "green bold" \ + && git config --global color.diff.whitespace "red reverse" \ + && git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%C(auto)%d%Creset' --abbrev-commit --" \ + && git config --global http.sslVerify false \ + && git config --global pull.rebase true + +# Configure zsh +COPY --chown=root:root <<-"EOF" /root/.zshrc +export ZSH="/root/.oh-my-zsh" + +# Theme +ZSH_THEME="robbyrussell" + +# Plugins +plugins=( + git + z + zsh-autosuggestions + zsh-syntax-highlighting +) + +source $ZSH/oh-my-zsh.sh + +# Aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' +alias vi='vim' + +# Enhanced history +HISTSIZE=10000 +SAVEHIST=10000 +setopt HIST_IGNORE_ALL_DUPS +setopt HIST_FIND_NO_DUPS +setopt INC_APPEND_HISTORY +EOF + +RUN set -euxo ; \ + curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin + +# Set workspace directory +WORKDIR /sgl-workspace/sglang diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev deleted file mode 100644 index cb3b33841..000000000 --- a/docker/Dockerfile.dev +++ /dev/null @@ -1,231 +0,0 @@ -# Extend from the base sglang image -FROM lmsysorg/sglang:latest - -# Install development tools and utilities -RUN apt-get update && apt-get install -y \ - gdb \ - ninja-build \ - vim \ - tmux \ - htop \ - wget \ - curl \ - locales \ - lsof \ - git \ - git-lfs \ - zsh \ - tree \ - silversearcher-ag \ - cloc \ - unzip \ - pkg-config \ - libssl-dev \ - bear \ - ccache \ - && apt install -y rdma-core infiniband-diags openssh-server perftest ibverbs-providers libibumad3 libibverbs1 libnl-3-200 libnl-route-3-200 librdmacm1 \ - && rm -rf /var/lib/apt/lists/* \ - && apt-get clean - -RUN apt update -y \ - && apt install -y --no-install-recommends gnupg \ - && echo "deb http://developer.download.nvidia.com/devtools/repos/ubuntu2004/amd64 /" | tee /etc/apt/sources.list.d/nvidia-devtools.list \ - && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub \ - && apt update -y \ - && apt install nsight-systems-cli -y - -# Set up locale -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - -# Install minimal Python packages -RUN python3 -m pip install --no-cache-dir --break-system-packages \ - pytest \ - black \ - isort \ - icdiff \ - scikit_build_core \ - uv \ - pre-commit - -# Install diff-so-fancy -RUN curl -LSso /usr/local/bin/diff-so-fancy https://github.com/so-fancy/diff-so-fancy/releases/download/v1.4.4/diff-so-fancy \ - && chmod +x /usr/local/bin/diff-so-fancy - -# Install clang-format -RUN curl -LSso /usr/local/bin/clang-format https://github.com/muttleyxd/clang-tools-static-binaries/releases/download/master-32d3ac78/clang-format-16_linux-amd64 \ - && chmod +x /usr/local/bin/clang-format - -# Install clangd -RUN curl -L https://github.com/clangd/clangd/releases/download/18.1.3/clangd-linux-18.1.3.zip -o clangd.zip \ - && unzip clangd.zip \ - && cp -r clangd_18.1.3/bin/* /usr/local/bin/ \ - && cp -r clangd_18.1.3/lib/* /usr/local/lib/ \ - && rm -rf clangd_18.1.3 clangd.zip - -# Install CMake -RUN wget https://github.com/Kitware/CMake/releases/download/v3.31.1/cmake-3.31.1-linux-x86_64.tar.gz \ - && tar -xzf cmake-3.31.1-linux-x86_64.tar.gz \ - && cp -r cmake-3.31.1-linux-x86_64/bin/* /usr/local/bin/ \ - && cp -r cmake-3.31.1-linux-x86_64/share/* /usr/local/share/ \ - && rm -rf cmake-3.31.1-linux-x86_64 cmake-3.31.1-linux-x86_64.tar.gz - -# Add yank script -COPY --chown=root:root <<-"EOF" /usr/local/bin/yank -#!/bin/bash -put() { - esc=$1 - test -n "$TMUX" -o -z "${TERM##screen*}" && esc="\033Ptmux;\033$esc\033\\" - printf "$esc" -} -put "\033]52;c;!\a" -buf=$( cat "$@" ) -len=$( printf %s "$buf" | wc -c ) max=74994 -test $len -gt $max && echo "$0: input is $(( len - max )) bytes too long" >&2 -put "\033]52;c;$( printf %s "$buf" | head -c $max | base64 | tr -d '\r\n' )\a" -test -n "$TMUX" && tmux set-buffer "$buf" ||: -EOF - -RUN chmod +x /usr/local/bin/yank - -# Install oh-my-zsh and plugins -RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended \ - && git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions \ - && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting - -# Configure Vim -COPY --chown=root:root <<-"EOF" /root/.vimrc -function! Yank(text) abort - let escape = system('yank', a:text) - if v:shell_error - echoerr escape - else - call writefile([escape], '/dev/tty', 'b') - endif -endfunction - -noremap y y:call Yank(@0) - -" automatically run yank(1) whenever yanking in Vim -function! CopyYank() abort - call Yank(join(v:event.regcontents, "\n")) -endfunction - -autocmd TextYankPost * call CopyYank() - -" Basic settings -set number -syntax on -set mouse=a -filetype indent on - -" Indentation -set autoindent nosmartindent -set smarttab -set expandtab -set shiftwidth=4 -set softtabstop=4 - -" Visual guides -set colorcolumn=120 -highlight ColorColumn ctermbg=5 - -" Status line -set laststatus=2 -set statusline=%<%f\ %h%m%r%=%{\"[\".(&fenc==\"\"?&enc:&fenc).((exists(\"+bomb\")\ &&\ &bomb)?\",B\":\"\").\"]\ \"}%k\ %-14.(%l,%c%V%)\ %P - -" Backspace behavior -set backspace=2 - -" Encoding -set encoding=utf-8 -set fileencoding=utf-8 -EOF - -# Configure tmux -COPY --chown=root:root <<-"EOF" /root/.tmux.conf -# Pane border styling -set -g pane-border-style fg='#742727',bg=black -set -g pane-active-border-style fg=red,bg=black - -# Status bar styling -set -g status-style bg='#0C8A92',fg=black - -# Change prefix key to backtick -set-option -g prefix ` -unbind C-b -bind-key ` send-prefix - -# Split panes using - and = with current path -unbind '"' -bind - splitw -v -c '#{pane_current_path}' -unbind '%' -bind = splitw -h -c '#{pane_current_path}' - -# Vi mode settings -bind-key -T copy-mode-vi Y send-keys -X copy-pipe 'yank > #{pane_tty}' -set-window-option -g mode-keys vi - -# Other settings -set-option -g escape-time 0 -set-option -g base-index 1 -set-window-option -g mouse on -EOF - -# Configure Git -RUN git config --global core.editor "vim" \ - && git config --global core.whitespace "fix,-indent-with-non-tab,trailing-space,cr-at-eol" \ - && git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX" \ - && git config --global color.ui true \ - && git config --global color."diff-highlight".oldNormal "red bold" \ - && git config --global color."diff-highlight".oldHighlight "red bold 52" \ - && git config --global color."diff-highlight".newNormal "green bold" \ - && git config --global color."diff-highlight".newHighlight "green bold 22" \ - && git config --global color.diff.meta "11" \ - && git config --global color.diff.frag "magenta bold" \ - && git config --global color.diff.commit "yellow bold" \ - && git config --global color.diff.old "red bold" \ - && git config --global color.diff.new "green bold" \ - && git config --global color.diff.whitespace "red reverse" \ - && git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%C(auto)%d%Creset' --abbrev-commit --" \ - && git config --global http.sslVerify false \ - && git config --global pull.rebase true - -# Configure zsh -COPY --chown=root:root <<-"EOF" /root/.zshrc -export ZSH="/root/.oh-my-zsh" - -# Theme -ZSH_THEME="robbyrussell" - -# Plugins -plugins=( - git - z - zsh-autosuggestions - zsh-syntax-highlighting -) - -source $ZSH/oh-my-zsh.sh - -# Aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' -alias vi='vim' - -# Enhanced history -HISTSIZE=10000 -SAVEHIST=10000 -setopt HIST_IGNORE_ALL_DUPS -setopt HIST_FIND_NO_DUPS -setopt INC_APPEND_HISTORY -EOF - -RUN set -euxo ; \ - curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin - -# Set workspace directory -WORKDIR /sgl-workspace/sglang