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
7 changes: 6 additions & 1 deletion .github/workflows/schedule_image_build_and_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ on:
push:
tags:
- 'v*'
pull_request:
branches:
- 'main'
types: [ labeled, synchronize ]
workflow_dispatch:
inputs:
tag:
Expand All @@ -28,6 +32,7 @@ on:
jobs:
image_build:
name: Image Build and Push
if: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'image-build') }}
strategy:
matrix:
build_meta:
Expand All @@ -54,7 +59,7 @@ jobs:
dockerfile: ${{ matrix.build_meta.dockerfile }}
suffix: ${{ matrix.build_meta.suffix }}
quay_username: ${{ vars.QUAY_USERNAME }}
should_push: ${{ github.repository_owner == 'vllm-project' }}
should_push: ${{ github.repository_owner == 'vllm-project' && (github.event_name != 'pull_request') }}
workflow_dispatch_tag: ${{ inputs.tag }}
secrets:
QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
FROM quay.io/ascend/cann:8.5.0-910b-ubuntu22.04-py3.11

ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
ARG MOONCAKE_TAG="v0.3.7.post2"
ARG MOONCAKE_TAG="v0.3.8.post1"
ARG SOC_VERSION="ascend910b1"

# Define environments
Expand All @@ -37,7 +37,9 @@ RUN apt-get update -y && \
git clone --depth 1 --branch ${MOONCAKE_TAG} https://github.com/kvcache-ai/Mooncake /vllm-workspace/Mooncake && \
cp /vllm-workspace/vllm-ascend/tools/mooncake_installer.sh /vllm-workspace/Mooncake/ && \
cd /vllm-workspace/Mooncake && bash mooncake_installer.sh -y && \
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/lib64 && \
ARCH=$(uname -m) && \
source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/latest/${ARCH}-linux/devlib:/usr/local/Ascend/ascend-toolkit/latest/${ARCH}-linux/lib64:$LD_LIBRARY_PATH && \
mkdir -p build && cd build && cmake .. -DUSE_ASCEND_DIRECT=ON && \
make -j$(nproc) && make install && \
rm -fr /vllm-workspace/Mooncake/build && \
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.a3
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
FROM quay.io/ascend/cann:8.5.0-a3-ubuntu22.04-py3.11

ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
ARG MOONCAKE_TAG=v0.3.7.post2
ARG MOONCAKE_TAG=v0.3.8.post1
ARG SOC_VERSION="ascend910_9391"

COPY . /vllm-workspace/vllm-ascend/
Expand All @@ -38,7 +38,9 @@ RUN apt-get update -y && \
git clone --depth 1 --branch ${MOONCAKE_TAG} https://github.com/kvcache-ai/Mooncake /vllm-workspace/Mooncake && \
cp /vllm-workspace/vllm-ascend/tools/mooncake_installer.sh /vllm-workspace/Mooncake/ && \
cd /vllm-workspace/Mooncake && bash mooncake_installer.sh -y && \
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/lib64 && \
ARCH=$(uname -m) && \
source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/latest/${ARCH}-linux/devlib:/usr/local/Ascend/ascend-toolkit/latest/${ARCH}-linux/lib64:$LD_LIBRARY_PATH && \
mkdir -p build && cd build && cmake .. -DUSE_ASCEND_DIRECT=ON && \
make -j$(nproc) && make install && \
rm -fr /vllm-workspace/Mooncake/build && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.a3.openEuler
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
FROM quay.io/ascend/cann:8.5.0-a3-openeuler24.03-py3.11

ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
ARG MOONCAKE_TAG="v0.3.7.post2"
ARG MOONCAKE_TAG="v0.3.8.post1"
ARG SOC_VERSION="ascend910_9391"

ENV SOC_VERSION=$SOC_VERSION \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.openEuler
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
FROM quay.io/ascend/cann:8.5.0-910b-openeuler24.03-py3.11

ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
ARG MOONCAKE_TAG="v0.3.7.post2"
ARG MOONCAKE_TAG="v0.3.8.post1"
ARG SOC_VERSION="ascend910b1"

ENV SOC_VERSION=$SOC_VERSION \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Moonshot AI. Installation and compilation guide:
First, obtain the Mooncake project using the following command:

