From eaddb6b44f75f4c7831e7e8c5460151f685be011 Mon Sep 17 00:00:00 2001 From: Poko18 Date: Fri, 15 Dec 2023 09:04:42 +0100 Subject: [PATCH 1/2] Fix Relion job exit status handling --- .../optimize_inverse_deformations.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dynamight/inverse_deformations/optimize_inverse_deformations.py b/dynamight/inverse_deformations/optimize_inverse_deformations.py index ec257ba..dde9143 100644 --- a/dynamight/inverse_deformations/optimize_inverse_deformations.py +++ b/dynamight/inverse_deformations/optimize_inverse_deformations.py @@ -12,7 +12,7 @@ from ..models.blocks import LinearBlock from ..models.decoder import InverseDisplacementDecoder from ..utils.utils_new import initialize_dataset, add_weight_decay_to_named_parameters -from ..data.dataloaders.relion import RelionDataset, abort_if_relion_abort, write_relion_job_exit_status +from ..data.dataloaders.relion import RelionDataset, abort_if_relion_abort, write_relion_job_exit_status, is_relion_abort from ._optimize_single_epoch import optimize_epoch from tqdm import tqdm from .._cli import cli @@ -232,7 +232,8 @@ def optimize_inverse_deformations( write_relion_job_exit_status( output_directory, 'SUCCESS', pipeline_control) - except: - if is_relion_abort(output_directory) == False: - write_relion_job_exit_status( - output_directory, 'FAILURE', pipeline_control) + + except Exception as e: + print(e) + write_relion_job_exit_status( + output_directory, 'FAILURE', pipeline_control) From 9adfbb2469e9e8ccd96c47125bb8e47db078d76f Mon Sep 17 00:00:00 2001 From: Poko18 Date: Fri, 15 Dec 2023 09:07:58 +0100 Subject: [PATCH 2/2] missing import --- .../inverse_deformations/optimize_inverse_deformations.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dynamight/inverse_deformations/optimize_inverse_deformations.py b/dynamight/inverse_deformations/optimize_inverse_deformations.py index dde9143..3cb0053 100644 --- a/dynamight/inverse_deformations/optimize_inverse_deformations.py +++ b/dynamight/inverse_deformations/optimize_inverse_deformations.py @@ -235,5 +235,6 @@ def optimize_inverse_deformations( except Exception as e: print(e) - write_relion_job_exit_status( - output_directory, 'FAILURE', pipeline_control) + if is_relion_abort(output_directory) == False: + write_relion_job_exit_status( + output_directory, 'FAILURE', pipeline_control)