From 0d8e1bd0351aa7969fa7cf9629b1ad5c2209b163 Mon Sep 17 00:00:00 2001 From: biondizzle Date: Thu, 14 May 2026 18:47:30 +0000 Subject: [PATCH] =?UTF-8?q?restructure:=20move=20Dockerfile=20and=20docker?= =?UTF-8?q?-compose=20to=20root,=20docker/=20=E2=86=92=20vllm/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile => Dockerfile | 6 +++--- docker/docker-compose.yml => docker-compose.yml | 4 ++-- {docker => vllm}/patches/deepseek_v4.py | 0 {docker => vllm}/patches/deepseek_v4_attention.py | 0 {docker => vllm}/patches/staging_kernel.py | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename docker/Dockerfile => Dockerfile (91%) rename docker/docker-compose.yml => docker-compose.yml (93%) rename {docker => vllm}/patches/deepseek_v4.py (100%) rename {docker => vllm}/patches/deepseek_v4_attention.py (100%) rename {docker => vllm}/patches/staging_kernel.py (100%) diff --git a/docker/Dockerfile b/Dockerfile similarity index 91% rename from docker/Dockerfile rename to Dockerfile index a0d690bd..759ca288 100644 --- a/docker/Dockerfile +++ b/Dockerfile @@ -35,9 +35,9 @@ ENV PYTHONPATH="/root/nvfp4-megamoe-kernel/src/nvfp4_megamoe_kernel/cutlass_nvfp # Copy vLLM patches ARG PATCH_CACHE_BUSTER=82 -COPY docker/patches/deepseek_v4.py /tmp/patches/deepseek_v4.py -COPY docker/patches/staging_kernel.py /tmp/patches/staging_kernel.py -COPY docker/patches/deepseek_v4_attention.py /tmp/patches/deepseek_v4_attention.py +COPY vllm/patches/deepseek_v4.py /tmp/patches/deepseek_v4.py +COPY vllm/patches/staging_kernel.py /tmp/patches/staging_kernel.py +COPY vllm/patches/deepseek_v4_attention.py /tmp/patches/deepseek_v4_attention.py # Apply patches RUN VLLM_MODELS_DIR=$(python3 -c "import vllm.model_executor.models; import os; print(os.path.dirname(vllm.model_executor.models.__file__))") && \ diff --git a/docker/docker-compose.yml b/docker-compose.yml similarity index 93% rename from docker/docker-compose.yml rename to docker-compose.yml index bca5f2e6..a9c2c547 100644 --- a/docker/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ services: vllm: build: - context: .. - dockerfile: docker/Dockerfile + context: . + dockerfile: Dockerfile ports: - "8000:8000" environment: diff --git a/docker/patches/deepseek_v4.py b/vllm/patches/deepseek_v4.py similarity index 100% rename from docker/patches/deepseek_v4.py rename to vllm/patches/deepseek_v4.py diff --git a/docker/patches/deepseek_v4_attention.py b/vllm/patches/deepseek_v4_attention.py similarity index 100% rename from docker/patches/deepseek_v4_attention.py rename to vllm/patches/deepseek_v4_attention.py diff --git a/docker/patches/staging_kernel.py b/vllm/patches/staging_kernel.py similarity index 100% rename from docker/patches/staging_kernel.py rename to vllm/patches/staging_kernel.py