Fix Slurm noquote marker handling#556
Open
fallintoplace wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
noquotetype alias with a real string marker class--outputand--errorlog paths wrapped in that marker after.replace(...)srun_argsare shell-quoted again while the${SLURM_RESTART_COUNT:-0}log path stays unquoted for shell expansionWhy
noquotewas defined as an alias forstr, soisinstance(arg, noquote)matched essentially every string and bypassedshlex.quote(...)for almost allsrunarguments. That defeated the quoting branch entirely.Using a wrapper class restores the intended split:
Impact
Slurm script materialization now treats shell-sensitive string arguments as single arguments again, while preserving the special unquoted log-file paths that rely on
${SLURM_RESTART_COUNT:-0}expansion.Checks
uv run -- pytest test/core/execution/test_slurm_templates.pyuv run --group lint -- ruff check nemo_run/core/execution/slurm.py test/core/execution/test_slurm_templates.pyNotes
I found the same
noquote: TypeAlias = strpattern innemo_run/run/ray/slurm.py, but kept this PR scoped to the reported core Slurm path so the fix is easier to review.