[Refactor] Refactor PackEditInputs and EditDataSample (#1573)

* refactor packeditinput and editdatasample

* move util from formatting to img_utils

* fix bugs in ut

* use permute instead of transpose in all_to_tensor

* remove undesired output results

* fix the path of results in ut

* use np.ascontiguousarray(img) in image_to_tensor

* remove entry function from unit test files

* refine sinGAN's config

Co-authored-by: LeoXing1996 <xingzn1996@hotmail.com>

.gitignore

@@ -47,6 +47,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+tests/data/out
 
 # Translations
 *.mo

configs/singan/singan_balloons.py

@@ -17,8 +17,13 @@
     test_pkl_data=test_pkl_data)
 
 # DATA
+pipeline = [
+    dict(
+        type='PackEditInputs',
+        keys=[f'real_scale{i}' for i in range(num_scales)] + ['input_sample'])
+]
 data_root = './data/singan/balloons.png'
-train_dataloader = dict(dataset=dict(data_root=data_root))
+train_dataloader = dict(dataset=dict(data_root=data_root, pipeline=pipeline))
 
 # HOOKS
 custom_hooks = [

configs/singan/singan_fish.py

@@ -41,7 +41,11 @@
 dataset_type = 'SinGANDataset'
 data_root = './data/singan/fish-crop.jpg'
 
-pipeline = [dict(type='PackEditInputs', pack_all=True)]
+pipeline = [
+    dict(
+        type='PackEditInputs',
+        keys=[f'real_scale{i}' for i in range(num_scales)] + ['input_sample'])
+]
 dataset = dict(
     type=dataset_type,
     data_root=data_root,

mmedit/apis/inferencers/inference_functions.py

@@ -303,7 +303,7 @@ def matting_inference(model, img, trimap):
     # prepare data
     data = dict(merged_path=img, trimap_path=trimap)
     _data = test_pipeline(data)
-    trimap = _data['data_samples'].trimap.data
+    trimap = _data['data_samples'].trimap
     data = dict()
     data['inputs'] = torch.cat([_data['inputs'], trimap], dim=0).float()
     data = collate([data])

mmedit/datasets/transforms/__init__.py

@@ -11,7 +11,7 @@
                    RandomResizedCrop)
 from .fgbg import (CompositeFg, MergeFgAndBg, PerturbBg, RandomJitter,
                    RandomLoadResizeBg)
-from .formatting import PackEditInputs, ToTensor
+from .formatting import PackEditInputs
 from .generate_assistant import (GenerateCoordinateAndCell,
                                  GenerateFacialHeatmap)
 from .generate_frame_indices import (GenerateFrameIndices,