fix bug

hhaAndroid · Oct 31, 2023 · 9bd7aec · 9bd7aec
1 parent d3ff6e0
commit 9bd7aec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/configs/odinw/glip_atss_swin-t_a_fpn_dyhead_pretrain_odinw13.py b/configs/odinw/glip_atss_swin-t_a_fpn_dyhead_pretrain_odinw13.py
@@ -252,7 +252,7 @@
 metrics = [
     val_evaluator_AerialMaritimeDrone, val_evaluator_Aquarium,
     val_evaluator_CottontailRabbits, val_evaluator_EgoHands,
-    dataset_NorthAmericaMushrooms, val_evaluator_Packages,
+    val_evaluator_NorthAmericaMushrooms, val_evaluator_Packages,
     val_evaluator_PascalVOC, val_evaluator_pistols, val_evaluator_pothole,
     val_evaluator_Raccoon, val_evaluator_ShellfishOpenImages,
     val_evaluator_thermalDogsAndPeople, val_evaluator_VehiclesOpenImages

diff --git a/mmdet/datasets/dataset_wrappers.py b/mmdet/datasets/dataset_wrappers.py
@@ -258,3 +258,8 @@ def __init__(self,
     def get_dataset_source(self, idx: int) -> int:
         dataset_idx, _ = self._get_ori_dataset_idx(idx)
         return dataset_idx
+
+    def __getitem__(self, idx):
+        data_info = super().__getitem__(idx)
+        data_info['data_samples'].dataset_idx = self.get_dataset_source(idx)
+        return data_info
diff --git a/mmdet/evaluation/evaluator/multi_datasets_evaluator.py b/mmdet/evaluation/evaluator/multi_datasets_evaluator.py
@@ -35,7 +35,6 @@ def __init__(self, metrics: Union[ConfigType, BaseMetric, Sequence],
                  dataset_prefixes: Sequence[str]) -> None:
         super().__init__(metrics)
         self.dataset_prefixes = dataset_prefixes
-        self._count = -1
         self._setups = False
 
     def _get_cumulative_sizes(self):
@@ -66,8 +65,7 @@ def process(self,
         assert len(dataset_slices) == len(self.dataset_prefixes)
 
         for data, data_sample in zip(data_batch, data_samples):
-            self._count += 1
-            dataset_idx = bisect.bisect_right(dataset_slices, self._count)
+            dataset_idx = data_sample.dataset_idx
             if isinstance(data_sample, BaseDataElement):
                 self.metrics[dataset_idx].process([data],
                                                   [data_sample.to_dict()])
@@ -134,5 +132,4 @@ def evaluate(self, size: int) -> dict:
         else:
             metrics_results = [None]  # type: ignore
         broadcast_object_list(metrics_results)
-        self._count = -1
         return metrics_results[0]