Skip to content

Commit

Permalink
incorporates the latest changes from production testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
charles-cowart committed Mar 11, 2024
1 parent 9585a5c commit 966b0ad
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
13 changes: 10 additions & 3 deletions sequence_processing_pipeline/Job.py
Expand Up @@ -232,8 +232,11 @@ def submit_job(self, script_path, job_parameters=None,

job_info = {'job_id': None, 'job_name': None, 'job_state': None,
'elapsed_time': None}
# Just to give sometime for everything to be set up properly
sleep(5)
# Just to give some time for everything to be set up properly
sleep(10)

exit_count = 0

while wait:
result = self._system_call(f"sacct -P -n --job {job_id} --format "
"JobID,JobName,State,Elapsed,ExitCode")
Expand Down Expand Up @@ -276,9 +279,13 @@ def submit_job(self, script_path, job_parameters=None,
# if job is completed after having run or exited after having
# run, then stop waiting.
if not set(states) - {'COMPLETED', 'FAILED', 'CANCELLED'}:
# break
exit_count += 1

if exit_count > 4:
break

sleep(5)
sleep(10)

if job_info['job_id'] is not None:
# job was once in the queue
Expand Down
2 changes: 2 additions & 0 deletions sequence_processing_pipeline/templates/nuqc_job.sh
Expand Up @@ -9,6 +9,8 @@
### as well as sbatch -c. demux threads remains fixed at 1.
### Note -c set to 4 and thread counts set to 7 during testing.
#SBATCH -c {{cores_per_task}}
#SBATCH --gres=node_jobs:4


echo "---------------"
echo "Run details:"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -48,4 +48,4 @@
],
entry_points={
'console_scripts': ['demux=sequence_processing_pipeline.scripts.cli'
':demux',], })
':demux', ], })

0 comments on commit 966b0ad

Please sign in to comment.