solve conflict

open-mmlab · Jan 2, 2023 · 6e0c593 · 6e0c593
1 parent 9baec65
commit 6e0c593
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/mmseg/datasets/transforms/__init__.py b/mmseg/datasets/transforms/__init__.py
@@ -4,10 +4,11 @@
                       LoadBiomedicalData, LoadBiomedicalImageFromFile,
                       LoadImageFromNDArray)
 # yapf: disable
-from .transforms import (CLAHE, AdjustGamma, BioMedicalRandomGamma, BioMedical3DRandomCrop,
+from .transforms import (CLAHE, AdjustGamma, BioMedical3DRandomCrop,
                          BioMedicalGaussianBlur, BioMedicalGaussianNoise,
-                         GenerateEdge, PhotoMetricDistortion, RandomCrop,
-                         RandomCutOut, RandomMosaic, RandomRotate, Rerange,
+                         BioMedicalRandomGamma, GenerateEdge,
+                         PhotoMetricDistortion, RandomCrop, RandomCutOut,
+                         RandomMosaic, RandomRotate, Rerange,
                          ResizeShortestEdge, ResizeToMultiple, RGB2Gray,
                          SegRescale)
 

diff --git a/tests/test_datasets/test_transform.py b/tests/test_datasets/test_transform.py
@@ -950,4 +950,4 @@ def test_BioMedicalRandomGamma():
     transform2 = TRANSFORMS.build(transform2)
     results = transform2(results)
     transformed_img = results['img']
-    assert origin_img.shape == transformed_img.shape
+    assert origin_img.shape == transformed_img.shape