```bash
git clone -b v0.3.7.post2 --depth 1 https://github.com/kvcache-ai/Mooncake.git
git clone -b v0.3.8.post1 --depth 1 https://github.com/kvcache-ai/Mooncake.git
cd Mooncake
git submodule update --init --recursive
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Mooncake is the serving platform for Kimi, a leading LLM service provided by Moo
First, we need to obtain the Mooncake project. Refer to the following command:

```shell
git clone -b v0.3.7.post2 --depth 1 https://github.com/kvcache-ai/Mooncake.git
git clone -b v0.3.8.post1 --depth 1 https://github.com/kvcache-ai/Mooncake.git
```

(Optional) Replace go install url if the network is poor
Expand Down
2 changes: 1 addition & 1 deletion docs/source/user_guide/feature_guide/kv_pool.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export PYTHONHASHSEED=0
First, we need to obtain the Mooncake project. Refer to the following command:

```shell
git clone -b v0.3.7.post2 --depth 1 https://github.com/kvcache-ai/Mooncake.git
git clone -b v0.3.8.post1 --depth 1 https://github.com/kvcache-ai/Mooncake.git
```

(Optional) Replace go install url if the network is poor
Expand Down
5 changes: 5 additions & 0 deletions tests/e2e/nightly/multi_node/scripts/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ NC="\033[0m" # No Color

# Configuration
export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/latest/python/site-packages:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
# cann and atb environment setup
source /usr/local/Ascend/ascend-toolkit/set_env.sh
source /usr/local/Ascend/cann-8.5.0/share/info/ascendnpu-ir/bin/set_env.sh
source /usr/local/Ascend/nnal/atb/set_env.sh
# Home path for aisbench
export BENCHMARK_HOME=${WORKSPACE}/vllm-ascend/benchmark

Expand Down
57 changes: 33 additions & 24 deletions tools/mooncake_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,7 @@ NC="\033[0m" # No Color
REPO_ROOT=`pwd`
GITHUB_PROXY=${GITHUB_PROXY:-"https://github.com"}
GOVER=1.23.8
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"

# Define a function to handle the git clone operation
clone_repo_if_not_exists() {
local repo_dir=$1
local repo_url=$2

if [ ! -d "$repo_dir" ]; then
git clone --depth 1 "$repo_url"
else
echo "Directory $repo_dir already exists, skipping clone."
fi
}
YALANTINGLIBS_VERSION=0.5.6

# Function to print section headers
print_section() {
Expand All @@ -67,9 +55,6 @@ check_success() {
fi
}

if [ $(id -u) -ne 0 ]; then
print_error "Require root permission, try sudo ./dependencies.sh"
fi

# Parse command line arguments
SKIP_CONFIRM=false
Expand Down Expand Up @@ -109,6 +94,18 @@ if [ "$SKIP_CONFIRM" = false ]; then
fi
fi

# Define a function to handle the git clone operation
clone_repo_if_not_exists() {
local repo_dir=$1
local repo_url=$2

if [ ! -d "$repo_dir" ]; then
git clone --depth 1 "$repo_url"
else
echo "Directory $repo_dir already exists, skipping clone."
fi
}


# Update package lists
print_section "Updating package lists"
Expand All @@ -126,6 +123,7 @@ if command -v apt-get &> /dev/null; then
cmake \
git \
wget \
unzip \
libibverbs-dev \
libgoogle-glog-dev \
libgtest-dev \
Expand Down Expand Up @@ -155,6 +153,7 @@ elif command -v yum &> /dev/null; then
gcc-c++ \
make \
cmake \
unzip \
git \
wget \
libibverbs-devel \
Expand Down Expand Up @@ -205,19 +204,29 @@ cd "${REPO_ROOT}/thirdparties"
check_success "Failed to change to thirdparties directory"

# Check if yalantinglibs is already installed
if [ -d "yalantinglibs" ]; then
echo -e "${YELLOW}yalantinglibs directory already exists. Removing for fresh install...${NC}"
rm -rf yalantinglibs
if [ -d "yalantinglibs-${YALANTINGLIBS_VERSION}" ]; then
echo -e "${YELLOW}yalantinglibs-${YALANTINGLIBS_VERSION} directory already exists. Removing for fresh install...${NC}"
rm -rf yalantinglibs-${YALANTINGLIBS_VERSION}
check_success "Failed to remove existing yalantinglibs directory"
fi

# Clone yalantinglibs
echo "Cloning yalantinglibs from ${GITHUB_PROXY}/alibaba/yalantinglibs.git"
git clone -b 0.5.5 --depth 1 ${GITHUB_PROXY}/alibaba/yalantinglibs.git
check_success "Failed to clone yalantinglibs"
# Download yalantinglibs
YALANTINGLIBS_ZIPFILE="yalantinglibs-${YALANTINGLIBS_VERSION}.zip"
echo "Downloading yalantinglibs ${YALANTINGLIBS_VERSION} from ${GITHUB_PROXY}/alibaba/yalantinglibs/archive/refs/tags/${YALANTINGLIBS_VERSION}.zip"
wget -q --show-progress -O ${YALANTINGLIBS_ZIPFILE} ${GITHUB_PROXY}/alibaba/yalantinglibs/archive/refs/tags/${YALANTINGLIBS_VERSION}.zip
check_success "Failed to download yalantinglibs"

# Extract yalantinglibs
echo "Extracting yalantinglibs..."
unzip -q ${YALANTINGLIBS_ZIPFILE}
check_success "Failed to extract yalantinglibs"

# Clean up downloaded ZIP file
rm -f ${YALANTINGLIBS_ZIPFILE}
check_success "Failed to clean up downloaded ZIP file"

# Build and install yalantinglibs
cd yalantinglibs
cd yalantinglibs-${YALANTINGLIBS_VERSION}
check_success "Failed to change to yalantinglibs directory"

mkdir -p build
Expand Down
Loading