Project 'biosignal/software/ptbench' was moved to 'medai/software/mednet'. Please update any links and bookmarks that may still have the old path.
Making use of LightningDataModule and simplification of data loading
-
Review changes -
-
Download -
Patches
-
Plain diff
This merge request adds LightningDataModule to better organize the code and make better use of lightning's features. This centralizes common tasks such as DataLoader creation and application of transforms into a base class to be inherited from.
Data loading was also simplified by removing custom Sample
classes and maker
functions, and the addition of RuntimeDataset
and CachedDataset
.
Remaining tasks:
-
(@dcarron) Create a common/default DataModule for the shenzhen dataset that takes protocols and transforms as parameters to avoid copying code for each protocol configuration -
(@dcarron) Add typehints to ShenzenDataModule -
(@dcarron) Investigate issue where training a new model with ElasticDeformation as a transform converges more slowly if the data is not cached. -
(@andre.anjos) Update documentation on ShenzenDataModule -
(@biosignal) Update all datasets, using Shenzhen as a reference -
(@mdelitroz) Montgomery -
(@mdelitroz) Hivtb -
(@andre.anjos) Indian -
(@andre.anjos) Padchest -
(@mdelitroz) Tbpoc -
(@andre.anjos) tbx11_simplified -> renamed as tbx11k
, protocolv1
(uses original dataset organisation) -
(@andre.anjos) tbx11_simplified_v2 -> renamed as tbx11k
, protocolv2
(uses original dataset organisation) -
(@andre.anjos) mc_ch -> renamed as montgomery-shenzhen
-
(@andre.anjos) mc_ch_in -> renamed as montgomery-shenzhen-indian
-
(@andre.anjos) mc_ch_in_11k -> renamed as montgomery-shenzhen-indian-tbx11k-v1
-
(@andre.anjos) mc_ch_in_11k_v2 -> renamed as montgomery-shenzhen-indian-tbx11k-v2
-
(@andre.anjos) mc_ch_in_pc -> renamed as montgomery-shenzhen-indian-padchest
-
(@andre.anjos) nih_cxr14_re -> renamed as nih-cxr14
(n.b.: multi-class dataset, radiological findings) -
(@andre.anjos) nih_cxr14_re_pc -> renamed as nih-cxr14-padchest
-
-
(@dcarron) Update models -
(@dcarron) Update evaluation scripts -
(@dcarron) Update support for extra_validation datasets -
(@biosignal) Update full documentation -
(@biosignal) Update unit tests
Addresses the following issues:
- Closes #14 (closed)
- Closes #18 (closed)
- Closes #19 (closed)
- Closes #21 (closed)
- Closes #29 (closed)
Edited by André Anjos
Merge request reports
Compare and
Show latest version
- version 1243f317ea1
- version 123b5a49ca8
- version 122b21ac274
- version 121695e7029
- version 12020dfcdb4
- version 11921fc141d
- version 1180203f7c6
- version 1170a0e9529
- version 116d606f37e
- version 1155e759a6d
- version 114d3d65b93
- version 113f0f7784b
- version 112d076a176
- version 11101ae2cbb
- version 110222e8515
- version 10967ca29f4
- version 1081ad21347
- version 10748990aea
- version 106b0a1d2eb
- version 105198c54cb
- version 104b0655852
- version 1038ad8565c
- version 102331ad40c
- version 1011be446c5
- version 1001e1e2dac
- version 992ce9f658
- version 98ec5e1166
- version 97fc88dade
- version 96075d3ce8
- version 9502f6b38a
- version 9417942721
- version 93e544d3cc
- version 92eb112783
- version 9186fd2f9b
- version 90513bed9d
- version 89993600d9
- version 88d0743428
- version 878a370b3a
- version 860628279d
- version 850b571683
- version 84a4ca903d
- version 834ae951f1
- version 82e7a1f11e
- version 8151e2e13e
- version 80eacfa301
- version 79b7dac705
- version 7837f89a95
- version 77c197041c
- version 7670276662
- version 750632bb72
- version 741d7cbaff
- version 73b2158758
- version 7206cef603
- version 7117cb2882
- version 701ebfb876
- version 6952b76394
- version 6886356b3e
- version 67fb3ccf06
- version 66cd28481e
- version 65cd21c775
- version 64816e8b80
- version 6342726879
- version 629b6d7386
- version 611dc638e6
- version 60d412777e
- version 59978f04e8
- version 58b50c21c6
- version 57c113676c
- version 56180f39d5
- version 5579c79301
- version 546f98cfcc
- version 5379b5897f
- version 520913ace4
- version 51f23e66b9
- version 509bf16e7a
- version 491120d9df
- version 4800f74e43
- version 47cf28368b
- version 46367ca62f
- version 45fdcf8e84
- version 4494d25ec8
- version 436151cb51
- version 4220bda94d
- version 417b812c6c
- version 40af6674cc
- version 39f347684d
- version 38a9dbca59
- version 376c981135
- version 3670f4e5b7
- version 35fb173347
- version 34b0c01942
- version 33d0b7d8b8
- version 326f12ad95
- version 31558e8a7d
- version 30ff276aec
- version 296e7db420
- version 289a034673
- version 2716087330
- version 263b1f1f92
- version 251f795f62
- version 2466f7051a
- version 239308587d
- version 2224079fc2
- version 21f89ebc8e
- version 20200a56b6
- version 19026ddb48
- version 18fe776ab5
- version 17d3fc5e37
- version 1656c2160e
- version 159f244177
- version 14295342f3
- version 13794aff1e
- version 127a8133fc
- version 11f6f659f6
- version 104d2aa2bc
- version 9249eca5a
- version 8278a6198
- version 76b6196a0
- version 647fd5c21
- version 5279f2081
- version 418e6a6bf
- version 3f92fc663
- version 22fcec25b
- version 1d5b173b1
- main (base)
- latest versiond22dece1257 commits,
- version 1243f317ea1257 commits,
- version 123b5a49ca8256 commits,
- version 122b21ac274255 commits,
- version 121695e7029254 commits,
- version 12020dfcdb4253 commits,
- version 11921fc141d250 commits,
- version 1180203f7c6249 commits,
- version 1170a0e9529248 commits,
- version 116d606f37e247 commits,
- version 1155e759a6d244 commits,
- version 114d3d65b93243 commits,
- version 113f0f7784b242 commits,
- version 112d076a176241 commits,
- version 11101ae2cbb240 commits,
- version 110222e8515239 commits,
- version 10967ca29f4238 commits,
- version 1081ad21347237 commits,
- version 10748990aea235 commits,
- version 106b0a1d2eb234 commits,
- version 105198c54cb231 commits,
- version 104b0655852228 commits,
- version 1038ad8565c227 commits,
- version 102331ad40c225 commits,
- version 1011be446c5224 commits,
- version 1001e1e2dac219 commits,
- version 992ce9f658218 commits,
- version 98ec5e1166217 commits,
- version 97fc88dade216 commits,
- version 96075d3ce8215 commits,
- version 9502f6b38a213 commits,
- version 9417942721212 commits,
- version 93e544d3cc210 commits,
- version 92eb112783209 commits,
- version 9186fd2f9b208 commits,
- version 90513bed9d207 commits,
- version 89993600d9203 commits,
- version 88d0743428202 commits,
- version 878a370b3a201 commits,
- version 860628279d198 commits,
- version 850b571683195 commits,
- version 84a4ca903d194 commits,
- version 834ae951f1192 commits,
- version 82e7a1f11e190 commits,
- version 8151e2e13e189 commits,
- version 80eacfa301187 commits,
- version 79b7dac705186 commits,
- version 7837f89a95185 commits,
- version 77c197041c184 commits,
- version 7670276662183 commits,
- version 750632bb72182 commits,
- version 741d7cbaff181 commits,
- version 73b2158758180 commits,
- version 7206cef603179 commits,
- version 7117cb2882178 commits,
- version 701ebfb876177 commits,
- version 6952b76394176 commits,
- version 6886356b3e174 commits,
- version 67fb3ccf06172 commits,
- version 66cd28481e171 commits,
- version 65cd21c775169 commits,
- version 64816e8b80168 commits,
- version 6342726879162 commits,
- version 629b6d7386161 commits,
- version 611dc638e6156 commits,
- version 60d412777e155 commits,
- version 59978f04e8153 commits,
- version 58b50c21c6148 commits,
- version 57c113676c146 commits,
- version 56180f39d5143 commits,
- version 5579c79301141 commits,
- version 546f98cfcc140 commits,
- version 5379b5897f139 commits,
- version 520913ace4138 commits,
- version 51f23e66b9137 commits,
- version 509bf16e7a139 commits,
- version 491120d9df136 commits,
- version 4800f74e43135 commits,
- version 47cf28368b134 commits,
- version 46367ca62f133 commits,
- version 45fdcf8e84132 commits,
- version 4494d25ec8131 commits,
- version 436151cb51130 commits,
- version 4220bda94d129 commits,
- version 417b812c6c124 commits,
- version 40af6674cc123 commits,
- version 39f347684d122 commits,
- version 38a9dbca59121 commits,
- version 376c981135118 commits,
- version 3670f4e5b7115 commits,
- version 35fb173347114 commits,
- version 34b0c01942113 commits,
- version 33d0b7d8b8112 commits,
- version 326f12ad95100 commits,
- version 31558e8a7d99 commits,
- version 30ff276aec97 commits,
- version 296e7db42096 commits,
- version 289a03467395 commits,
- version 271608733094 commits,
- version 263b1f1f9293 commits,
- version 251f795f6292 commits,
- version 2466f7051a91 commits,
- version 239308587d90 commits,
- version 2224079fc289 commits,
- version 21f89ebc8e88 commits,
- version 20200a56b687 commits,
- version 19026ddb4886 commits,
- version 18fe776ab585 commits,
- version 17d3fc5e3784 commits,
- version 1656c2160e83 commits,
- version 159f24417782 commits,
- version 14295342f381 commits,
- version 13794aff1e80 commits,
- version 127a8133fc79 commits,
- version 11f6f659f678 commits,
- version 104d2aa2bc77 commits,
- version 9249eca5a76 commits,
- version 8278a619875 commits,
- version 76b6196a045 commits,
- version 647fd5c2144 commits,
- version 5279f208143 commits,
- version 418e6a6bf41 commits,
- version 3f92fc66340 commits,
- version 22fcec25b39 commits,
- version 1d5b173b138 commits,
1 file
+ 4
− 4
Compare changes
- Side-by-side
- Inline
+ 4
− 4
@@ -333,12 +333,12 @@ class CachedDataset(torch.utils.data.Dataset):
Loading