make venv input optional

where appropriate. Use it consistently in different actions.
neuralmagic · Jul 8, 2024 · bca6d22 · bca6d22 · github-actions · Jul 8, 2024
1 parent 537957c
commit bca6d22
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/.github/actions/nm-benchmark/action.yml b/.github/actions/nm-benchmark/action.yml
@@ -12,7 +12,8 @@ inputs:
     required: true
   venv:
     description: 'name for python virtual environment'
-    required: true
+    required: false
+    default: ""
 runs:
   using: composite
   steps:

diff --git a/.github/actions/nm-install-whl/action.yml b/.github/actions/nm-install-whl/action.yml
@@ -6,7 +6,8 @@ inputs:
     required: true
   venv:
     description: 'name for python virtual environment'
-    required: true
+    required: false
+    default: ""
 runs:
   using: composite
   steps:

diff --git a/.github/actions/nm-lm-eval/action.yml b/.github/actions/nm-lm-eval/action.yml
@@ -6,7 +6,8 @@ inputs:
     required: true
   venv:
     description: 'name for python virtual environment'
-    required: true
+    required: false
+    default: ""
   lm_eval_configuration:
     description: 'file containing test configuration'
     required: true
@@ -15,7 +16,7 @@ runs:
   steps:
   - id: lm-eval
     run: |
-      if [ -n "${{ inputs.venv }}" ]; then
+      if [ ! -z "${{ inputs.venv }}" ]; then
         COMMIT=${{ github.sha }}
         VENV="${{ inputs.venv }}-${COMMIT:0:7}"
         source $(pyenv root)/versions/${{ inputs.python }}/envs/${VENV}/bin/activate

diff --git a/.github/actions/nm-produce-gha-benchmark-json/action.yml b/.github/actions/nm-produce-gha-benchmark-json/action.yml
@@ -17,7 +17,8 @@ inputs:
     required: true
   venv:
     description: 'name for python virtual environment'
-    required: true
+    required: false
+    default: ""
 runs:
   using: composite
   steps:

diff --git a/.github/workflows/nm-benchmark.yml b/.github/workflows/nm-benchmark.yml
@@ -122,15 +122,13 @@ jobs:
         uses: ./.github/actions/nm-install-whl/
         with:
             python: ${{ inputs.python }}
-            venv:
 
       - name: run benchmarks
         uses: ./.github/actions/nm-benchmark/
         with:
           benchmark_config_list_file: ${{ inputs.benchmark_config_list_file }}
           output_directory: benchmark-results
           python: ${{ inputs.python }}
-          venv:
 
       - name: store benchmark result artifacts
         if: success()
@@ -171,7 +169,6 @@ jobs:
           # Metrics that we only want to observe are stored here
           observation_metrics_output_file_path: gh-action-benchmark-jsons/observation_metrics.json
           python: ${{ inputs.python }}
-          venv:
 
       - name: set gh action benchmark input artifact name
         id: set_gh_action_benchmark_input_artifact_name

diff --git a/.github/workflows/nm-lm-eval.yml b/.github/workflows/nm-lm-eval.yml
@@ -107,11 +107,9 @@ jobs:
         uses: ./.github/actions/nm-install-whl/
         with:
             python: ${{ inputs.python }}
-            venv:
 
       - name: run lm-eval-accuracy
         uses: ./.github/actions/nm-lm-eval/
         with:
           python: ${{ inputs.python }}
-          venv:
           lm_eval_configuration: ${{ inputs.lm_eval_configuration }}
diff --git a/.github/workflows/nm-test.yml b/.github/workflows/nm-test.yml
@@ -124,7 +124,6 @@ jobs:
               uses: ./.github/actions/nm-install-whl/
               with:
                 python: ${{ inputs.python }}
-                venv:
 
             - name: run buildkite script
               run: |
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,7 +124,6 @@ jobs: @@
                   uses: ./.github/actions/nm-install-whl/
                   with:
                     python: ${{ inputs.python }}
-                    venv:
                 - name: run buildkite script
                   run: |
@@ Expand Down @@
Benchmark suite	Current: `bca6d22`	Previous: `f6f2554`	Ratio
`{"name": "mean_ttft_ms", "description": "VLLM Serving - Dense\nmodel - meta-llama/Meta-Llama-3-8B-Instruct\nmax-model-len - 4096\nsparsity - None\nbenchmark_serving {\n \"nr-qps-pair_\": \"300,1\",\n \"dataset\": \"sharegpt\"\n}", "gpu_description": "NVIDIA L4 x 1", "vllm_version": "0.5.1", "python_version": "3.10.12 (main, Jun 7 2023, 13:43:11) [GCC 11.3.0]", "torch_version": "2.3.0+cu121"}`	`190.25510572333056` ms	`184.3794278033306` ms	`1.03`
`{"name": "mean_tpot_ms", "description": "VLLM Serving - Dense\nmodel - meta-llama/Meta-Llama-3-8B-Instruct\nmax-model-len - 4096\nsparsity - None\nbenchmark_serving {\n \"nr-qps-pair_\": \"300,1\",\n \"dataset\": \"sharegpt\"\n}", "gpu_description": "NVIDIA L4 x 1", "vllm_version": "0.5.1", "python_version": "3.10.12 (main, Jun 7 2023, 13:43:11) [GCC 11.3.0]", "torch_version": "2.3.0+cu121"}`	`85.27498196478533` ms	`85.039470859161` ms	`1.00`
`{"name": "mean_ttft_ms", "description": "VLLM Serving - Dense\nmodel - facebook/opt-350m\nmax-model-len - 2048\nsparsity - None\nbenchmark_serving {\n \"nr-qps-pair_\": \"300,1\",\n \"dataset\": \"sharegpt\"\n}", "gpu_description": "NVIDIA L4 x 1", "vllm_version": "0.5.1", "python_version": "3.10.12 (main, Jun 7 2023, 13:43:11) [GCC 11.3.0]", "torch_version": "2.3.0+cu121"}`	`24.64410876332598` ms	`24.363126653334653` ms	`1.01`
`{"name": "mean_tpot_ms", "description": "VLLM Serving - Dense\nmodel - facebook/opt-350m\nmax-model-len - 2048\nsparsity - None\nbenchmark_serving {\n \"nr-qps-pair_\": \"300,1\",\n \"dataset\": \"sharegpt\"\n}", "gpu_description": "NVIDIA L4 x 1", "vllm_version": "0.5.1", "python_version": "3.10.12 (main, Jun 7 2023, 13:43:11) [GCC 11.3.0]", "torch_version": "2.3.0+cu121"}`	`6.162862991085369` ms	`6.047910136160147` ms	`1.02`