Merge branch 'main' into new-mi300x-node

Author: cquil11

.github/workflows/test-process-result.yml

@@ -0,0 +1,36 @@
+name: Test Process Result
+
+on:
+  pull_request:
+    paths:
+      - 'utils/process_result.py'
+      - 'utils/test_process_result.py'
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    if: github.event.pull_request.draft != true
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.12'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest
+
+      - name: Run pytest
+        run: |
+          cd utils
+          pytest test_process_result.py -v

utils/process_result.py

@@ -36,6 +36,14 @@
     'input_tput_per_gpu': (float(bmk_result['total_token_throughput']) - float(bmk_result['output_throughput']) )/ prefill_gpus
 }
 
+# Check if both PREFILL_GPUS and DECODE_GPUS env vars exist and are not empty
+if prefill_gpus_str and decode_gpus_str:
+    data['disagg'] = True
+    data['num_prefill_gpu'] = prefill_gpus
+    data['num_decode_gpu'] = decode_gpus
+else:
+    data['disagg'] = False
+
 if mtp_mode:  # MTP
     data['mtp'] = mtp_mode
 

utils/pytest.ini

@@ -0,0 +1,12 @@
+[pytest]
+testpaths = .
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+addopts =
+    -v
+    --strict-markers
+    --tb=short
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')
+    integration: marks tests as integration tests

utils/test_process_result.py

@@ -0,0 +1,150 @@
+import pytest
+import json
+import sys
+import importlib.util
+from pathlib import Path
+from io import StringIO
+
+
+def create_mock_result_file(tmp_path):
+    """Create a mock result JSON file."""
+    result_data = {
+        "max_concurrency": 10,
+        "model_id": "test-model",
+        "total_token_throughput": 1000.0,
+        "output_throughput": 400.0,
+        "ttft_ms": 50.0,
+        "tpot_ms": 20.0
+    }
+    result_file = tmp_path / "test_result.json"
+    with open(result_file, 'w') as f:
+        json.dump(result_data, f)
+    return result_file
+
+
+def run_process_result_script(tmp_path):
+    """Helper to run process_result.py and return the output data."""
+    # Create mock result file
+    create_mock_result_file(tmp_path)
+    
+    # Get script path relative to this test file
+    script_path = Path(__file__).parent / "process_result.py"
+    spec = importlib.util.spec_from_file_location("process_result", script_path)
+    module = importlib.util.module_from_spec(spec)
+    
+    # Capture stdout
+    old_stdout = sys.stdout
+    sys.stdout = StringIO()
+    
+    try:
+        spec.loader.exec_module(module)
+        output = sys.stdout.getvalue()
+        return json.loads(output)
+    finally:
+        sys.stdout = old_stdout
+
+
+def test_disagg_true_when_both_env_vars_set(tmp_path, monkeypatch):
+    """Test that disagg=true when both PREFILL_GPUS and DECODE_GPUS are set."""
+    # Set environment variables
+    monkeypatch.setenv('RUNNER_TYPE', 'h200')
+    monkeypatch.setenv('TP', '8')
+    monkeypatch.setenv('EP_SIZE', '1')
+    monkeypatch.setenv('PREFILL_GPUS', '4')
+    monkeypatch.setenv('DECODE_GPUS', '4')
+    monkeypatch.setenv('DP_ATTENTION', 'false')
+    monkeypatch.setenv('RESULT_FILENAME', 'test_result')
+    monkeypatch.setenv('FRAMEWORK', 'vllm')
+    monkeypatch.setenv('PRECISION', 'fp8')
+    
+    # Change to tmp_path directory
+    monkeypatch.chdir(tmp_path)
+    
+    # Run the script and get output
+    data = run_process_result_script(tmp_path)
+    
+    # Check that disagg is true
+    assert data['disagg'] is True
+    # Check that num_prefill_gpu and num_decode_gpu are present
+    assert data['num_prefill_gpu'] == 4
+    assert data['num_decode_gpu'] == 4
+
+
+def test_disagg_false_when_prefill_gpus_not_set(tmp_path, monkeypatch):
+    """Test that disagg=false when PREFILL_GPUS is not set."""
+    # Set environment variables (without PREFILL_GPUS)
+    monkeypatch.setenv('RUNNER_TYPE', 'h200')
+    monkeypatch.setenv('TP', '8')
+    monkeypatch.setenv('EP_SIZE', '1')
+    monkeypatch.setenv('DECODE_GPUS', '4')
+    monkeypatch.setenv('DP_ATTENTION', 'false')
+    monkeypatch.setenv('RESULT_FILENAME', 'test_result')
+    monkeypatch.setenv('FRAMEWORK', 'vllm')
+    monkeypatch.setenv('PRECISION', 'fp8')
+    
+    # Change to tmp_path directory
+    monkeypatch.chdir(tmp_path)
+    
+    # Run the script and get output
+    data = run_process_result_script(tmp_path)
+    
+    # Check that disagg is false
+    assert data['disagg'] is False
+    # Check that num_prefill_gpu and num_decode_gpu are NOT present
+    assert 'num_prefill_gpu' not in data
+    assert 'num_decode_gpu' not in data
+
+
+def test_disagg_false_when_decode_gpus_not_set(tmp_path, monkeypatch):
+    """Test that disagg=false when DECODE_GPUS is not set."""
+    # Set environment variables (without DECODE_GPUS)
+    monkeypatch.setenv('RUNNER_TYPE', 'h200')
+    monkeypatch.setenv('TP', '8')
+    monkeypatch.setenv('EP_SIZE', '1')
+    monkeypatch.setenv('PREFILL_GPUS', '4')
+    monkeypatch.setenv('DP_ATTENTION', 'false')
+    monkeypatch.setenv('RESULT_FILENAME', 'test_result')
+    monkeypatch.setenv('FRAMEWORK', 'vllm')
+    monkeypatch.setenv('PRECISION', 'fp8')
+    
+    # Change to tmp_path directory
+    monkeypatch.chdir(tmp_path)
+    
+    # Run the script and get output
+    data = run_process_result_script(tmp_path)
+    
+    # Check that disagg is false
+    assert data['disagg'] is False
+    # Check that num_prefill_gpu and num_decode_gpu are NOT present
+    assert 'num_prefill_gpu' not in data
+    assert 'num_decode_gpu' not in data
+
+
+def test_disagg_false_when_both_env_vars_empty_strings(tmp_path, monkeypatch):
+    """Test that disagg=false when both PREFILL_GPUS and DECODE_GPUS are empty strings."""
+    # Set environment variables with empty strings
+    monkeypatch.setenv('RUNNER_TYPE', 'h200')
+    monkeypatch.setenv('TP', '8')
+    monkeypatch.setenv('EP_SIZE', '1')
+    monkeypatch.setenv('PREFILL_GPUS', '')
+    monkeypatch.setenv('DECODE_GPUS', '')
+    monkeypatch.setenv('DP_ATTENTION', 'false')
+    monkeypatch.setenv('RESULT_FILENAME', 'test_result')
+    monkeypatch.setenv('FRAMEWORK', 'vllm')
+    monkeypatch.setenv('PRECISION', 'fp8')
+    
+    # Change to tmp_path directory
+    monkeypatch.chdir(tmp_path)
+    
+    # Run the script and get output
+    data = run_process_result_script(tmp_path)
+    
+    # Check that disagg is false
+    assert data['disagg'] is False
+    # Check that num_prefill_gpu and num_decode_gpu are NOT present
+    assert 'num_prefill_gpu' not in data
+    assert 'num_decode_gpu' not in data
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])