Add shifter capability to the cctbx.xfel GUI #526
+298
−82
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
|
@bkpoon -- I implemented those typos you pointed out on hangouts. |
phyy-nx
reviewed
Sep 8, 2020
| @@ -266,7 +266,8 @@ def get_submission_id(result, method): | |||
| submission_id = "".join(result.stdout_lines).strip() | |||
| print(submission_id) | |||
| return submission_id | |||
| elif method == 'slurm': | |||
| elif method == 'slurm' or method == "shifter": | |||
| # Assumign that all shifter instances are running on NERSC (slurm) systems | |||
| self.params.mp.env_script = [self.env_script.ctr.GetValue()] | ||
| self.params.mp.nproc = int(self.nproc.ctr.GetValue()) | ||
| if self.mp_option.ctr.GetStringSelection() == 'shifter': | ||
| print("follows a") |
| self.params.mp.shifter.sbatch_script_template = self.shifter_sbatch_template.ctr.GetValue() \ | ||
| if len(self.shifter_sbatch_template.ctr.GetValue()) > 0 else None | ||
|
|
||
| print ("asdasdfsd: " + self.params.mp.shifter.sbatch_script_template) |
xfel/util/mp.py
Outdated
| def customize_for_method(self): | ||
| # template for sbatch.sh | ||
| self.sbatch_template = self.params.shifter.sbatch_script_template | ||
| print(self.params.shifter.sbatch_script_template) |
| sb.write(self.sbatch_contents) | ||
| sb.write("\n") | ||
| sb.close() | ||
| print(self.sbatch_path) |
| sr.write(self.srun_contents) | ||
| sr.write("\n") | ||
| sr.close() | ||
| print(self.srun_path) |
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.
Thanks to the help (and patience) of @asmit3 I was able to add the ability to submit shifter jobs (using slurm) on NERSC's systems. This is in anticipation of the upcoming data collection at LCLS. I was able to test this on Cori, using a limited data set provided by @asmit3. Further tests to follow.
This PR adds a "shifter" option to the
cctbx.xfelgui -- this is really just slurm but with a few more bells and whistles.I am currently tracking down why the GUI is laggy when running through nx.