Skip to content

Commit 64c4ee9

Browse files
committed
updates
1 parent 5a3fe38 commit 64c4ee9

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

language/deepseek-r1/docker/Dockerfile.sglang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SGLang Backend Dockerfile
2-
FROM lmsysorg/sglang:v0.5.4.post3
2+
FROM lmsysorg/sglang:v0.5.2-cu129-b200
33

44
# Set environment variables
55
ENV DEBIAN_FRONTEND=noninteractive

language/deepseek-r1/docker/setup_scripts/setup_sglang.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,14 @@ patch_prm800k_setup
6363

6464
# Install evaluation requirements
6565
install_evaluation_requirements
66-
VIRTUAL_ENV=$VENV_DIR uv pip install --upgrade --force-reinstall transformers==4.57.3
67-
VIRTUAL_ENV=$VENV_DIR uv pip uninstall flashinfer-python
6866

6967
# Install MLPerf LoadGen
7068
install_mlperf_loadgen "$FORCE_REBUILD" "$MLPERF_BACKEND"
7169

70+
# Install sglang==0.5.4
71+
echo "Installing sglang==0.5.4"
72+
VIRTUAL_ENV=$VENV_DIR uv pip install sglang[all]==0.5.4 --prerelease=allow
73+
7274
# Verify SGLang installation
7375
if python3 -c "import sglang" 2>/dev/null; then
7476
SGLANG_VERSION=$(python3 -c "import sglang; print(sglang.__version__)")

language/deepseek-r1/run_mlperf.py

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ def create_argument_parser() -> argparse.ArgumentParser:
4444
"Run MLPerf inference benchmarks with modular backends (async pattern)"
4545
)
4646

47-
# Scenario selection (no backend argument, auto-detected)
47+
# Mode selection (no backend argument, auto-detected)
4848
parser.add_argument("--mode", type=str, default="offline",
4949
choices=["offline", "server", "interactive"],
50-
help="MLPerf scenario mode")
50+
help="MLPerf mode (offline, server, or interactive)")
5151

5252
# MLPerf configuration
5353
parser.add_argument("--mlperf-conf", type=str, default="/inference/mlperf.conf",
@@ -56,10 +56,6 @@ def create_argument_parser() -> argparse.ArgumentParser:
5656
parser.add_argument("--user-conf", type=str, default="mlperf/user.conf",
5757
help="Path to user configuration file")
5858

59-
parser.add_argument("--scenario", type=str, default=None,
60-
choices=["Offline", "Server"],
61-
help="MLPerf scenario (overrides --mode)")
62-
6359
parser.add_argument("--accuracy", action="store_true",
6460
help="Run accuracy mode instead of performance")
6561

@@ -73,7 +69,7 @@ def create_argument_parser() -> argparse.ArgumentParser:
7369
return parser
7470

7571

76-
def configure_loadgen(scenario: str,
72+
def configure_loadgen(mode: str,
7773
accuracy_mode: bool,
7874
mlperf_conf: Optional[str] = None,
7975
user_conf: Optional[str] = None,
@@ -82,7 +78,7 @@ def configure_loadgen(scenario: str,
8278
"""Configure LoadGen test settings.
8379
8480
Args:
85-
scenario: MLPerf scenario ("offline", "server", or "interactive")
81+
mode: MLPerf mode ("offline", "server", or "interactive")
8682
accuracy_mode: Whether to run in accuracy mode
8783
mlperf_conf: Path to MLPerf config file
8884
user_conf: Path to user config file
@@ -94,19 +90,19 @@ def configure_loadgen(scenario: str,
9490
"""
9591
settings = lg.TestSettings()
9692

97-
# Set scenario
98-
if scenario.lower() == "offline":
93+
# Set scenario based on mode
94+
if mode == "offline":
9995
settings.scenario = lg.TestScenario.Offline
10096
config_scenario = "Offline"
101-
elif scenario.lower() == "server" or scenario.lower() == "interactive":
97+
elif mode == "server" or mode == "interactive":
10298
settings.scenario = lg.TestScenario.Server
10399
config_scenario = "Server"
104100
else:
105-
raise ValueError(f"Unknown scenario: {scenario}")
101+
raise ValueError(f"Unknown mode: {mode}")
106102

107103
# Adjust model name for interactive mode to use separate config
108104
# LoadGen will look for "deepseek-r1-interactive.Server" config section
109-
if scenario.lower() == "interactive":
105+
if mode == "interactive":
110106
model_name = f"{model_name}-interactive"
111107

112108
# Set mode
@@ -157,9 +153,8 @@ def main():
157153
# Detect backend early
158154
backend_name = validate_runner_for_backend('mlperf')
159155

160-
# Handle scenario override
161-
if args.scenario:
162-
args.mode = args.scenario.lower()
156+
# Get mode (already in lowercase)
157+
mode = args.mode
163158

164159
# Create output directories
165160
output_dir = Path(args.output_dir)
@@ -168,17 +163,17 @@ def main():
168163
if args.log_dir:
169164
log_dir = Path(args.log_dir)
170165
else:
171-
log_dir = output_dir / args.mode / \
166+
log_dir = output_dir / mode / \
172167
("accuracy" if args.accuracy else "performance")
173168
log_dir.mkdir(parents=True, exist_ok=True)
174169

175170
# Set up output paths with mode information
176-
_, output_file_base = setup_output_paths(args, mode=args.mode)
171+
_, output_file_base = setup_output_paths(args, mode=mode)
177172
if args.output_file is None:
178173
# Create output file path in the log directory
179174
mode_str = "accuracy" if args.accuracy else "performance"
180175
output_file_base = str(
181-
log_dir / f"{backend_name}_mlperf_{args.mode}_{mode_str}_output.pkl")
176+
log_dir / f"{backend_name}_mlperf_{mode}_{mode_str}_output.pkl")
182177
else:
183178
output_file_base = args.output_file
184179

@@ -197,7 +192,7 @@ def main():
197192
logger.info("MLPerf Inference Benchmark Runner (Async Pattern)")
198193
logger.info("=" * 80)
199194
logger.info(f"Backend: {backend_name}")
200-
logger.info(f"Mode: {args.mode}")
195+
logger.info(f"Mode: {mode}")
201196
logger.info(f"Accuracy: {args.accuracy}")
202197
logger.info(f"Input file: {args.input_file}")
203198
logger.info(f"Output directory: {output_dir}")
@@ -267,7 +262,7 @@ def main():
267262

268263
# Configure LoadGen
269264
settings = configure_loadgen(
270-
scenario=args.mode,
265+
mode=args.mode,
271266
accuracy_mode=args.accuracy,
272267
mlperf_conf=args.mlperf_conf,
273268
user_conf=args.user_conf,

0 commit comments

Comments
 (0)