From 334472f005fac3e5d9f09f6c386ea51894d5ca51 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:26:36 +0800 Subject: [PATCH 1/6] show error message Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/utils/misc.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index 3df549c362..8c20929179 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -891,11 +891,12 @@ def run_cmd(cmd_list: list[str], **kwargs: Any) -> subprocess.CompletedProcess: try: return subprocess.run(cmd_list, **kwargs) except subprocess.CalledProcessError as e: - if not debug: - raise - output = str(e.stdout.decode(errors="replace")) errors = str(e.stderr.decode(errors="replace")) - raise RuntimeError(f"subprocess call error {e.returncode}: {errors}, {output}.") from e + output = str(e.stdout.decode(errors="replace")) + if not debug: + raise RuntimeError(f"subprocess call error {e.returncode}: {errors}.") from e + else: + raise RuntimeError(f"subprocess call error {e.returncode}: {errors}, {output}.") from e def is_sqrt(num: Sequence[int] | int) -> bool: From d09a2266a236b6beb562867436100876a359b73a Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:53:35 +0800 Subject: [PATCH 2/6] skip pytorch2.6 test in auto3d Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/utils/jupyter_utils.py | 2 +- tests/integration/test_auto3dseg_ensemble.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monai/utils/jupyter_utils.py b/monai/utils/jupyter_utils.py index c93e93dcb9..b1b43a6767 100644 --- a/monai/utils/jupyter_utils.py +++ b/monai/utils/jupyter_utils.py @@ -234,7 +234,7 @@ def plot_engine_status( def _get_loss_from_output( - output: list[torch.Tensor | dict[str, torch.Tensor]] | dict[str, torch.Tensor] | torch.Tensor, + output: list[torch.Tensor | dict[str, torch.Tensor]] | dict[str, torch.Tensor] | torch.Tensor ) -> torch.Tensor: """Returns a single value from the network output, which is a dict or tensor.""" diff --git a/tests/integration/test_auto3dseg_ensemble.py b/tests/integration/test_auto3dseg_ensemble.py index 08b059e3f7..f235ea9f07 100644 --- a/tests/integration/test_auto3dseg_ensemble.py +++ b/tests/integration/test_auto3dseg_ensemble.py @@ -33,7 +33,7 @@ from monai.utils import check_parent_dir, optional_import, set_determinism from monai.utils.enums import AlgoKeys from tests.test_utils import ( - SkipIfBeforePyTorchVersion, + SkipIfAtLeastPyTorchVersion, get_testing_algo_template_path, skip_if_downloading_fails, skip_if_no_cuda, @@ -109,7 +109,7 @@ def create_sim_data(dataroot, sim_datalist, sim_dim, **kwargs): @skip_if_quick @skip_if_no_cuda -@SkipIfBeforePyTorchVersion((1, 11, 1)) +@SkipIfAtLeastPyTorchVersion((2, 6, 0)) @unittest.skipIf(not has_tb, "no tensorboard summary writer") class TestEnsembleBuilder(unittest.TestCase): def setUp(self) -> None: From 4039401222c0821369b49704def44071918fc892 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:53:51 +0800 Subject: [PATCH 3/6] Revert "show error message" This reverts commit 334472f005fac3e5d9f09f6c386ea51894d5ca51. --- monai/utils/misc.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index 8c20929179..3df549c362 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -891,12 +891,11 @@ def run_cmd(cmd_list: list[str], **kwargs: Any) -> subprocess.CompletedProcess: try: return subprocess.run(cmd_list, **kwargs) except subprocess.CalledProcessError as e: - errors = str(e.stderr.decode(errors="replace")) - output = str(e.stdout.decode(errors="replace")) if not debug: - raise RuntimeError(f"subprocess call error {e.returncode}: {errors}.") from e - else: - raise RuntimeError(f"subprocess call error {e.returncode}: {errors}, {output}.") from e + raise + output = str(e.stdout.decode(errors="replace")) + errors = str(e.stderr.decode(errors="replace")) + raise RuntimeError(f"subprocess call error {e.returncode}: {errors}, {output}.") from e def is_sqrt(num: Sequence[int] | int) -> bool: From 59a77b25b3e4e110d68f49ef2730cf847a43cd66 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:56:48 +0800 Subject: [PATCH 4/6] DCO Remediation Commit for YunLiu <55491388+KumoLiu@users.noreply.github.com> I, YunLiu <55491388+KumoLiu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 4039401222c0821369b49704def44071918fc892 Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- tests/integration/test_auto3dseg_ensemble.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/test_auto3dseg_ensemble.py b/tests/integration/test_auto3dseg_ensemble.py index f235ea9f07..9980468a4c 100644 --- a/tests/integration/test_auto3dseg_ensemble.py +++ b/tests/integration/test_auto3dseg_ensemble.py @@ -107,6 +107,7 @@ def create_sim_data(dataroot, sim_datalist, sim_dim, **kwargs): nib.save(nib_image, label_fpath) + @skip_if_quick @skip_if_no_cuda @SkipIfAtLeastPyTorchVersion((2, 6, 0)) From a3b37b3516bbf866fe29de3d7a2d725a16f69383 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 17 Mar 2025 19:57:49 +0800 Subject: [PATCH 5/6] minor fix Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- tests/integration/test_auto3dseg_ensemble.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/test_auto3dseg_ensemble.py b/tests/integration/test_auto3dseg_ensemble.py index 9980468a4c..f235ea9f07 100644 --- a/tests/integration/test_auto3dseg_ensemble.py +++ b/tests/integration/test_auto3dseg_ensemble.py @@ -107,7 +107,6 @@ def create_sim_data(dataroot, sim_datalist, sim_dim, **kwargs): nib.save(nib_image, label_fpath) - @skip_if_quick @skip_if_no_cuda @SkipIfAtLeastPyTorchVersion((2, 6, 0)) From 18b3b8c129aa21ddf68abb4166e4b95c9db810dc Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:30:05 +0800 Subject: [PATCH 6/6] fix format Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/utils/jupyter_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/utils/jupyter_utils.py b/monai/utils/jupyter_utils.py index b1b43a6767..c93e93dcb9 100644 --- a/monai/utils/jupyter_utils.py +++ b/monai/utils/jupyter_utils.py @@ -234,7 +234,7 @@ def plot_engine_status( def _get_loss_from_output( - output: list[torch.Tensor | dict[str, torch.Tensor]] | dict[str, torch.Tensor] | torch.Tensor + output: list[torch.Tensor | dict[str, torch.Tensor]] | dict[str, torch.Tensor] | torch.Tensor, ) -> torch.Tensor: """Returns a single value from the network output, which is a dict or tensor."""