monai-weekly 1.5.dev2512__py3-none-any.whl → 1.5.dev2514__py3-none-any.whl

monai/utils/misc.py

@@ -546,7 +546,7 @@ class MONAIEnvVars:
 
     @staticmethod
     def algo_hash() -> str | None:
-        return os.environ.get("MONAI_ALGO_HASH", "c108ea9")
+        return os.environ.get("MONAI_ALGO_HASH", "4c18daf")
 
     @staticmethod
     def trace_transform() -> str | None:

{monai_weekly-1.5.dev2512.dist-info → monai_weekly-1.5.dev2514.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monai-weekly
-Version: 1.5.dev2512
+Version: 1.5.dev2514
 Summary: AI Toolkit for Healthcare Imaging
 Home-page: https://monai.io/
 Author: MONAI Consortium

{monai_weekly-1.5.dev2512.dist-info → monai_weekly-1.5.dev2514.dist-info}/RECORD

@@ -1,5 +1,5 @@
-monai/__init__.py,sha256=fuJ4RGZ8NPyFT0vu60YfAD4gF52sBh2fQOF2hbwWNPM,4095
-monai/_version.py,sha256=u22VnA0EVDmAkTekBp5qsbxC8k8mBO3MhxLp7DiVDYE,503
+monai/__init__.py,sha256=CFh-TH1zyQNZpWxq-GwpxdrvsABNPAk--r4Ly93w9ys,4095
+monai/_version.py,sha256=NFOTegOPD1Xv0in1fjm-WdipEPfARPmpiKGLaetgHeY,503
 monai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monai/_extensions/__init__.py,sha256=NEBPreRhQ8H9gVvgrLr_y52_TmqB96u_u4VQmeNT93I,642
 monai/_extensions/loader.py,sha256=7SiKw36q-nOzH8CRbBurFrz7GM40GCu7rc93Tm8XpnI,3643
@@ -232,7 +232,7 @@ monai/metrics/froc.py,sha256=q7MAFsHHIp5EHBHwa5UbF5PRApjUonw-hUXax9k1WxQ,7981
 monai/metrics/generalized_dice.py,sha256=9ZiEmGfMZLxFAF6AmdrbKOc8A_QOUMUmIZ6ILm-h01A,8939
 monai/metrics/hausdorff_distance.py,sha256=4_ZJZ2gV1bPhOR5Mxz0PyN6Y_X1mTZ6U6T4gSRwjfDE,11844
 monai/metrics/loss_metric.py,sha256=m9jXobVHKLeDY_8yrA9m7FwfapSAb-kYIdUJOsbvBvY,4907
-monai/metrics/meandice.py,sha256=bFiDcK-af4cqV-JHAO2Qh2ixwj6fLjaBCaCO6jBAmxQ,13475
+monai/metrics/meandice.py,sha256=Q2Fp_YfZrlsx4cxR_h40zpeeGoIkKWQN78qzCShnbro,16237
 monai/metrics/meaniou.py,sha256=cGoW1re7v4hxXJfjyEVEFNsuzEupgJaIe6ZK_qrbIjw,7004
 monai/metrics/metric.py,sha256=VtIMNudwFkEhGAX1n0aYMaj18yKtmENKpo0JuWoVFvQ,15203
 monai/metrics/mmd.py,sha256=a_O0WlUPrtegG16eBnEaf1HngPN4s4nAH1WtvGo-8BU,3299
@@ -245,19 +245,20 @@ monai/metrics/utils.py,sha256=eQ9QGGvuNmYFrgtVFNiA44pBhaHLCkmpyeK2FcK_2Pc,46941
 monai/metrics/wrapper.py,sha256=c1zg-xcypQyZ840TEuhhLgr4sClYMWTxlv1OieJTtvE,11781
 monai/networks/__init__.py,sha256=ZzU2Qo8gDXNiRBF0JapIo3xlecZHjXsJuarF0IKVKKY,1086
 monai/networks/trt_compiler.py,sha256=IFfsM1qFZvmCUBbEvbHnZe6_zmMcXghkpkzmP43dZbk,27535
-monai/networks/utils.py,sha256=8kxdwqV_nxGgwjF7lt_9tsJhesCjnE1eSCvQWzqr5RQ,56372
-monai/networks/blocks/__init__.py,sha256=xf-4SLQjL3bU7T_vCnAIbeBzz0Ys2rrtlegJM5bej-Q,2355
+monai/networks/utils.py,sha256=eFvKh-GcUGhhhM3sAQ69vn5zJAXJxRfT-uBKN0YCMp8,58226
+monai/networks/blocks/__init__.py,sha256=oZHzxMiOOpLbgqWUWRAUY64FLkyx6yrDv8pZFq5iCTE,2481
 monai/networks/blocks/acti_norm.py,sha256=bVGXbTZ_ssRvmED5R7LOQ7jj4V6WbVFl8JMO-4iZ2Dk,4275
 monai/networks/blocks/activation.py,sha256=S5k3zcP2PsHBkeIxgWgNg8ppW80tTResVP2j9ZsvTFw,5839
 monai/networks/blocks/aspp.py,sha256=GGGE7NfWj77RkaWHbcLuUP4Aff-WeiDrtgtFuSoekQk,4380
 monai/networks/blocks/attention_utils.py,sha256=UAlttLpn8vJCIiYyWXEUF-NzVTQBOK-aTieGtR5WrXk,4951
 monai/networks/blocks/backbone_fpn_utils.py,sha256=mdXFwtnRgwuaisTlY-c7OkY1ZZBY3I82dAjpXFAZFbg,7488
+monai/networks/blocks/cablock.py,sha256=q-wBpW10Qm1dEhUW-SNvCC73YQwlQdbtscaAEeUEgN4,6914
 monai/networks/blocks/convolutions.py,sha256=gRmbYfy3IR4taiXuxeH5KGOFjP55FoVWfP4e1L6ai0s,11686
 monai/networks/blocks/crf.py,sha256=gHyRgBWD9DmmbCJnXwsMa6WN7N9fDLuT_SwH8MnHhXE,5009
 monai/networks/blocks/crossattention.py,sha256=8rb1n41NRGjMHDegWXm9jlBHTaXFxEqgNLN8xsxXQzI,8348
 monai/networks/blocks/denseblock.py,sha256=hs1rcBp95euZT5ULjgefPApZH75-hqSaVKKNtHdGt10,4747
 monai/networks/blocks/dints_block.py,sha256=-JWz4-nnAjrOxU2oJ86-qN8Krb8FayKS8Zpbp1wLXzc,9255
-monai/networks/blocks/downsample.py,sha256=18cwYXL5H3DC5Yq12cdqTIijDJfMCE2YNHlPetFB6UY,2413
+monai/networks/blocks/downsample.py,sha256=VX8LRINwyrPXUckA_HrjBnP8eyDW_G9WRMa88XAoCYQ,13495
 monai/networks/blocks/dynunet_block.py,sha256=kg8NNTL4nBqsy6gBcxmS5ZCPxlhWM_iB0ByyTQ4AfPs,11063
 monai/networks/blocks/encoder.py,sha256=NwH5VSQLwamJqrSbZSdQqMwZCk80CPbSpMGEE0r0Cwo,3669
 monai/networks/blocks/fcn.py,sha256=mnCMrxhUdj2yZ0DPIj0Xf9OKVdv-qhG1BpnAg5j7q6c,9024
@@ -322,6 +323,7 @@ monai/networks/nets/quicknat.py,sha256=ko1BO9l4i4BVYG5V4ohkwUEyoRrPPPzmqNqnFhLTZ
 monai/networks/nets/regressor.py,sha256=6Nz5yJuQDJJOr5R0rhot_mHu7_MDCA4ybV48wS1HS1M,6482
 monai/networks/nets/regunet.py,sha256=-A6ygR7lVyAflFyqWkVVOsY94uMXWol1f2xr_HmsU1c,18664
 monai/networks/nets/resnet.py,sha256=owsWu9lK26ijhRHDCLEBLf03t681TyehVCflcPqGIec,28179
+monai/networks/nets/restormer.py,sha256=53VFC15JBZzhVmYEKY5F2ddXcL6NUQ0pDFtpvRVZ8hw,12897
 monai/networks/nets/segresnet.py,sha256=xNkSIvdk7kAyc3eVn-U_gGj8MoGVc5nklFKc_fkgOUs,13994
 monai/networks/nets/segresnet_ds.py,sha256=XFF7HKMt9Wbfc9fZSgfjVdfYQcP0d19ygp3VT7OHzJg,20644
 monai/networks/nets/senet.py,sha256=yLhP9gDPoa-h9UwJZJm5qxPdPvF9calY95lButXJESs,19308
@@ -401,14 +403,14 @@ monai/transforms/spatial/functional.py,sha256=IwS0witCqbGkyuxzu_R4Ztp90S0pg9hY1i
 monai/transforms/utility/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 monai/transforms/utility/array.py,sha256=Du3QA6m0io7mR51gUgaMwHBFNStdFmRxhaYmBCVy7BY,81215
 monai/transforms/utility/dictionary.py,sha256=iOFdTSekvkAsBbbfHeffcRsOKRtNcnt3N1cVuUarZ1s,80549
-monai/utils/__init__.py,sha256=2_AIpb1wqGMkmgoZ3r43muFTEsnMTCkPu3LtckipYHg,3793
+monai/utils/__init__.py,sha256=LAOUinb7tHhBy_hygIoxw9WVu7W0C-oJ1lnfPAx1GI0,3813
 monai/utils/component_store.py,sha256=Fe9jbHgwwBBAeJAw0nI02Ae13v17wlwF6N9uUue8tJg,4525
 monai/utils/decorators.py,sha256=qhhdmJMjMfZIUM6x_VGUGF7kaq2cBUAam8WymAU_mhw,3156
 monai/utils/deprecate_utils.py,sha256=gKeEV4MsI51qeQ5gci2me_C-0e-tDwa3VZzd3XPQqLk,14759
 monai/utils/dist.py,sha256=7brB42CvdS8Jvr8Y7hfqov1uk6NNnYea9dYfgMYy0BY,8578
-monai/utils/enums.py,sha256=jXtLaNDxG3BRBgLG2t13_S_G4iVWYHZO_GztykAtmXg,19594
+monai/utils/enums.py,sha256=aupxnORUHqVPF2Ac5nxstsP5aIyewMoqgGb88D62yxg,19931
 monai/utils/jupyter_utils.py,sha256=BYtj80LWQAYg5RWPj5g4j2AMCzLECvAcnZdXns0Ruw8,15651
-monai/utils/misc.py,sha256=9-5zBIDSUYewzoQBkiBm0G_HR8hmwQCT-I15RYOQqEQ,31759
+monai/utils/misc.py,sha256=M0oCfj55pZTrcYF0QgyS91JflqBwxSuNnOifl2HRSZk,31759
 monai/utils/module.py,sha256=R37PpCNCcHQvjjZFbNjNyzWb3FURaKLxQucjhzQk0eU,26087
 monai/utils/nvtx.py,sha256=i9JBxR1uhW1ZCgLPLlTx8b907QlXkFzJyTBLMlFjhtU,6876
 monai/utils/ordering.py,sha256=0nlA5b5QpVCHbtiCbTC-YsqjTmjm0bub0IeJhGFBOes,8270
@@ -423,7 +425,7 @@ monai/visualize/img2tensorboard.py,sha256=n4ztSa5BQAUxSTGvi2tp45v-F7-RNgSlbsdy-9
 monai/visualize/occlusion_sensitivity.py,sha256=OQHEJLyIhB8zWqQsfKaX-1kvCjWFVYtLfS4dFC0nKFI,18160
 monai/visualize/utils.py,sha256=B-MhTVs7sQbIqYS3yPnpBwPw2K82rE2PBtGIfpwZtWM,9894
 monai/visualize/visualizer.py,sha256=qckyaMZCbezYUwE20k5yc-Pb7UozVavMDbrmyQwfYHY,1377
-monai_weekly-1.5.dev2512.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+monai_weekly-1.5.dev2514.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 tests/apps/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 tests/apps/test_auto3dseg_bundlegen.py,sha256=FpTJo9Lfe8vdhGuWeZ9y1BQmqYwTt-s8mDVtoLGAz_I,5594
 tests/apps/test_check_hash.py,sha256=MuZslW2DDCxHKEo6-PiL7hnbxGuZRRYf6HOh3ZQv1qQ,1761
@@ -586,7 +588,6 @@ tests/integration/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0
 tests/integration/test_auto3dseg_ensemble.py,sha256=CIdgRSNX1VBfSmSvx_8HgsIfFsJpoLAC5sg8_HrRP_c,7570
 tests/integration/test_auto3dseg_hpo.py,sha256=J5Us-7iVE5UFbbsZdzNVcvPPQENTlPFarVsSt7KR3Yo,7286
 tests/integration/test_deepedit_interaction.py,sha256=tmryp1cP_QlI_tgguZybRZc7-FIEADTUGlUz3tmhEeY,4580
-tests/integration/test_downsample_block.py,sha256=qvqSeTwFQHwiJ0y8uwWE8U_9ffhltJ_4U5Zg5rBnQ6M,1794
 tests/integration/test_hovernet_nuclear_type_post_processingd.py,sha256=yTRmYdQBXEMMmXJjPDBPMxPSkLWj2U3bdRhaAfDXrpE,2661
 tests/integration/test_integration_autorunner.py,sha256=tDK1XkMZp4hehfuzMr2LQIgavP36L_vkFcOcI1Z68Lk,7571
 tests/integration/test_integration_bundle_run.py,sha256=uO87WnnG3EYnAxhudpfHy7fyxHNNzifFTw2rrMm_6XU,10734
@@ -656,7 +657,7 @@ tests/metrics/test_compute_f_beta.py,sha256=xbCipeICoAXWZLgDFeDAa1KjDQxDTMVArNbt
 tests/metrics/test_compute_fid_metric.py,sha256=B9OZECl3CT1JKzG-2C_YaPFjgfvlFoS9vI1j8vBzWZg,1328
 tests/metrics/test_compute_froc.py,sha256=IdP8JXI7SCXJQ4oxqpiGInIjNgApIbZ7JtdMTX1lc-U,4522
 tests/metrics/test_compute_generalized_dice.py,sha256=m5468hRvCYdfEF4B459e2LW3gDXH1PZSrBM3FOHHOsk,9614
-tests/metrics/test_compute_meandice.py,sha256=kC7JEqHUe54GrPxypoEjlmUZtxVZxjbhfRWEsZPP7CY,11381
+tests/metrics/test_compute_meandice.py,sha256=gRqSuys0MDktMQkCR_McceY4EiyYOkxYCuZKjz3VaHs,11390
 tests/metrics/test_compute_meaniou.py,sha256=hphLbY6S-DA3CQiKOug-DblzqwPK0F7aF3Pujz6H0vk,8020
 tests/metrics/test_compute_mmd_metric.py,sha256=9rwvmZaj4wQKLY3xfuF85gFvZrnyWSXXDd6m7zy63sg,2025
 tests/metrics/test_compute_multiscalessim_metric.py,sha256=bLL6eNE_bhL4tL4EJO5XcaGurbE5utemc4b6PmJ766k,3080
@@ -683,12 +684,14 @@ tests/networks/test_save_state.py,sha256=OnUJEX6vqWoIAIEvVXHbAL4Yrv1GeY0YHw2Dpos
 tests/networks/test_to_onehot.py,sha256=QlT6RkkG7CJeh0gppSohl4kb0bmhISdx_19IybYES0Q,2224
 tests/networks/test_varnet.py,sha256=-9Ew5epHVvRLc34VCFwKNpsKKoAdudpBRlqDAShpIio,2800
 tests/networks/blocks/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
+tests/networks/blocks/test_CABlock.py,sha256=PLKDIIn185l6xD_c9aYr-uuOjENtIRdlIDq3xmijb5c,5938
 tests/networks/blocks/test_adn.py,sha256=lTQWChKSNkQhIN3qZIIytOcox8GAoCFGpQUEVl7tqJ8,3191
 tests/networks/blocks/test_convolutions.py,sha256=6XS_DcpcA03BXttjKUU-LqfHgmLnU9RL60YzGn4mDfE,7139
 tests/networks/blocks/test_crf_cpu.py,sha256=UCw5vDdAgKA6_hpMtcHLBZpWBmdN245HelYMScZLp9E,18871
 tests/networks/blocks/test_crf_cuda.py,sha256=L4d8M4EZNRA0VcACBkWchZWfaHX8efDYygafZAL6UvQ,19450
 tests/networks/blocks/test_crossattention.py,sha256=mZ3q4nMhNN0Ntew5w8eO39qsucJmWNvqw6YYsshsZuI,7804
 tests/networks/blocks/test_denseblock.py,sha256=Nfq4zOwO7MF0OUYASf1Duorw0VZXy1v46NoQWDpWWFc,4373
+tests/networks/blocks/test_downsample_block.py,sha256=Q6nCD7AzDc1YLQcNcQhgO7fQqpqidj5Qkn64rephAAY,7687
 tests/networks/blocks/test_dynunet_block.py,sha256=2juAJlzKjmPqm0WzfWUKvBPcWYZeFVoqu7-knD6maUU,4994
 tests/networks/blocks/test_fpn_block.py,sha256=R9w3pnnl25XlR_V_HZoZe2Kq8BuCK-fww6edTBLcNlk,3467
 tests/networks/blocks/test_localnet_block.py,sha256=PGeU2CesjHa9xs-Uj0G_aE_nfqKbzJVJHk5gQTZOPsg,4806
@@ -773,6 +776,7 @@ tests/networks/nets/test_network_consistency.py,sha256=OuEsjkCzQEIxQ9CNJxNXqI8Kr
 tests/networks/nets/test_patch_gan_dicriminator.py,sha256=5qhzL55pid_9ShuALPzvW21eZtdlpKupw8hdu1N4sVE,5266
 tests/networks/nets/test_quicknat.py,sha256=iuJRChBt6OoOvBGUe2bZ5wvcx0AfId4gZJ7K12SP7w8,2601
 tests/networks/nets/test_resnet.py,sha256=nIx9ZrHWN36iiGP9KffiEdJ5kLctySh5_zdAddl9gTc,10475
+tests/networks/nets/test_restormer.py,sha256=iP9oW-D0rmHnitjOAzEz2nBATR1XTNeEAukktuQrG2s,5332
 tests/networks/nets/test_segresnet.py,sha256=1-TfOY4SSTAb3oyjFhOSoXLIO7TogksQQdvgKfXDg-o,4855
 tests/networks/nets/test_segresnet_ds.py,sha256=K9_tjcxknCAy3UiVjVAQ-1nCIuXoIJ8QEBbYaERtQ7g,6576
 tests/networks/nets/test_senet.py,sha256=V9HyDyYMR2r2F6FzZUl6INDipH5mk-IrExkkeZwHF4Q,6226
@@ -808,6 +812,7 @@ tests/networks/utils/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZ
 tests/networks/utils/test_copy_model_state.py,sha256=SI0dlUkA0rdZVFvi5acr0nve002oIiftWIPWkqLQH2Q,6764
 tests/networks/utils/test_eval_mode.py,sha256=HQqgC4COr5fAsBo2Z-DCjnOfx6WLxXlPywlGMnQY7_0,1086
 tests/networks/utils/test_freeze_layers.py,sha256=y1DdBo7AMowTyzEurOs2EfK6InDZrfq1_h3z7rpSoag,2006
+tests/networks/utils/test_pixelunshuffle.py,sha256=p_PO1TqAJf5fNBh36OJyfhIEKtfx1rBrMlrmWfzJp7g,1911
 tests/networks/utils/test_replace_module.py,sha256=_KBuO21-kvw7vckHh0KCiY8tPjMXSXpLv5kKH-ojeY4,4350
 tests/networks/utils/test_train_mode.py,sha256=GYjtzEV_ynDIRl2jVi3-A3ihS33BvubAIKaEoMKaVKI,1051
 tests/optimizers/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
@@ -1181,7 +1186,7 @@ tests/visualize/test_vis_gradcam.py,sha256=WpA-pvTB75eZs7JoIc5qyvOV9PwgkzWI8-Vow
 tests/visualize/utils/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 tests/visualize/utils/test_blend_images.py,sha256=RVs2p_8RWQDfhLHDNNtZaMig27v8o0km7XxNa-zWjKE,2274
 tests/visualize/utils/test_matshow3d.py,sha256=wXYj77L5Jvnp0f6DvL1rsi_-YlCxS0HJ9hiPmrbpuP8,5021
-monai_weekly-1.5.dev2512.dist-info/METADATA,sha256=m8Cze_lpf0KT5GBA-1frWxwCOrRuIxDISVduzhJJLXM,12008
-monai_weekly-1.5.dev2512.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-monai_weekly-1.5.dev2512.dist-info/top_level.txt,sha256=hn2Y6P9xBf2R8faMeVMHhPMvrdDKxMsIOwMDYI0yTjs,12
-monai_weekly-1.5.dev2512.dist-info/RECORD,,
+monai_weekly-1.5.dev2514.dist-info/METADATA,sha256=D_HyUHJvaNgwcKd2KZ6XK0fpADz8jFTu5fLQl1p2Nwk,12008
+monai_weekly-1.5.dev2514.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+monai_weekly-1.5.dev2514.dist-info/top_level.txt,sha256=hn2Y6P9xBf2R8faMeVMHhPMvrdDKxMsIOwMDYI0yTjs,12
+monai_weekly-1.5.dev2514.dist-info/RECORD,,

{monai_weekly-1.5.dev2512.dist-info → monai_weekly-1.5.dev2514.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/metrics/test_compute_meandice.py

@@ -267,15 +267,15 @@ class TestComputeMeanDice(unittest.TestCase):
     @parameterized.expand([TEST_CASE_3])
     def test_helper(self, input_data, _unused):
         vals = {"y_pred": dict(input_data).pop("y_pred"), "y": dict(input_data).pop("y")}
-        result = DiceHelper(sigmoid=True)(**vals)
+        result = DiceHelper(threshold=True)(**vals)
         np.testing.assert_allclose(result[0].cpu().numpy(), [0.0, 0.0, 0.0], atol=1e-4)
         np.testing.assert_allclose(sorted(result[1].cpu().numpy()), [0.0, 1.0, 2.0], atol=1e-4)
-        result = DiceHelper(softmax=True, get_not_nans=False)(**vals)
+        result = DiceHelper(apply_argmax=True, get_not_nans=False)(**vals)
         np.testing.assert_allclose(result[0].cpu().numpy(), [0.0, 0.0], atol=1e-4)
 
         num_classes = vals["y_pred"].shape[1]
         vals["y_pred"] = torch.argmax(vals["y_pred"], dim=1, keepdim=True)
-        result = DiceHelper(sigmoid=True, num_classes=num_classes)(**vals)
+        result = DiceHelper(threshold=True, num_classes=num_classes)(**vals)
         np.testing.assert_allclose(result[0].cpu().numpy(), [0.0, 0.0, 0.0], atol=1e-4)
 
     # DiceMetric class tests

tests/networks/blocks/test_CABlock.py

@@ -0,0 +1,150 @@
+# Copyright (c) MONAI Consortium
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import unittest
+from unittest import skipUnless
+
+import torch
+from parameterized import parameterized
+
+from monai.networks import eval_mode
+from monai.networks.blocks.cablock import CABlock, FeedForward
+from monai.utils import optional_import
+from tests.test_utils import SkipIfBeforePyTorchVersion, assert_allclose
+
+einops, has_einops = optional_import("einops")
+
+
+TEST_CASES_CAB = []
+for spatial_dims in [2, 3]:
+    for dim in [32, 64, 128]:
+        for num_heads in [2, 4, 8]:
+            for bias in [True, False]:
+                test_case = [
+                    {
+                        "spatial_dims": spatial_dims,
+                        "dim": dim,
+                        "num_heads": num_heads,
+                        "bias": bias,
+                        "flash_attention": False,
+                    },
+                    (2, dim, *([16] * spatial_dims)),
+                    (2, dim, *([16] * spatial_dims)),
+                ]
+                TEST_CASES_CAB.append(test_case)
+
+
+TEST_CASES_FEEDFORWARD = [
+    # Test different spatial dims, dimensions and expansion factors
+    [{"spatial_dims": 2, "dim": 64, "ffn_expansion_factor": 2.0, "bias": True}, (2, 64, 32, 32)],
+    [{"spatial_dims": 3, "dim": 128, "ffn_expansion_factor": 1.5, "bias": False}, (2, 128, 16, 16, 16)],
+    [{"spatial_dims": 2, "dim": 256, "ffn_expansion_factor": 1.0, "bias": True}, (1, 256, 64, 64)],
+]
+
+
+class TestFeedForward(unittest.TestCase):
+
+    @parameterized.expand(TEST_CASES_FEEDFORWARD)
+    def test_shape(self, input_param, input_shape):
+        net = FeedForward(**input_param)
+        with eval_mode(net):
+            result = net(torch.randn(input_shape))
+            self.assertEqual(result.shape, input_shape)
+
+    def test_gating_mechanism(self):
+        net = FeedForward(spatial_dims=2, dim=32, ffn_expansion_factor=2.0, bias=True)
+        x = torch.ones(1, 32, 16, 16)
+        out = net(x)
+        self.assertNotEqual(torch.sum(out), torch.sum(x))
+
+
+class TestCABlock(unittest.TestCase):
+
+    @parameterized.expand(TEST_CASES_CAB)
+    @skipUnless(has_einops, "Requires einops")
+    def test_shape(self, input_param, input_shape, expected_shape):
+        net = CABlock(**input_param)
+        with eval_mode(net):
+            result = net(torch.randn(input_shape))
+            self.assertEqual(result.shape, expected_shape)
+
+    @skipUnless(has_einops, "Requires einops")
+    def test_invalid_spatial_dims(self):
+        with self.assertRaises(ValueError):
+            CABlock(spatial_dims=4, dim=64, num_heads=4, bias=True)
+
+    @SkipIfBeforePyTorchVersion((2, 0))
+    @skipUnless(has_einops, "Requires einops")
+    def test_flash_attention(self):
+        device = "cuda" if torch.cuda.is_available() else "cpu"
+        block = CABlock(spatial_dims=2, dim=64, num_heads=4, bias=True, flash_attention=True).to(device)
+        x = torch.randn(2, 64, 32, 32).to(device)
+        output = block(x)
+        self.assertEqual(output.shape, x.shape)
+
+    @skipUnless(has_einops, "Requires einops")
+    def test_temperature_parameter(self):
+        block = CABlock(spatial_dims=2, dim=64, num_heads=4, bias=True)
+        self.assertTrue(isinstance(block.temperature, torch.nn.Parameter))
+        self.assertEqual(block.temperature.shape, (4, 1, 1))
+
+    @skipUnless(has_einops, "Requires einops")
+    def test_qkv_transformation_2d(self):
+        block = CABlock(spatial_dims=2, dim=64, num_heads=4, bias=True)
+        x = torch.randn(2, 64, 32, 32)
+        qkv = block.qkv(x)
+        self.assertEqual(qkv.shape, (2, 192, 32, 32))
+
+    @skipUnless(has_einops, "Requires einops")
+    def test_qkv_transformation_3d(self):
+        block = CABlock(spatial_dims=3, dim=64, num_heads=4, bias=True)
+        x = torch.randn(2, 64, 16, 16, 16)
+        qkv = block.qkv(x)
+        self.assertEqual(qkv.shape, (2, 192, 16, 16, 16))
+
+    @SkipIfBeforePyTorchVersion((2, 0))
+    @skipUnless(has_einops, "Requires einops")
+    def test_flash_vs_normal_attention(self):
+        device = "cuda" if torch.cuda.is_available() else "cpu"
+        block_flash = CABlock(spatial_dims=2, dim=64, num_heads=4, bias=True, flash_attention=True).to(device)
+        block_normal = CABlock(spatial_dims=2, dim=64, num_heads=4, bias=True, flash_attention=False).to(device)
+
+        block_normal.load_state_dict(block_flash.state_dict())
+
+        x = torch.randn(2, 64, 32, 32).to(device)
+        with torch.no_grad():
+            out_flash = block_flash(x)
+            out_normal = block_normal(x)
+
+        assert_allclose(out_flash, out_normal, atol=1e-4)
+
+    @skipUnless(has_einops, "Requires einops")
+    def test_deterministic_small_input(self):
+        block = CABlock(spatial_dims=2, dim=2, num_heads=1, bias=False)
+        with torch.no_grad():
+            block.qkv.conv.weight.data.fill_(1.0)
+            block.qkv_dwconv.conv.weight.data.fill_(1.0)
+            block.temperature.data.fill_(1.0)
+            block.project_out.conv.weight.data.fill_(1.0)
+
+        x = torch.tensor([[[[1.0, 2.0], [3.0, 4.0]], [[5.0, 6.0], [7.0, 8.0]]]], dtype=torch.float32)
+
+        output = block(x)
+        # Channel attention: sum([1..8]) * (qkv_conv=1) * (dwconv=1) * (attn_weights=1) * (proj=1) = 36 * 2 = 72
+        expected = torch.full_like(x, 72.0)
+
+        assert_allclose(output, expected, atol=1e-6)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/networks/blocks/test_downsample_block.py

@@ -0,0 +1,184 @@
+# Copyright (c) MONAI Consortium
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import unittest
+
+import torch
+from parameterized import parameterized
+
+from monai.networks import eval_mode
+from monai.networks.blocks import DownSample, MaxAvgPool, SubpixelDownsample, SubpixelUpsample
+from monai.utils import optional_import
+
+einops, has_einops = optional_import("einops")
+
+TEST_CASES = [
+    [{"spatial_dims": 2, "kernel_size": 2}, (7, 4, 64, 48), (7, 8, 32, 24)],  # 4-channel 2D, batch 7
+    [{"spatial_dims": 1, "kernel_size": 4}, (16, 4, 63), (16, 8, 15)],  # 4-channel 1D, batch 16
+    [{"spatial_dims": 1, "kernel_size": 4, "padding": 1}, (16, 4, 63), (16, 8, 16)],  # 4-channel 1D, batch 16
+    [  # 4-channel 3D, batch 16
+        {"spatial_dims": 3, "kernel_size": 3, "ceil_mode": True},
+        (16, 4, 32, 24, 48),
+        (16, 8, 11, 8, 16),
+    ],
+    [  # 1-channel 3D, batch 16
+        {"spatial_dims": 3, "kernel_size": 3, "ceil_mode": False},
+        (16, 1, 32, 24, 48),
+        (16, 2, 10, 8, 16),
+    ],
+]
+
+TEST_CASES_SUBPIXEL = [
+    [{"spatial_dims": 2, "in_channels": 1, "scale_factor": 2}, (1, 1, 8, 8), (1, 4, 4, 4)],
+    [{"spatial_dims": 3, "in_channels": 2, "scale_factor": 2}, (1, 2, 8, 8, 8), (1, 16, 4, 4, 4)],
+    [{"spatial_dims": 1, "in_channels": 3, "scale_factor": 2}, (1, 3, 8), (1, 6, 4)],
+]
+
+TEST_CASES_DOWNSAMPLE = [
+    [{"spatial_dims": 2, "in_channels": 4, "mode": "conv"}, (1, 4, 16, 16), (1, 4, 8, 8)],
+    [{"spatial_dims": 2, "in_channels": 4, "out_channels": 8, "mode": "convgroup"}, (1, 4, 16, 16), (1, 8, 8, 8)],
+    [{"spatial_dims": 3, "in_channels": 2, "mode": "maxpool"}, (1, 2, 16, 16, 16), (1, 2, 8, 8, 8)],
+    [{"spatial_dims": 2, "in_channels": 4, "mode": "avgpool"}, (1, 4, 16, 16), (1, 4, 8, 8)],
+    [{"spatial_dims": 2, "in_channels": 1, "mode": "pixelunshuffle"}, (1, 1, 16, 16), (1, 4, 8, 8)],
+]
+
+
+class TestMaxAvgPool(unittest.TestCase):
+
+    @parameterized.expand(TEST_CASES)
+    def test_shape(self, input_param, input_shape, expected_shape):
+        net = MaxAvgPool(**input_param)
+        with eval_mode(net):
+            result = net(torch.randn(input_shape))
+            self.assertEqual(result.shape, expected_shape)
+
+
+class TestSubpixelDownsample(unittest.TestCase):
+
+    @parameterized.expand(TEST_CASES_SUBPIXEL)
+    def test_shape(self, input_param, input_shape, expected_shape):
+        downsampler = SubpixelDownsample(**input_param)
+        with eval_mode(downsampler):
+            result = downsampler(torch.randn(input_shape))
+            self.assertEqual(result.shape, expected_shape)
+
+    def test_predefined_tensor(self):
+        test_tensor = torch.arange(4).view(4, 1, 1).repeat(1, 4, 4)
+        test_tensor = test_tensor.unsqueeze(0)
+
+        downsampler = SubpixelDownsample(spatial_dims=2, in_channels=1, scale_factor=2, conv_block=None)
+        with eval_mode(downsampler):
+            result = downsampler(test_tensor)
+            self.assertEqual(result.shape, (1, 16, 2, 2))
+            self.assertTrue(torch.all(result[0, 0:3] == 0))
+            self.assertTrue(torch.all(result[0, 4:7] == 1))
+            self.assertTrue(torch.all(result[0, 8:11] == 2))
+            self.assertTrue(torch.all(result[0, 12:15] == 3))
+
+    def test_reconstruction_2d(self):
+        input_tensor = torch.randn(1, 1, 4, 4)
+        down = SubpixelDownsample(spatial_dims=2, in_channels=1, scale_factor=2, conv_block=None)
+        up = SubpixelUpsample(spatial_dims=2, in_channels=4, scale_factor=2, conv_block=None, apply_pad_pool=False)
+        with eval_mode(down), eval_mode(up):
+            downsampled = down(input_tensor)
+            reconstructed = up(downsampled)
+            self.assertTrue(torch.allclose(input_tensor, reconstructed, rtol=1e-5))
+
+    def test_reconstruction_3d(self):
+        input_tensor = torch.randn(1, 1, 4, 4, 4)
+        down = SubpixelDownsample(spatial_dims=3, in_channels=1, scale_factor=2, conv_block=None)
+        up = SubpixelUpsample(spatial_dims=3, in_channels=4, scale_factor=2, conv_block=None, apply_pad_pool=False)
+        with eval_mode(down), eval_mode(up):
+            downsampled = down(input_tensor)
+            reconstructed = up(downsampled)
+            self.assertTrue(torch.allclose(input_tensor, reconstructed, rtol=1e-5))
+
+    def test_invalid_spatial_size(self):
+        downsampler = SubpixelDownsample(spatial_dims=2, in_channels=1, scale_factor=2)
+        with self.assertRaises(ValueError):
+            downsampler(torch.randn(1, 1, 3, 4))
+
+    def test_custom_conv_block(self):
+        custom_conv = torch.nn.Conv2d(1, 2, kernel_size=3, padding=1)
+        downsampler = SubpixelDownsample(spatial_dims=2, in_channels=1, scale_factor=2, conv_block=custom_conv)
+        with eval_mode(downsampler):
+            result = downsampler(torch.randn(1, 1, 4, 4))
+            self.assertEqual(result.shape, (1, 8, 2, 2))
+
+
+class TestDownSample(unittest.TestCase):
+    @parameterized.expand(TEST_CASES_DOWNSAMPLE)
+    def test_shape(self, input_param, input_shape, expected_shape):
+        net = DownSample(**input_param)
+        with eval_mode(net):
+            result = net(torch.randn(input_shape))
+            self.assertEqual(result.shape, expected_shape)
+
+    def test_pre_post_conv(self):
+        net = DownSample(
+            spatial_dims=2,
+            in_channels=4,
+            out_channels=8,
+            mode="maxpool",
+            pre_conv="default",
+            post_conv=torch.nn.Conv2d(8, 16, 1),
+        )
+        with eval_mode(net):
+            result = net(torch.randn(1, 4, 16, 16))
+            self.assertEqual(result.shape, (1, 16, 8, 8))
+
+    def test_pixelunshuffle_equivalence(self):
+        class DownSampleLocal(torch.nn.Module):
+            def __init__(self, n_feat: int):
+                super().__init__()
+                self.conv = torch.nn.Conv2d(n_feat, n_feat // 2, kernel_size=3, stride=1, padding=1, bias=False)
+                self.pixelunshuffle = torch.nn.PixelUnshuffle(2)
+
+            def forward(self, x: torch.Tensor) -> torch.Tensor:
+                x = self.conv(x)
+                x = self.pixelunshuffle(x)
+                return x
+
+        n_feat = 2
+        x = torch.randn(1, n_feat, 64, 64)
+
+        fix_weight_conv = torch.nn.Conv2d(n_feat, n_feat // 2, kernel_size=3, stride=1, padding=1, bias=False)
+
+        monai_down = DownSample(
+            spatial_dims=2,
+            in_channels=n_feat,
+            out_channels=n_feat // 2,
+            mode="pixelunshuffle",
+            pre_conv=fix_weight_conv,
+        )
+
+        local_down = DownSampleLocal(n_feat)
+        local_down.conv.weight.data = fix_weight_conv.weight.data.clone()
+
+        with eval_mode(monai_down), eval_mode(local_down):
+            out_monai = monai_down(x)
+            out_local = local_down(x)
+
+        self.assertTrue(torch.allclose(out_monai, out_local, rtol=1e-5))
+
+    def test_invalid_mode(self):
+        with self.assertRaises(ValueError):
+            DownSample(spatial_dims=2, in_channels=4, mode="invalid")
+
+    def test_missing_channels(self):
+        with self.assertRaises(ValueError):
+            DownSample(spatial_dims=2, mode="conv")
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/networks/nets/test_restormer.py

@@ -0,0 +1,147 @@
+# Copyright (c) MONAI Consortium
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import unittest
+from unittest import skipUnless
+
+import torch
+from parameterized import parameterized
+
+from monai.networks import eval_mode
+from monai.networks.nets.restormer import MDTATransformerBlock, OverlapPatchEmbed, Restormer
+from monai.utils import optional_import
+
+einops, has_einops = optional_import("einops")
+
+TEST_CASES_TRANSFORMER = [
+    # [spatial_dims, dim, num_heads, ffn_factor, bias, layer_norm_use_bias, flash_attn, input_shape]
+    [2, 48, 8, 2.66, True, True, False, (2, 48, 64, 64)],
+    [2, 96, 8, 2.66, False, False, False, (2, 96, 32, 32)],
+    [3, 48, 4, 2.66, True, True, False, (2, 48, 32, 32, 32)],
+    [3, 96, 8, 2.66, False, False, True, (2, 96, 16, 16, 16)],
+]
+
+TEST_CASES_PATCHEMBED = [
+    # spatial_dims, in_channels, embed_dim, input_shape, expected_shape
+    [2, 1, 48, (2, 1, 64, 64), (2, 48, 64, 64)],
+    [2, 3, 96, (2, 3, 32, 32), (2, 96, 32, 32)],
+    [3, 1, 48, (2, 1, 32, 32, 32), (2, 48, 32, 32, 32)],
+    [3, 4, 64, (2, 4, 16, 16, 16), (2, 64, 16, 16, 16)],
+]
+
+RESTORMER_CONFIGS = [
+    # 2-level architecture
+    {"num_blocks": [1, 1], "heads": [1, 1]},
+    {"num_blocks": [2, 1], "heads": [2, 1]},
+    # 3-level architecture
+    {"num_blocks": [1, 1, 1], "heads": [1, 1, 1]},
+    {"num_blocks": [2, 1, 1], "heads": [2, 1, 1]},
+]
+
+TEST_CASES_RESTORMER = []
+for config in RESTORMER_CONFIGS:
+    # 2D cases
+    TEST_CASES_RESTORMER.extend(
+        [
+            [
+                {
+                    "spatial_dims": 2,
+                    "in_channels": 1,
+                    "out_channels": 1,
+                    "dim": 48,
+                    "num_blocks": config["num_blocks"],
+                    "heads": config["heads"],
+                    "num_refinement_blocks": 2,
+                    "ffn_expansion_factor": 1.5,
+                },
+                (2, 1, 64, 64),
+                (2, 1, 64, 64),
+            ],
+            # 3D cases
+            [
+                {
+                    "spatial_dims": 3,
+                    "in_channels": 1,
+                    "out_channels": 1,
+                    "dim": 16,
+                    "num_blocks": config["num_blocks"],
+                    "heads": config["heads"],
+                    "num_refinement_blocks": 2,
+                    "ffn_expansion_factor": 1.5,
+                },
+                (2, 1, 32, 32, 32),
+                (2, 1, 32, 32, 32),
+            ],
+        ]
+    )
+
+
+class TestMDTATransformerBlock(unittest.TestCase):
+
+    @parameterized.expand(TEST_CASES_TRANSFORMER)
+    @skipUnless(has_einops, "Requires einops")
+    def test_shape(self, spatial_dims, dim, heads, ffn_factor, bias, layer_norm_use_bias, flash, shape):
+        if flash and not torch.cuda.is_available():
+            self.skipTest("Flash attention requires CUDA")
+        block = MDTATransformerBlock(
+            spatial_dims=spatial_dims,
+            dim=dim,
+            num_heads=heads,
+            ffn_expansion_factor=ffn_factor,
+            bias=bias,
+            layer_norm_use_bias=layer_norm_use_bias,
+            flash_attention=flash,
+        )
+        with eval_mode(block):
+            x = torch.randn(shape)
+            output = block(x)
+            self.assertEqual(output.shape, x.shape)
+
+
+class TestOverlapPatchEmbed(unittest.TestCase):
+
+    @parameterized.expand(TEST_CASES_PATCHEMBED)
+    def test_shape(self, spatial_dims, in_channels, embed_dim, input_shape, expected_shape):
+        net = OverlapPatchEmbed(spatial_dims=spatial_dims, in_channels=in_channels, embed_dim=embed_dim)
+        with eval_mode(net):
+            result = net(torch.randn(input_shape))
+            self.assertEqual(result.shape, expected_shape)
+
+
+class TestRestormer(unittest.TestCase):
+
+    @parameterized.expand(TEST_CASES_RESTORMER)
+    @skipUnless(has_einops, "Requires einops")
+    def test_shape(self, input_param, input_shape, expected_shape):
+        if input_param.get("flash_attention", False) and not torch.cuda.is_available():
+            self.skipTest("Flash attention requires CUDA")
+        net = Restormer(**input_param)
+        with eval_mode(net):
+            result = net(torch.randn(input_shape))
+            self.assertEqual(result.shape, expected_shape)
+
+    @skipUnless(has_einops, "Requires einops")
+    def test_small_input_error_2d(self):
+        net = Restormer(spatial_dims=2, in_channels=1, out_channels=1)
+        with self.assertRaises(AssertionError):
+            net(torch.randn(1, 1, 8, 8))
+
+    @skipUnless(has_einops, "Requires einops")
+    def test_small_input_error_3d(self):
+        net = Restormer(spatial_dims=3, in_channels=1, out_channels=1)
+        with self.assertRaises(AssertionError):
+            net(torch.randn(1, 1, 8, 8, 8))
+
+
+if __name__ == "__main__":
+    unittest.main()