fepegar commited on
Commit
f8ae55f
·
1 Parent(s): 931733c

Fix orientation

Browse files
pyproject.toml CHANGED
@@ -15,7 +15,7 @@ dependencies = [
15
  "jaxtyping",
16
  "safetensors",
17
  "timm<1.0.23", # RuntimeError related to position embeddings in 1.0.23
18
- "torchio>=0.21.1",
19
  "tqdm",
20
  "transformers",
21
  "typer",
 
15
  "jaxtyping",
16
  "safetensors",
17
  "timm<1.0.23", # RuntimeError related to position embeddings in 1.0.23
18
+ "torchio>=1.1.0,<2",
19
  "tqdm",
20
  "transformers",
21
  "typer",
src/colipri/configs/config.yaml CHANGED
@@ -8,3 +8,4 @@ spacing: 2 # mm
8
  padding_mode: minimum
9
  image_embed_dim: 864
10
  projection_dim: 768
 
 
8
  padding_mode: minimum
9
  image_embed_dim: 864
10
  projection_dim: 768
11
+ orientation: RAS
src/colipri/configs/processor/image_transform/default.yaml CHANGED
@@ -2,12 +2,14 @@
2
  # adapted for Colipri needs.
3
  _target_: torchio.transforms.augmentation.composition.Compose
4
  transforms:
5
- - _target_: torchio.transforms.preprocessing.spatial.to_orientation.ToOrientation
 
6
  copy: true
7
  exclude: null
8
  include: null
9
- orientation: SAR
10
- - _target_: torchio.transforms.preprocessing.spatial.resample.Resample
 
11
  antialias: false
12
  copy: true
13
  exclude: null
@@ -17,10 +19,12 @@ transforms:
17
  pre_affine_name: null
18
  scalars_only: false
19
  target: ${spacing}
20
- - _target_: torchio.transforms.preprocessing.intensity.clamp.Clamp
 
21
  out_min: -1000
22
  out_max: 1000
23
- - _target_: torchio.transforms.preprocessing.intensity.rescale.RescaleIntensity
 
24
  copy: true
25
  exclude: null
26
  in_min_max:
@@ -34,7 +38,8 @@ transforms:
34
  percentiles:
35
  - 0
36
  - 100
37
- - _target_: torchio.transforms.preprocessing.spatial.crop_or_pad.CropOrPad
 
38
  copy: true
39
  exclude: null
40
  include: null
 
2
  # adapted for Colipri needs.
3
  _target_: torchio.transforms.augmentation.composition.Compose
4
  transforms:
5
+ to_orientation:
6
+ _target_: torchio.transforms.preprocessing.spatial.to_orientation.ToOrientation
7
  copy: true
8
  exclude: null
9
  include: null
10
+ orientation: ${orientation}
11
+ resample:
12
+ _target_: torchio.transforms.preprocessing.spatial.resample.Resample
13
  antialias: false
14
  copy: true
15
  exclude: null
 
19
  pre_affine_name: null
20
  scalars_only: false
21
  target: ${spacing}
22
+ clamp:
23
+ _target_: torchio.transforms.preprocessing.intensity.clamp.Clamp
24
  out_min: -1000
25
  out_max: 1000
26
+ rescale_intensity:
27
+ _target_: torchio.transforms.preprocessing.intensity.rescale.RescaleIntensity
28
  copy: true
29
  exclude: null
30
  in_min_max:
 
38
  percentiles:
39
  - 0
40
  - 100
41
+ crop_or_pad:
42
+ _target_: torchio.transforms.preprocessing.spatial.crop_or_pad.CropOrPad
43
  copy: true
44
  exclude: null
45
  include: null
uv.lock CHANGED
@@ -116,7 +116,7 @@ name = "cffi"
116
  version = "2.0.0"
117
  source = { registry = "https://pypi.org/simple" }
118
  dependencies = [
119
- { name = "pycparser", marker = "implementation_name != 'PyPy'" },
120
  ]
121
  sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" }
122
  wheels = [
@@ -322,7 +322,7 @@ requires-dist = [
322
  { name = "scikit-learn", marker = "extra == 'demo'" },
323
  { name = "timm", specifier = "<1.0.23" },
324
  { name = "torchinfo", marker = "extra == 'demo'" },
325
- { name = "torchio", specifier = ">=0.21.1" },
326
  { name = "tqdm" },
327
  { name = "transformers" },
328
  { name = "typer" },
@@ -365,7 +365,7 @@ resolution-markers = [
365
  "python_full_version < '3.11'",
366
  ]
367
  dependencies = [
368
- { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
369
  ]
370
  sdist = { url = "https://files.pythonhosted.org/packages/66/54/eb9bfc647b19f2009dd5c7f5ec51c4e6ca831725f1aea7a993034f483147/contourpy-1.3.2.tar.gz", hash = "sha256:b6945942715a034c671b7fc54f9588126b0b8bf23db2696e3ca8328f3ff0ab54", size = 13466130, upload-time = "2025-04-15T17:47:53.79Z" }
371
  wheels = [
@@ -436,7 +436,7 @@ resolution-markers = [
436
  "python_full_version == '3.11.*'",
437
  ]
438
  dependencies = [
439
- { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
440
  ]
441
  sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" }
442
  wheels = [
@@ -599,7 +599,7 @@ name = "exceptiongroup"
599
  version = "1.3.0"
600
  source = { registry = "https://pypi.org/simple" }
601
  dependencies = [
602
- { name = "typing-extensions", marker = "python_full_version < '3.11'" },
603
  ]
604
  sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749, upload-time = "2025-05-10T17:42:51.123Z" }
605
  wheels = [
@@ -856,17 +856,17 @@ resolution-markers = [
856
  "python_full_version < '3.11'",
857
  ]
858
  dependencies = [
859
- { name = "colorama", marker = "python_full_version < '3.11' and sys_platform == 'win32'" },
860
- { name = "decorator", marker = "python_full_version < '3.11'" },
861
- { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
862
- { name = "jedi", marker = "python_full_version < '3.11'" },
863
- { name = "matplotlib-inline", marker = "python_full_version < '3.11'" },
864
- { name = "pexpect", marker = "python_full_version < '3.11' and sys_platform != 'emscripten' and sys_platform != 'win32'" },
865
- { name = "prompt-toolkit", marker = "python_full_version < '3.11'" },
866
- { name = "pygments", marker = "python_full_version < '3.11'" },
867
- { name = "stack-data", marker = "python_full_version < '3.11'" },
868
- { name = "traitlets", marker = "python_full_version < '3.11'" },
869
- { name = "typing-extensions", marker = "python_full_version < '3.11'" },
870
  ]
871
  sdist = { url = "https://files.pythonhosted.org/packages/85/31/10ac88f3357fc276dc8a64e8880c82e80e7459326ae1d0a211b40abf6665/ipython-8.37.0.tar.gz", hash = "sha256:ca815841e1a41a1e6b73a0b08f3038af9b2252564d01fc405356d34033012216", size = 5606088, upload-time = "2025-05-31T16:39:09.613Z" }
872
  wheels = [
@@ -882,17 +882,17 @@ resolution-markers = [
882
  "python_full_version == '3.11.*'",
883
  ]
884
  dependencies = [
885
- { name = "colorama", marker = "python_full_version >= '3.11' and sys_platform == 'win32'" },
886
- { name = "decorator", marker = "python_full_version >= '3.11'" },
887
- { name = "ipython-pygments-lexers", marker = "python_full_version >= '3.11'" },
888
- { name = "jedi", marker = "python_full_version >= '3.11'" },
889
- { name = "matplotlib-inline", marker = "python_full_version >= '3.11'" },
890
- { name = "pexpect", marker = "python_full_version >= '3.11' and sys_platform != 'emscripten' and sys_platform != 'win32'" },
891
- { name = "prompt-toolkit", marker = "python_full_version >= '3.11'" },
892
- { name = "pygments", marker = "python_full_version >= '3.11'" },
893
- { name = "stack-data", marker = "python_full_version >= '3.11'" },
894
- { name = "traitlets", marker = "python_full_version >= '3.11'" },
895
- { name = "typing-extensions", marker = "python_full_version == '3.11.*'" },
896
  ]
897
  sdist = { url = "https://files.pythonhosted.org/packages/2a/34/29b18c62e39ee2f7a6a3bba7efd952729d8aadd45ca17efc34453b717665/ipython-9.6.0.tar.gz", hash = "sha256:5603d6d5d356378be5043e69441a072b50a5b33b4503428c77b04cb8ce7bc731", size = 4396932, upload-time = "2025-09-29T10:55:53.948Z" }
898
  wheels = [
@@ -904,7 +904,7 @@ name = "ipython-pygments-lexers"
904
  version = "1.1.1"
905
  source = { registry = "https://pypi.org/simple" }
906
  dependencies = [
907
- { name = "pygments", marker = "python_full_version >= '3.11'" },
908
  ]
909
  sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" }
910
  wheels = [
@@ -2518,7 +2518,7 @@ resolution-markers = [
2518
  "python_full_version < '3.11'",
2519
  ]
2520
  dependencies = [
2521
- { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
2522
  ]
2523
  sdist = { url = "https://files.pythonhosted.org/packages/0f/37/6964b830433e654ec7485e45a00fc9a27cf868d622838f6b6d9c5ec0d532/scipy-1.15.3.tar.gz", hash = "sha256:eae3cf522bc7df64b42cad3925c876e1b0b6c35c1337c93e12c0f366f55b0eaf", size = 59419214, upload-time = "2025-05-08T16:13:05.955Z" }
2524
  wheels = [
@@ -2578,7 +2578,7 @@ resolution-markers = [
2578
  "python_full_version == '3.11.*'",
2579
  ]
2580
  dependencies = [
2581
- { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
2582
  ]
2583
  sdist = { url = "https://files.pythonhosted.org/packages/4c/3b/546a6f0bfe791bbb7f8d591613454d15097e53f906308ec6f7c1ce588e8e/scipy-1.16.2.tar.gz", hash = "sha256:af029b153d243a80afb6eabe40b0a07f8e35c9adc269c019f364ad747f826a6b", size = 30580599, upload-time = "2025-09-11T17:48:08.271Z" }
2584
  wheels = [
@@ -2899,12 +2899,13 @@ wheels = [
2899
 
2900
  [[package]]
2901
  name = "torchio"
2902
- version = "0.21.1"
2903
  source = { registry = "https://pypi.org/simple" }
2904
  dependencies = [
2905
  { name = "deprecated" },
2906
  { name = "einops" },
2907
  { name = "humanize" },
 
2908
  { name = "nibabel" },
2909
  { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
2910
  { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
@@ -2917,9 +2918,9 @@ dependencies = [
2917
  { name = "tqdm" },
2918
  { name = "typer" },
2919
  ]
2920
- sdist = { url = "https://files.pythonhosted.org/packages/a1/66/f0d0e364ce656f453662da7f4036f0260bb7a8e3c463f2b0dc88dcebabab/torchio-0.21.1.tar.gz", hash = "sha256:d5b56a09e8e83a22de3f8f048698e613fe826b01a4a8f9f4bbf370174f6e3e97", size = 144677, upload-time = "2025-12-24T22:47:46.404Z" }
2921
  wheels = [
2922
- { url = "https://files.pythonhosted.org/packages/78/62/750da010b9b8be2e4d08e259d4450bd3e3d02f4a4eca50170b7112c0e65e/torchio-0.21.1-py3-none-any.whl", hash = "sha256:895c538346a52d0d7d33ffd98d6be7f4f0a97bd17d0e9f78b8fad7a3ab6c8e10", size = 194273, upload-time = "2025-12-24T22:47:44.477Z" },
2923
  ]
2924
 
2925
  [[package]]
 
116
  version = "2.0.0"
117
  source = { registry = "https://pypi.org/simple" }
118
  dependencies = [
119
+ { name = "pycparser" },
120
  ]
121
  sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" }
122
  wheels = [
 
322
  { name = "scikit-learn", marker = "extra == 'demo'" },
323
  { name = "timm", specifier = "<1.0.23" },
324
  { name = "torchinfo", marker = "extra == 'demo'" },
325
+ { name = "torchio", specifier = ">=1.1.0,<2" },
326
  { name = "tqdm" },
327
  { name = "transformers" },
328
  { name = "typer" },
 
365
  "python_full_version < '3.11'",
366
  ]
367
  dependencies = [
368
+ { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" } },
369
  ]
370
  sdist = { url = "https://files.pythonhosted.org/packages/66/54/eb9bfc647b19f2009dd5c7f5ec51c4e6ca831725f1aea7a993034f483147/contourpy-1.3.2.tar.gz", hash = "sha256:b6945942715a034c671b7fc54f9588126b0b8bf23db2696e3ca8328f3ff0ab54", size = 13466130, upload-time = "2025-04-15T17:47:53.79Z" }
371
  wheels = [
 
436
  "python_full_version == '3.11.*'",
437
  ]
438
  dependencies = [
439
+ { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" } },
440
  ]
441
  sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" }
442
  wheels = [
 
599
  version = "1.3.0"
600
  source = { registry = "https://pypi.org/simple" }
601
  dependencies = [
602
+ { name = "typing-extensions" },
603
  ]
604
  sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749, upload-time = "2025-05-10T17:42:51.123Z" }
605
  wheels = [
 
856
  "python_full_version < '3.11'",
857
  ]
858
  dependencies = [
859
+ { name = "colorama", marker = "sys_platform == 'win32'" },
860
+ { name = "decorator" },
861
+ { name = "exceptiongroup" },
862
+ { name = "jedi" },
863
+ { name = "matplotlib-inline" },
864
+ { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" },
865
+ { name = "prompt-toolkit" },
866
+ { name = "pygments" },
867
+ { name = "stack-data" },
868
+ { name = "traitlets" },
869
+ { name = "typing-extensions" },
870
  ]
871
  sdist = { url = "https://files.pythonhosted.org/packages/85/31/10ac88f3357fc276dc8a64e8880c82e80e7459326ae1d0a211b40abf6665/ipython-8.37.0.tar.gz", hash = "sha256:ca815841e1a41a1e6b73a0b08f3038af9b2252564d01fc405356d34033012216", size = 5606088, upload-time = "2025-05-31T16:39:09.613Z" }
872
  wheels = [
 
882
  "python_full_version == '3.11.*'",
883
  ]
884
  dependencies = [
885
+ { name = "colorama", marker = "sys_platform == 'win32'" },
886
+ { name = "decorator" },
887
+ { name = "ipython-pygments-lexers" },
888
+ { name = "jedi" },
889
+ { name = "matplotlib-inline" },
890
+ { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" },
891
+ { name = "prompt-toolkit" },
892
+ { name = "pygments" },
893
+ { name = "stack-data" },
894
+ { name = "traitlets" },
895
+ { name = "typing-extensions", marker = "python_full_version < '3.12'" },
896
  ]
897
  sdist = { url = "https://files.pythonhosted.org/packages/2a/34/29b18c62e39ee2f7a6a3bba7efd952729d8aadd45ca17efc34453b717665/ipython-9.6.0.tar.gz", hash = "sha256:5603d6d5d356378be5043e69441a072b50a5b33b4503428c77b04cb8ce7bc731", size = 4396932, upload-time = "2025-09-29T10:55:53.948Z" }
898
  wheels = [
 
904
  version = "1.1.1"
905
  source = { registry = "https://pypi.org/simple" }
906
  dependencies = [
907
+ { name = "pygments" },
908
  ]
909
  sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" }
910
  wheels = [
 
2518
  "python_full_version < '3.11'",
2519
  ]
2520
  dependencies = [
2521
+ { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" } },
2522
  ]
2523
  sdist = { url = "https://files.pythonhosted.org/packages/0f/37/6964b830433e654ec7485e45a00fc9a27cf868d622838f6b6d9c5ec0d532/scipy-1.15.3.tar.gz", hash = "sha256:eae3cf522bc7df64b42cad3925c876e1b0b6c35c1337c93e12c0f366f55b0eaf", size = 59419214, upload-time = "2025-05-08T16:13:05.955Z" }
2524
  wheels = [
 
2578
  "python_full_version == '3.11.*'",
2579
  ]
2580
  dependencies = [
2581
+ { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" } },
2582
  ]
2583
  sdist = { url = "https://files.pythonhosted.org/packages/4c/3b/546a6f0bfe791bbb7f8d591613454d15097e53f906308ec6f7c1ce588e8e/scipy-1.16.2.tar.gz", hash = "sha256:af029b153d243a80afb6eabe40b0a07f8e35c9adc269c019f364ad747f826a6b", size = 30580599, upload-time = "2025-09-11T17:48:08.271Z" }
2584
  wheels = [
 
2899
 
2900
  [[package]]
2901
  name = "torchio"
2902
+ version = "1.2.1"
2903
  source = { registry = "https://pypi.org/simple" }
2904
  dependencies = [
2905
  { name = "deprecated" },
2906
  { name = "einops" },
2907
  { name = "humanize" },
2908
+ { name = "jaxtyping" },
2909
  { name = "nibabel" },
2910
  { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
2911
  { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
 
2918
  { name = "tqdm" },
2919
  { name = "typer" },
2920
  ]
2921
+ sdist = { url = "https://files.pythonhosted.org/packages/fc/4a/b2d36f6d5933b3a63792ba48f49a90365baa04e38bca87b531005ad87f4c/torchio-1.2.1.tar.gz", hash = "sha256:5bddd38217c2ba9c897e1e8fd96d26644e492d7af74b5048866abdd764606152", size = 154359, upload-time = "2026-06-02T15:02:23.975Z" }
2922
  wheels = [
2923
+ { url = "https://files.pythonhosted.org/packages/50/76/f07c00b543994a2920625d1a2965c96d51c8868d6acd02ac3262bae931e6/torchio-1.2.1-py3-none-any.whl", hash = "sha256:9b3f8018865f7204cd98d48bc4e3f752de0678228813639ac5f177cdf074a9e4", size = 203555, upload-time = "2026-06-02T15:02:25.563Z" },
2924
  ]
2925
 
2926
  [[package]]