modify code architecture

RocketFlash · Dec 13, 2019 · 82ab143 · 82ab143
1 parent 184e677
commit 82ab143
Show file tree

Hide file tree

Showing 23 changed files with 272 additions and 503 deletions.
diff --git a/.gitignore b/.gitignore
@@ -114,3 +114,4 @@ weights/
 plots/
 sub.csv
 core
+work_dirs/
diff --git a/configs/plates.yml b/configs/plates.yml
@@ -1,21 +1,45 @@
 input_shape :  [128, 128, 3]
-encodings_len: 256
-margin: 0.5
+encodings_len: 512
+margin: 0.4
 mode : 'triplet'
-distance_type : 'l1'
-backbone : 'resnext50'
+distance_type : 'l2'
+backbone : 'resnet18'
 backbone_weights : 'imagenet'
-optimizer : 'radam'
-learning_rate : 0.0001
-project_name : 'plates/'
 freeze_backbone : True
-augmentation_type : 'default'
+augmentation_type : None
 embeddings_normalization: True
 
-#paths
+# optimizer parameters
+optimizer : 'radam'
+learning_rate : 0.0001
+decay_factor : 0.99
+step_size : 10
+
+# embeddings learning training parameters
+n_epochs : 1000
+n_steps_per_epoch : 10
+val_batch_size : 8
+val_steps : 10
+negatives_selection_mode : 'semihard'
+mining_n_classes: 2
+mining_n_samples: 3
+
+# softmax pretraining parameters
+softmax_pretraining : True
+softmax_batch_size : 8
+softmax_val_steps : 2
+softmax_steps_per_epoch : 2
+softmax_epochs : 1000
+
+# paths
+work_dir : 'work_dirs/plates/'
 dataset_path : '/home/rauf/plates_competition/dataset/to_train/'
 tensorboard_log_path : 'tf_log/'
-weights_save_path : 'weights/'
-plots_path : 'plots/'
-encodings_path : 'encodings/'
-model_save_name : 'best_model_simple2_plates.h5'
+plot_history : True
+model_save_name : 'best_model_resnet18_plates.h5'
+encodings_save_name: 'encodings_resnet18_plates.pkl'
+
+# encodings parameters
+save_encodings : True
+max_num_samples_of_each_class : 30
+knn_k : 1
diff --git a/configs/road_signs.yml b/configs/road_signs.yml
diff --git a/configs/road_signs_mobilenetv2.yml b/configs/road_signs_mobilenetv2.yml
diff --git a/configs/road_signs_resnet18.yml b/configs/road_signs_resnet18.yml
@@ -5,16 +5,38 @@ mode : 'triplet'
 distance_type : 'l1'
 backbone : 'resnet18'
 backbone_weights : 'imagenet'
-optimizer : 'radam'
-learning_rate : 0.0001
 project_name : 'road_signs/'
-freeze_backbone : True
+freeze_backbone : False
+augmentation_type : 'default'
 embeddings_normalization: True
 
+# optimizer parameters
+optimizer : 'radam'
+learning_rate : 0.0001
+decay_factor : 0.99
+step_size : 1
+
+# embeddings learning training parameters
+n_epochs : 1000
+n_steps_per_epoch : 200
+val_batch_size : 8
+val_steps : 200
+negatives_selection_mode : 'semihard'
+mining_n_classes: 5
+mining_n_samples: 3
+
+# softmax pretraining parameters
+softmax_pretraining : True
+softmax_batch_size : 8
+softmax_val_steps : 200
+softmax_steps_per_epoch : 500
+softmax_epochs : 20
+
 #paths
 dataset_path : '/home/rauf/datasets/road_signs/road_signs_separated/'
 tensorboard_log_path : 'tf_log/'
 weights_save_path : 'weights/'
 plots_path : 'plots/'
 encodings_path : 'encodings/'
-model_save_name : 'best_model_resnet18.h5'
+model_save_name : 'best_model_resnet18.h5'
+encodings_save_name: 'encodings_resnet18.pkl'
diff --git a/configs/road_signs_resnet18_all.yml b/configs/road_signs_resnet18_all.yml
diff --git a/configs/road_signs_resnet18_max80_min30.yml b/configs/road_signs_resnet18_max80_min30.yml
diff --git a/configs/road_signs_resnet18_merged_dataset.yml b/configs/road_signs_resnet18_merged_dataset.yml
diff --git a/configs/road_signs_resnet18_mini.yml b/configs/road_signs_resnet18_mini.yml
diff --git a/configs/road_signs_resnet18_paper.yml b/configs/road_signs_resnet18_paper.yml
diff --git a/configs/road_signs_resnet18_paper_cutted.yml b/configs/road_signs_resnet18_paper_cutted.yml
diff --git a/configs/road_signs_resnet18_paper_remaining.yml b/configs/road_signs_resnet18_paper_remaining.yml
diff --git a/configs/road_signs_resnet50v2.yml b/configs/road_signs_resnet50v2.yml
diff --git a/configs/road_signs_resnet50v2_merged_dataset.yml b/configs/road_signs_resnet50v2_merged_dataset.yml
diff --git a/configs/road_signs_resnext50.yml b/configs/road_signs_resnext50.yml
diff --git a/configs/road_signs_resnext50_merged_dataset.yml b/configs/road_signs_resnext50_merged_dataset.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,3 +114,4 @@ weights/ @@
     plots/
     sub.csv
     core
+    work_dirs/