updated info file format

nabirds/annotations/base.py

@@ -21,7 +21,7 @@ class BaseAnnotations(abc.ABC):
 			self.info = None
 			self.root = root_or_infofile
 		elif isfile(root_or_infofile):
-			self.root = self.root_from_infofile(root_or_infofile, parts, feature_model)
+			self.root = self.root_from_infofile(root_or_infofile, parts)
 		else:
 			raise ValueError("Root folder or info file does not exist: \"{}\"".format(
 				root_or_infofile
@@ -49,7 +49,7 @@ class BaseAnnotations(abc.ABC):
 		else:
 			return self.info.PARTS[self.part_type]
 
-	def root_from_infofile(self, info_file, parts=None, feature_model=None):
+	def root_from_infofile(self, info_file, parts=None):
 		self.info = read_info_file(info_file)
 
 		dataset_info = self.dataset_info

scripts/info_files/info.yml

@@ -4,28 +4,54 @@ DATA_DIR: datasets
 MODEL_DIR: models
 
 ############ Existing models
+### weights are used for fine-tuning
+### ft_weights are used for feature extraction
 MODELS:
-  inception:    &inception
-    class: InceptionV3
+  inception_inat:    &inception_inat
+    # class: InceptionV3
     folder: inception
-    weights: ft_inat/model.ckpt.npz
+    class_key: inception
+    weights: model.inat.ckpt.npz
     ft_weights: ft_inat/model.ckpt.npz
 
-  inception_tf:  &inception_tf
-    class: InceptionV3_TF
+  inception_imagenet:    &inception_inet
+    # class: InceptionV3
+    folder: inception
+    class_key: inception
+    weights: model.imagenet.ckpt.npz
+    ft_weights: ft_imagenet/model.ckpt.npz
+
+  inception:    &inception
+    <<: *inception_inat
+
+  inception_tf_inat:  &inception_tf_inat
+    # class: InceptionV3_TF
     folder: inception_tf
-    weights: ft_inat/inception_v3_iNat_299.ckpt
+    class_key: inception_tf
+    weights: inception_v3_iNat_299.ckpt
     ft_weights: ft_inat/inception_v3_iNat_299.ckpt
 
+  inception_tf_inet:  &inception_tf_inet
+    # class: InceptionV3_TF
+    folder: inception_tf
+    class_key: inception_tf
+    weights: inception_v3_ILSVRC_299.ckpt
+    ft_weights: ft_inat/inception_v3_ILSVRC_299.ckpt
+
+  inception_tf:  &inception_tf
+    <<: *inception_tf_inat
+
   resnet:       &resnet50
-    class: ResnetLayers
+    # class: ResnetLayers
     folder: resnet
+    class_key: resnet
     weights: model.npz
     ft_weights: ft_cub200/model.npz
 
   vgg19:       &vgg19
-    class: VGG19Layers
+    # class: VGG19Layers
     folder: vgg19
+    class_key: vgg19
     weights: model.npz
     ft_weights: ft_cub200/model.npz