Make slurm jobs respect --match #64
Merged
Conversation
This file contains 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
tmichela
reviewed
Jul 12, 2023
damnit/backend/extract_data.py
Outdated
| @@ -204,6 +204,10 @@ def extract_and_ingest(self, proposal, run, cluster=False, | |||
|
|
|||
| python_cmd = [sys.executable, '-m', 'damnit.backend.extract_data', | |||
| '--cluster-job', str(proposal), str(run), run_data.value] | |||
| if len(match) > 0: | |||
| for m in match: | |||
There was a problem hiding this comment.
should you also check that any of the match is actually a cluster variable and only start the job in this case?
There was a problem hiding this comment.
That's already done a couple lines above:
# Launch a Slurm job if there are any 'cluster' variables to evaluate
ctx = self.ctx_whole.filter(run_data=run_data, name_matches=match, cluster=cluster)
ctx_slurm = self.ctx_whole.filter(run_data=run_data, name_matches=match, cluster=True)This change is only to forward those match arguments to the slurm job.
There was a problem hiding this comment.
I see, thanks for the clarification. LGTM
takluyver
reviewed
Jul 12, 2023
damnit/backend/extract_data.py
Outdated
| @@ -204,6 +204,10 @@ def extract_and_ingest(self, proposal, run, cluster=False, | |||
|
|
|||
| python_cmd = [sys.executable, '-m', 'damnit.backend.extract_data', | |||
| '--cluster-job', str(proposal), str(run), run_data.value] | |||
| if len(match) > 0: | |||
There was a problem hiding this comment.
I don't think you need this condition - if m is empty, the loop won't do anything anyway. 🙂
There was a problem hiding this comment.
Ah true, removed in abf6e13.
|
LGTM too |
Previously the --match arguments weren't passed to the slurm job, so all variables would be reprocessed.
JamesWrigley
force-pushed
the
slurm-match
branch
from
a6e30fa
to
abf6e13
Compare
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.
Previously the --match arguments weren't passed to the slurm job, so all variables would be reprocessed.
(cherry-picked from one of my giant branches)