From ab8e47d6bd753e074b73bdec1e1e28403faabcbf Mon Sep 17 00:00:00 2001 From: Manuel Jahn Date: Mon, 10 Jan 2022 12:23:24 +0100 Subject: [PATCH] Fixed naming :abc: --- configs/open_images_scene_images_transformer.yaml | 2 ++ scripts/make_scene_samples.py | 2 +- taming/data/annotated_objects_open_images.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/open_images_scene_images_transformer.yaml b/configs/open_images_scene_images_transformer.yaml index 810c3c8b..f4e41e0d 100644 --- a/configs/open_images_scene_images_transformer.yaml +++ b/configs/open_images_scene_images_transformer.yaml @@ -64,6 +64,7 @@ data: crop_method: random-2d random_flip: true use_group_parameter: true + use_additional_parameters: true encode_crop: true validation: target: taming.data.annotated_objects_open_images.AnnotatedObjectsOpenImages @@ -81,4 +82,5 @@ data: crop_method: center random_flip: false use_group_parameter: true + use_additional_parameters: true encode_crop: true diff --git a/scripts/make_scene_samples.py b/scripts/make_scene_samples.py index 1ffc9847..46dcca65 100644 --- a/scripts/make_scene_samples.py +++ b/scripts/make_scene_samples.py @@ -14,7 +14,7 @@ from tqdm import tqdm from scripts.make_samples import get_parser, load_model_and_dset -from taming.data.conditional_builder.object_center_points_builder import CoordinatesCenterPointsConditionalBuilder +from taming.data.conditional_builder.objects_center_points import ObjectsCenterPointsConditionalBuilder from taming.data.helper_types import BoundingBox, Annotation from taming.data.annotated_objects_dataset import AnnotatedObjectsDataset from taming.models.cond_transformer import Net2NetTransformer diff --git a/taming/data/annotated_objects_open_images.py b/taming/data/annotated_objects_open_images.py index 086ed11d..aede6803 100644 --- a/taming/data/annotated_objects_open_images.py +++ b/taming/data/annotated_objects_open_images.py @@ -81,7 +81,7 @@ def load_categories(csv_path: Path) -> Dict[str, Category]: class AnnotatedObjectsOpenImages(AnnotatedObjectsDataset): - def __init__(self, **kwargs): + def __init__(self, use_additional_parameters: bool, **kwargs): """ @param data_path: is the path to the following folder structure: open_images/ @@ -110,6 +110,7 @@ def __init__(self, **kwargs): """ super().__init__(**kwargs) + self.use_additional_parameters = use_additional_parameters self.categories = load_categories(self.paths['class_descriptions']) self.filter_categories()