Selaa lähdekoodia

updated info file

Dimitri Korsch 6 vuotta sitten
vanhempi
commit
ccad1be589
1 muutettua tiedostoa jossa 5 lisäystä ja 7 poistoa
  1. 5 7
      scripts/info_files/info.yml

+ 5 - 7
scripts/info_files/info.yml

@@ -5,21 +5,18 @@ MODEL_DIR: models
 
 
 ############ Existing models
 ############ Existing models
 ### weights are used for fine-tuning
 ### weights are used for fine-tuning
-### ft_weights are used for feature extraction
 MODELS:
 MODELS:
   inception_inat:    &inception_inat
   inception_inat:    &inception_inat
     # class: InceptionV3
     # class: InceptionV3
     folder: inception
     folder: inception
     class_key: inception
     class_key: inception
     weights: model.inat.ckpt.npz
     weights: model.inat.ckpt.npz
-    ft_weights: ft_inat/model.ckpt.npz
 
 
   inception_imagenet:    &inception_inet
   inception_imagenet:    &inception_inet
     # class: InceptionV3
     # class: InceptionV3
     folder: inception
     folder: inception
     class_key: inception
     class_key: inception
     weights: model.imagenet.ckpt.npz
     weights: model.imagenet.ckpt.npz
-    ft_weights: ft_imagenet/model.ckpt.npz
 
 
   inception:    &inception
   inception:    &inception
     <<: *inception_inat
     <<: *inception_inat
@@ -29,14 +26,12 @@ MODELS:
     folder: inception_tf
     folder: inception_tf
     class_key: inception_tf
     class_key: inception_tf
     weights: inception_v3_iNat_299.ckpt
     weights: inception_v3_iNat_299.ckpt
-    ft_weights: ft_inat/inception_v3_iNat_299.ckpt
 
 
   inception_tf_inet:  &inception_tf_inet
   inception_tf_inet:  &inception_tf_inet
     # class: InceptionV3_TF
     # class: InceptionV3_TF
     folder: inception_tf
     folder: inception_tf
     class_key: inception_tf
     class_key: inception_tf
     weights: inception_v3_ILSVRC_299.ckpt
     weights: inception_v3_ILSVRC_299.ckpt
-    ft_weights: ft_inat/inception_v3_ILSVRC_299.ckpt
 
 
   inception_tf:  &inception_tf
   inception_tf:  &inception_tf
     <<: *inception_tf_inat
     <<: *inception_tf_inat
@@ -46,26 +41,29 @@ MODELS:
     folder: resnet
     folder: resnet
     class_key: resnet
     class_key: resnet
     weights: model.npz
     weights: model.npz
-    ft_weights: ft_cub200/model.npz
 
 
   vgg19:       &vgg19
   vgg19:       &vgg19
     # class: VGG19Layers
     # class: VGG19Layers
     folder: vgg19
     folder: vgg19
     class_key: vgg19
     class_key: vgg19
     weights: model.npz
     weights: model.npz
-    ft_weights: ft_cub200/model.npz
 
 
 ############ Existing Datasets
 ############ Existing Datasets
 DATASETS:
 DATASETS:
   CUB200:         &cub200
   CUB200:         &cub200
     folder: birds
     folder: birds
     annotations: cub200_11_ORIGINAL
     annotations: cub200_11_ORIGINAL
+    n_classes: 200
 
 
   CARS:         &cars
   CARS:         &cars
     folder: cars
     folder: cars
     annotations: ORIGINAL
     annotations: ORIGINAL
+    n_classes: 196
 
 
 ############ Existing Part Annotations and Part Features
 ############ Existing Part Annotations and Part Features
+### feature file name composition:
+# ${BASE_DIR}/${DATA_DIR}/${DATASETS:folder}/${PART_TYPES:annotations}/features
+
 PART_TYPES:
 PART_TYPES:
   GLOBAL:         &parts_global
   GLOBAL:         &parts_global
     feature_suffix: ""
     feature_suffix: ""