From b9a471975c1acc1a5dafce01a06e5ed93a0e3527 Mon Sep 17 00:00:00 2001 From: "Eom, Jihwan" Date: Fri, 11 Nov 2022 00:40:31 +0900 Subject: [PATCH 1/3] Change MPA commit --- external/deep-object-reid/submodule | 2 +- external/mmsegmentation/submodule | 2 +- .../mpa_tasks/apis/classification/task.py | 8 -------- external/model-preparation-algorithm/submodule | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/external/deep-object-reid/submodule b/external/deep-object-reid/submodule index a4790d1b116..43d64593cad 160000 --- a/external/deep-object-reid/submodule +++ b/external/deep-object-reid/submodule @@ -1 +1 @@ -Subproject commit a4790d1b116e46510ca83c5afc147d537f2b8527 +Subproject commit 43d64593cad1a97cda7127fda87de0c608a8cb92 diff --git a/external/mmsegmentation/submodule b/external/mmsegmentation/submodule index c652095c2ff..2964e026cc2 160000 --- a/external/mmsegmentation/submodule +++ b/external/mmsegmentation/submodule @@ -1 +1 @@ -Subproject commit c652095c2ff342561bf9c9bdf8567522cf11d19a +Subproject commit 2964e026cc28fcd4854a10d983653522628a970e diff --git a/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py b/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py index 66972cf843c..88b288c69ef 100644 --- a/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py +++ b/external/model-preparation-algorithm/mpa_tasks/apis/classification/task.py @@ -368,17 +368,9 @@ def patch_color_conversion(pipeline): elif self._hierarchical: cfg.type = "MPAHierarchicalClsDataset" cfg.hierarchical_info = self._hierarchical_info - if subset == "train": - cfg.drop_last = True # For stable hierarchical information indexing else: cfg.type = "MPAClsDataset" - # In train dataset, when sample size is smaller than batch size - if subset == "train" and self._data_cfg: - train_data_cfg = Stage.get_data_cfg(self._data_cfg, "train") - if len(train_data_cfg.get("ote_dataset", [])) < self._recipe_cfg.data.get("samples_per_gpu", 2): - cfg.drop_last = False - cfg.domain = domain cfg.ote_dataset = None cfg.labels = None diff --git a/external/model-preparation-algorithm/submodule b/external/model-preparation-algorithm/submodule index 12861a91ed4..415a7978bb0 160000 --- a/external/model-preparation-algorithm/submodule +++ b/external/model-preparation-algorithm/submodule @@ -1 +1 @@ -Subproject commit 12861a91ed44be1879dccd07ffc9b5114e490705 +Subproject commit 415a7978bb07bf97eb9e94660a94a3e884656405 From 142a69c773ae25a1d6b6f97b176666d840f45350 Mon Sep 17 00:00:00 2001 From: "Eom, Jihwan" Date: Fri, 11 Nov 2022 18:46:15 +0900 Subject: [PATCH 2/3] Update MPA commit --- external/model-preparation-algorithm/submodule | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/model-preparation-algorithm/submodule b/external/model-preparation-algorithm/submodule index 415a7978bb0..726f545bc3d 160000 --- a/external/model-preparation-algorithm/submodule +++ b/external/model-preparation-algorithm/submodule @@ -1 +1 @@ -Subproject commit 415a7978bb07bf97eb9e94660a94a3e884656405 +Subproject commit 726f545bc3d3d35172fd70a2b4f7c7546b04f52d From fcb020359bf96fdd3db8392f2ed455ab8dda0933 Mon Sep 17 00:00:00 2001 From: "Eom, Jihwan" Date: Fri, 11 Nov 2022 18:57:51 +0900 Subject: [PATCH 3/3] Revert dor/mmseg commits --- external/deep-object-reid/submodule | 2 +- external/mmsegmentation/submodule | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/deep-object-reid/submodule b/external/deep-object-reid/submodule index 43d64593cad..a4790d1b116 160000 --- a/external/deep-object-reid/submodule +++ b/external/deep-object-reid/submodule @@ -1 +1 @@ -Subproject commit 43d64593cad1a97cda7127fda87de0c608a8cb92 +Subproject commit a4790d1b116e46510ca83c5afc147d537f2b8527 diff --git a/external/mmsegmentation/submodule b/external/mmsegmentation/submodule index 2964e026cc2..c652095c2ff 160000 --- a/external/mmsegmentation/submodule +++ b/external/mmsegmentation/submodule @@ -1 +1 @@ -Subproject commit 2964e026cc28fcd4854a10d983653522628a970e +Subproject commit c652095c2ff342561bf9c9bdf8567522cf11d19a