소스 검색

some small fixes. Updated the CUB200-GIS dataset definitions

Dimitri Korsch 5 년 전
부모
커밋
89cf36a8a2
4개의 변경된 파일12개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      cvdatasets/annotations/__init__.py
  2. 2 0
      cvdatasets/annotations/base/parts_mixin.py
  3. 0 0
      cvdatasets/annotations/impl/__init__.py
  4. 9 0
      scripts/info_files/info.yml

+ 1 - 0
cvdatasets/annotations/__init__.py

@@ -18,6 +18,7 @@ class AnnotationType(BaseChoiceType):
 	CUB200 = CUB_Annotations
 	CUB200 = CUB_Annotations
 	CUB200_2FOLD = partial(CUB_Annotations)
 	CUB200_2FOLD = partial(CUB_Annotations)
 	CUB200_GOOGLE = partial(CUB_Annotations)
 	CUB200_GOOGLE = partial(CUB_Annotations)
+	CUB200_GOOGLE_SEM = partial(CUB_Annotations)
 	NAB = NAB_Annotations
 	NAB = NAB_Annotations
 	CARS = CARS_Annotations
 	CARS = CARS_Annotations
 	DOGS = DOGS_Annotations
 	DOGS = DOGS_Annotations

+ 2 - 0
cvdatasets/annotations/base/parts_mixin.py

@@ -32,6 +32,8 @@ class PartsMixin(abc.ABC):
 		if self.part_type is not None:
 		if self.part_type is not None:
 			new_kwargs["part_rescale_size"] = self.dataset_info.rescale_size
 			new_kwargs["part_rescale_size"] = self.dataset_info.rescale_size
 
 
+		new_kwargs.update(kwargs)
+
 		return super(PartsMixin, self).check_dataset_kwargs(subset, **new_kwargs)
 		return super(PartsMixin, self).check_dataset_kwargs(subset, **new_kwargs)
 
 
 	@property
 	@property

+ 0 - 0
cvdatasets/annotations/impl/__init__.py


+ 9 - 0
scripts/info_files/info.yml

@@ -65,6 +65,11 @@ DATASETS:
     annotations: "ORIGINAL"
     annotations: "ORIGINAL"
     n_classes: 200
     n_classes: 200
 
 
+  CUB200_GOOGLE_SEM: &cub200_google_sem
+    folder: birds/cub200_google_images
+    annotations: "sem_selected"
+    n_classes: 200
+
 
 
   NAB:         &nabirds
   NAB:         &nabirds
     folder: birds/nabirds
     folder: birds/nabirds
@@ -176,6 +181,10 @@ PARTS:
     <<: *cub200_google
     <<: *cub200_google
     <<: *parts_global
     <<: *parts_global
 
 
+  CUB200_GOOGLE_SEM_GLOBAL:
+    <<: *cub200_google_sem
+    <<: *parts_global
+
 
 
   CARS_GLOBAL:
   CARS_GLOBAL:
     <<: *cars
     <<: *cars