From 3eedc50218b90698de5c3edfa3233b5473320bd2 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:05:07 -0700 Subject: [PATCH 01/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index fe6e0c729f..df8c601c36 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -8,7 +8,7 @@ ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" - +#REMOVE THIS COMENT FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base WORKDIR /opt/nixl # Add a cache hint that only changes when the nixl commit changes From 22897303e6577b98e17365bc9848add1ebe47129 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:21:47 -0700 Subject: [PATCH 02/17] Create success_test.py --- success_test.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 success_test.py diff --git a/success_test.py b/success_test.py new file mode 100644 index 0000000000..1e755439c3 --- /dev/null +++ b/success_test.py @@ -0,0 +1,10 @@ +import pytest + +def test_passin1(): + assert True + +def test_passin2(): + assert True + +def test_passin3(): + assert True From 6c5f3f801924418798d455a46b972f5102a491ef Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:23:18 -0700 Subject: [PATCH 03/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 1 + 1 file changed, 1 insertion(+) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index df8c601c36..3d61475741 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -9,6 +9,7 @@ ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" #REMOVE THIS COMENT +# ALSO REMOVE THIS COMENT FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base WORKDIR /opt/nixl # Add a cache hint that only changes when the nixl commit changes From 7b3c9d1d5a1ba9abd361d049ceb34b3f5d88ce3d Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:25:38 -0700 Subject: [PATCH 04/17] Update pre-merge-python.yml --- .github/workflows/pre-merge-python.yml | 34 ++++---------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/.github/workflows/pre-merge-python.yml b/.github/workflows/pre-merge-python.yml index ba542dba50..d3fc1a5203 100644 --- a/.github/workflows/pre-merge-python.yml +++ b/.github/workflows/pre-merge-python.yml @@ -23,8 +23,7 @@ on: jobs: build-test: - runs-on: - group: Fastchecker + runs-on: ubuntu-latest strategy: matrix: framework: @@ -36,26 +35,14 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Define Image Tag - id: define_image_tag - run: | - echo "image_tag=dynamo:latest-${{ matrix.framework }}" >> $GITHUB_OUTPUT - - name: Build image - env: - GITHUB_TOKEN: ${{ secrets.CI_TOKEN }} - run: | - ./container/build.sh --tag ${{ steps.define_image_tag.outputs.image_tag }} --target ci_minimum --framework ${{ matrix.framework }} - name: Run pytest env: PYTEST_MARKS: "pre_merge or mypy" - run: | - docker run -w /workspace --name ${{ env.CONTAINER_ID }} ${{ steps.define_image_tag.outputs.image_tag }} pytest --basetemp=/tmp --junitxml=${{ env.PYTEST_XML_FILE }} -m "${{ env.PYTEST_MARKS }}" - - name: Copy test report from test Container + - run: | + pip install -r container/deps/requirements.test.txt + pytest -v --md-report --md-report-flavor gfm --md-report-exclude-outcomes passed skipped xpassed --md-report-output ${{ env.PYTEST_MD_FILE }} --junitxml=${{ env.PYTEST_XML_FILE }} success_test.py + - run: ls -al if: always() - run: | - docker cp ${{ env.CONTAINER_ID }}:/workspace/${{ env.PYTEST_XML_FILE }} . - name: Archive test report uses: actions/upload-artifact@v4 if: always() @@ -64,14 +51,3 @@ jobs: if-no-files-found: error path: | ${{ env.PYTEST_XML_FILE }} - - event_file: - name: "Event File" - runs-on: ubuntu-latest - if: ${{ github.event_name == 'pull_request' }} - steps: - - name: Upload - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 - with: - name: Event File - path: ${{ github.event_path }} From 675eb4a0087b39ba073aa3d6564f4d865d175ad5 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:26:34 -0700 Subject: [PATCH 05/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 1 + 1 file changed, 1 insertion(+) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index 3d61475741..c40a7a1d3c 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -10,6 +10,7 @@ ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" #REMOVE THIS COMENT # ALSO REMOVE THIS COMENT +# ALSO REMOVE THIS COMENT FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base WORKDIR /opt/nixl # Add a cache hint that only changes when the nixl commit changes From 0dfd98795ad56953b2b52fee36e5e963348eb435 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:31:31 -0700 Subject: [PATCH 06/17] Update pre-merge-python.yml --- .github/workflows/pre-merge-python.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pre-merge-python.yml b/.github/workflows/pre-merge-python.yml index d3fc1a5203..54f5dd7e28 100644 --- a/.github/workflows/pre-merge-python.yml +++ b/.github/workflows/pre-merge-python.yml @@ -16,9 +16,6 @@ name: NVIDIA Test Github Validation on: - push: - branches: - - main pull_request: jobs: @@ -28,20 +25,19 @@ jobs: matrix: framework: - vllm + name: Build and Test - ${{ matrix.framework }} env: CONTAINER_ID: test_${{ github.run_id }}_${{ github.run_attempt }}_${{ github.job }}_${{ matrix.framework }} - PYTEST_XML_FILE: pytest_test_report.xml + PYTEST_MD_FILE: ${{ matrix.framework }}-report.md + PYTEST_XML_FILE: ${{ matrix.framework }}-report.xml steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Run pytest - env: - PYTEST_MARKS: "pre_merge or mypy" - run: | pip install -r container/deps/requirements.test.txt pytest -v --md-report --md-report-flavor gfm --md-report-exclude-outcomes passed skipped xpassed --md-report-output ${{ env.PYTEST_MD_FILE }} --junitxml=${{ env.PYTEST_XML_FILE }} success_test.py - - run: ls -al + - run: ls -al if: always() - name: Archive test report uses: actions/upload-artifact@v4 @@ -51,3 +47,15 @@ jobs: if-no-files-found: error path: | ${{ env.PYTEST_XML_FILE }} + ${{ env.PYTEST_MD_FILE }} + +# event_file: +# name: "Event File" +# runs-on: ubuntu-latest +# if: ${{ github.event_name == 'pull_request' }} +# steps: +# - name: Upload +# uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 +# with: +# name: Event File +# path: ${{ github.event_path }} From 304a2279d189a457a56e41c0e35981b7c5b961a9 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:34:34 -0700 Subject: [PATCH 07/17] Update pre-merge-python.yml --- .github/workflows/pre-merge-python.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pre-merge-python.yml b/.github/workflows/pre-merge-python.yml index 54f5dd7e28..0d110c1bd3 100644 --- a/.github/workflows/pre-merge-python.yml +++ b/.github/workflows/pre-merge-python.yml @@ -16,6 +16,7 @@ name: NVIDIA Test Github Validation on: + push: pull_request: jobs: From 28219d91f69e5c80a0514f5209299fe716553bc1 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:41:27 -0700 Subject: [PATCH 08/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index c40a7a1d3c..fe6e0c729f 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -8,9 +8,7 @@ ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" -#REMOVE THIS COMENT -# ALSO REMOVE THIS COMENT -# ALSO REMOVE THIS COMENT + FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base WORKDIR /opt/nixl # Add a cache hint that only changes when the nixl commit changes From 5f39168fd3441dfd316eb2f4689cb42db2ad9e8b Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:49:02 -0700 Subject: [PATCH 09/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index fe6e0c729f..752993a40c 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" - +#REMOVE THIS COMMENT ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From a59cf9f33865b86747df0a19e4037e204ea48c2b Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 02:12:36 -0700 Subject: [PATCH 10/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index 752993a40c..fe6e0c729f 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" -#REMOVE THIS COMMENT + ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From ff32a42ae0718b93528ff1d69508e17a4dbee7a7 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 02:18:04 -0700 Subject: [PATCH 11/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index fe6e0c729f..752993a40c 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" - +#REMOVE THIS COMMENT ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From f55bfa0e1010a8623b21830bdbd79bb5a9645082 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 09:46:20 -0700 Subject: [PATCH 12/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index 752993a40c..fe6e0c729f 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" -#REMOVE THIS COMMENT + ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From e5943fa45abe07b2b13b912881b9add7d4fd76f2 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 10:29:11 -0700 Subject: [PATCH 13/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index fe6e0c729f..752993a40c 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" - +#REMOVE THIS COMMENT ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From 4c525048aca406bdbf698efd52735c6a2d61d8c7 Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 11:45:03 -0700 Subject: [PATCH 14/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index 752993a40c..fe6e0c729f 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" -#REMOVE THIS COMMENT + ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From 855e414f1cec33d8168895c5f62131dc080529ed Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 11:52:17 -0700 Subject: [PATCH 15/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index fe6e0c729f..8326215ef0 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" - +#remove this comment ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From 49ae607714da956052d97f90529170f8f03a15ec Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 21 Mar 2025 12:10:44 -0700 Subject: [PATCH 16/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index 8326215ef0..fe6e0c729f 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" -#remove this comment + ARG GENAI_PERF_TAG="25d0188713adc47868d6b3f22426375237a90529" FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS nixl_base From 18565a9c08327e3768ab37fa6f617ae362a2643c Mon Sep 17 00:00:00 2001 From: Pavithra Vijayakrishnan <160681768+pvijayakrish@users.noreply.github.com> Date: Fri, 11 Apr 2025 14:46:10 -0700 Subject: [PATCH 17/17] Update Dockerfile.vllm --- container/Dockerfile.vllm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index fe6e0c729f..c9b1d12e47 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -3,7 +3,7 @@ ARG BASE_IMAGE="nvcr.io/nvidia/cuda-dl-base" ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" - +#REMOVE THIS LINE ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04"