Skip to content

Commit e82af63

Browse files
authored
chore: bump srt-slurm to v2.30.0 and drop the #504 patch / 将 srt-slurm 升级至 v2.30.0 并移除 #504 补丁 (#3549)
* chore: bump srt-slurm to v2.30.0 and drop the #504 patch - Bump `utils/srt-slurm` from 8dace5f9 (#496) to v2.30.0 (0b37c791). - Delete `runners/srt-slurm/patches/504-post-eval-srun-options.patch`; NVIDIA/srt-slurm#504 is merged and included in the new pin, so applying it would fail. AI model disclosure: claude-fable-5-1 via Perplexity Computer drafted the change; reviewed and submitted by the author. * docs: point RECIPES.md/RECIPES_zh.md at the v2.30.0 srt-slurm pin
1 parent e012723 commit e82af63

5 files changed

Lines changed: 6 additions & 31 deletions

File tree

‎inferencex-e2e/benchmarks/multi_node/srt-slurm-recipes/RECIPES.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
InferenceX owns the recipes in this directory. Every NVIDIA srt-slurm launcher uses `setup_srt_slurm()` in [`runners/slurm_utils.sh`](../../../runners/slurm_utils.sh), makes a job-local Git clone of the pinned submodule, and copies this entire tree into `recipes/`. The shared helper records the actual revision in `srt-slurm-sha.txt`; power lanes copy that revision into `power-producer-sha.txt` for result validation.
66

7-
The shared version is the Git submodule pointer at [`utils/srt-slurm`](../../../utils/srt-slurm), currently [v2.23.2](https://github.com/NVIDIA/srt-slurm/releases/tag/v2.23.2) (`8dace5f9596907a5075bf056251563b2e9563e7d`). Update that submodule pointer when upgrading, then run the recipe and integration checks. Do not add model-specific checkout branches to launchers.
7+
The shared version is the Git submodule pointer at [`utils/srt-slurm`](../../../utils/srt-slurm), currently [v2.30.0](https://github.com/NVIDIA/srt-slurm/releases/tag/v2.30.0) (`0b37c791fc95a7cb42e8d2b281d44b642cda75d3`). Update that submodule pointer when upgrading, then run the recipe and integration checks. Do not add model-specific checkout branches to launchers.
88

99
InferenceX requires srt-slurm 2.0 or newer and `schema: 2` recipes. Legacy recipe layouts are unsupported; migrate them before adding them to this tree.
1010

@@ -69,7 +69,7 @@ Validate recipes with the exact launcher pin, including all override variants. F
6969

7070
The initial migration also resolves compatibility issues that `srtctl migrate` cannot fix itself:
7171

72-
- SGLang Model Gateway recipes use `frontend.type: sglang-router`; in v2.23.2, `sglang` selects a direct worker without a router.
72+
- SGLang Model Gateway recipes use `frontend.type: sglang-router`; in v2.30.0, `sglang` selects a direct worker without a router.
7373
- Duplicate YAML keys retain the value selected by the former PyYAML loader.
7474
- DCGM telemetry uses `collect_interval_ms: 1000` instead of `provider` and `default_frequency`. The collector derives its shutdown budget; an explicit ten-second budget is too short for the current validator. Dedicated discovery-service placement is preserved from the original recipes. The pinned upstream runtime rejects telemetry with dedicated infrastructure nodes; this remains a power compatibility blocker rather than changing the original topology to satisfy validation. H200 custom recipes declare a default concurrency that the launcher replaces before submission.
7575
- DeepSeek-V4 vLLM benchmarks use the supported `custom_tokenizer` loader. Retired `warmup_req_rate: inf` fields are removed; the current upstream client uses its fixed warmup rate of 250 requests per second.

‎inferencex-e2e/benchmarks/multi_node/srt-slurm-recipes/RECIPES_zh.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
InferenceX 负责维护本目录中的配置。所有 NVIDIA srt-slurm 启动器均调用 [`runners/slurm_utils.sh`](../../../runners/slurm_utils.sh) 中的 `setup_srt_slurm()`,为作业创建固定版本子模块的本地 Git 克隆,并将整个目录复制到 `recipes/`。共享函数将实际提交记录到 `srt-slurm-sha.txt`;功耗测试路径还会将其复制到 `power-producer-sha.txt`,供结果校验使用。
66

7-
统一版本由 [`utils/srt-slurm`](../../../utils/srt-slurm) 的 Git 子模块指针指定,目前为 [v2.23.2](https://github.com/NVIDIA/srt-slurm/releases/tag/v2.23.2)(`8dace5f9596907a5075bf056251563b2e9563e7d`)。升级时更新该子模块指针,然后运行配置和集成检查。不要在启动器中新增按模型选择检出版本的分支。
7+
统一版本由 [`utils/srt-slurm`](../../../utils/srt-slurm) 的 Git 子模块指针指定,目前为 [v2.30.0](https://github.com/NVIDIA/srt-slurm/releases/tag/v2.30.0)(`0b37c791fc95a7cb42e8d2b281d44b642cda75d3`)。升级时更新该子模块指针,然后运行配置和集成检查。不要在启动器中新增按模型选择检出版本的分支。
88

99
InferenceX 要求 srt-slurm 2.0 或更新版本,且配置必须声明 `schema: 2`。不支持旧版配置结构;加入本目录前必须先完成迁移。
1010

@@ -69,7 +69,7 @@ python -m infx.matrix.generate full-sweep \
6969

7070
本次迁移还修复了 `srtctl migrate` 无法自动处理的兼容性问题:
7171

72-
- SGLang Model Gateway 配置使用 `frontend.type: sglang-router`;在 v2.23.2 中,`sglang` 表示不经过路由器的独立工作进程。
72+
- SGLang Model Gateway 配置使用 `frontend.type: sglang-router`;在 v2.30.0 中,`sglang` 表示不经过路由器的独立工作进程。
7373
- 对重复的 YAML 键,保留原 PyYAML 加载器实际采用的值。
7474
- DCGM 遥测使用 `collect_interval_ms: 1000`,替代 `provider` 和 `default_frequency`。采集器自动推导退出等待时间;原先显式设置的十秒不满足当前校验要求。保留原配置中服务发现进程的专用节点部署方式。固定的上游版本不支持在专用基础设施节点上启用遥测;该功耗兼容性问题仍待解决,不通过改变原有拓扑来绕过校验。H200 自定义配置声明默认并发数,提交前由启动器替换。
7575
- DeepSeek-V4 vLLM 基准测试使用受支持的 `custom_tokenizer` 加载器。删除已废弃的 `warmup_req_rate: inf` 字段;当前上游客户端的预热速率固定为每秒 250 个请求。

‎inferencex-e2e/runners/srt-slurm/patches/504-post-eval-srun-options.patch‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎inferencex-e2e/runners/srt-slurm/patches/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Each patch is a temporary fix for an open upstream PR. When the PR merges and th
66

77
| Patch | Upstream PR | Fix |
88
|-------|-------------|-----|
9-
| `504-post-eval-srun-options.patch` | [NVIDIA/srt-slurm#504](https://github.com/NVIDIA/srt-slurm/pull/504) | Forward recipe `srun_options` (e.g. `container-writable`) to post-eval steps |
9+
| _(none)_ | | No patches are currently carried; the pinned submodule (v2.30.0) includes everything the runners need. |

‎inferencex-e2e/utils/srt-slurm‎

Submodule srt-slurm updated 64 files

0 commit comments

Comments
 (0)