From 17fefc903dc4fe12443c51316d6c743830817c3a Mon Sep 17 00:00:00 2001 From: fftx <931358699@qq.com> Date: Wed, 11 Sep 2024 19:36:54 +0800 Subject: [PATCH 1/2] fix: albu transform with redundant keys --- mmseg/datasets/transforms/transforms.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/mmseg/datasets/transforms/transforms.py b/mmseg/datasets/transforms/transforms.py index 64e23230c6..1158335821 100644 --- a/mmseg/datasets/transforms/transforms.py +++ b/mmseg/datasets/transforms/transforms.py @@ -2424,31 +2424,38 @@ def transform(self, results): # dict to albumentations format results = self.mapper(results, self.keymap_to_albu) + albumentations_results = { + k: results.pop(k) for k in ['image', 'mask'] if k in results + } + # Convert to RGB since Albumentations works with RGB images if self.bgr_to_rgb: - results['image'] = cv2.cvtColor(results['image'], + albumentations_results['image'] = cv2.cvtColor(albumentations_results['image'], cv2.COLOR_BGR2RGB) if self.additional_targets: for key, value in self.additional_targets.items(): if value == 'image': - results[key] = cv2.cvtColor(results[key], + albumentations_results[key] = cv2.cvtColor(albumentations_results[key], cv2.COLOR_BGR2RGB) # Apply Transform - results = self.aug(**results) + albumentations_results = self.aug(**albumentations_results) # Convert back to BGR if self.bgr_to_rgb: - results['image'] = cv2.cvtColor(results['image'], + albumentations_results['image'] = cv2.cvtColor(albumentations_results['image'], cv2.COLOR_RGB2BGR) if self.additional_targets: for key, value in self.additional_targets.items(): if value == 'image': - results[key] = cv2.cvtColor(results['image2'], + albumentations_results[key] = cv2.cvtColor(albumentations_results['image2'], cv2.COLOR_RGB2BGR) # back to the original format - results = self.mapper(results, self.keymap_back) + albumentations_results = self.mapper(albumentations_results, self.keymap_back) + + # 更新原始 results 中对应的键 + results.update(albumentations_results) # update final shape if self.update_pad_shape: From e73af754e488ed6433699abf654bc3f55773d0cc Mon Sep 17 00:00:00 2001 From: fftx <931358699@qq.com> Date: Wed, 11 Sep 2024 20:00:27 +0800 Subject: [PATCH 2/2] fix: replace comment using English --- mmseg/datasets/transforms/transforms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmseg/datasets/transforms/transforms.py b/mmseg/datasets/transforms/transforms.py index 1158335821..f4052adacc 100644 --- a/mmseg/datasets/transforms/transforms.py +++ b/mmseg/datasets/transforms/transforms.py @@ -2454,7 +2454,7 @@ def transform(self, results): # back to the original format albumentations_results = self.mapper(albumentations_results, self.keymap_back) - # 更新原始 results 中对应的键 + # Update corresponding keys in the original `results` results.update(albumentations_results) # update final shape