update

Shank2358 · Sep 9, 2022 · f90a5db · f90a5db
1 parent 7c227ff
commit f90a5db
Show file tree

Hide file tree

Showing 147 changed files with 31,336 additions and 971 deletions.
diff --git a/config/__pycache__/config.cpython-38.pyc b/config/__pycache__/config.cpython-38.pyc
diff --git a/config/config.py b/config/config.py
@@ -1,6 +1,13 @@
-DATA_PATH = "/home/hzc/DroneVehicle/"
+# coding=utf-8
+DATA_PATH = "F:/Datasets/HRSC2016/test/"
+#DATA_PATH = "F:/Datasets/DOTAx/test/"#
+#DATA_PATH = 'F:/Datasets/DroneVehicle/test/'
+#DATA_PATH = "/opt/datasets/DOTA/"
 PROJECT_PATH = "./"
 
+# DATA = {"CLASSES": ['car', 'truck', 'bus', 'van', 'freight car'],
+#         "NUM": 5}
+
 # DATA = {"CLASSES": ['plane',
 #                     'baseball-diamond',
 #                     'bridge',
@@ -10,40 +17,35 @@
 #                     'ship',
 #                     'tennis-court',
 #                     'basketball-court',
-#                     'storage-tank', 'soccer-ball-field', 'roundabout', 'harbor', 'swimming-pool', 'helicopter'],#,'container-crane', 'airport', 'helipad','container-crane', 'airport', 'helipad'
+#                     'storage-tank', 'soccer-ball-field', 'roundabout', 'harbor', 'swimming-pool', 'helicopter'],
 #         "NUM": 15}
 
-DATA = {"CLASSES": ['ship'],
-        "NUM": 1}
+DATA = {"CLASSES": ['ship'], "NUM": 1}
 
-DATASET_NAME = "train_HRSC2016" #"train_DOTAx"
-MODEL = {"ANCHORS":[[(2.80340246, 2.87380792), (4.23121697, 6.44043634), (7.38428433, 3.82613533)],
-        [(4.2460819, 4.349495965), (4.42917327, 10.59395029), (8.24772929, 6.224761455)],
-        [(6.02687863, 5.92446062), (7.178407523, 10.86361071), (15.30253702, 12.62863728)]] ,
-         "STRIDES":[8, 16, 32], "SCALES_PER_LAYER": 3}
+DATASET_NAME = "train_HRSC2016"
+MODEL = {"STRIDES":[8, 16, 32]}
 
 MAX_LABEL = 1000
 SHOW_HEATMAP = False
 SCALE_FACTOR = 2.0
 SCALE_FACTOR_A = 2.0
 
 TRAIN = {
-    "Transformer_SIZE": 896,
     "EVAL_TYPE": 'VOC',
     "TRAIN_IMG_SIZE": 800,
-    "TRAIN_IMG_NUM": 79780,
+    "TRAIN_IMG_NUM": 63182,
     "AUGMENT": True,
     "MULTI_SCALE_TRAIN": True,
     "MULTI_TRAIN_RANGE": [23, 28, 1],
     "BATCH_SIZE": 18,
-    "IOU_THRESHOLD_LOSS": 0.5,
-    "EPOCHS": 150,
-    "NUMBER_WORKERS": 8,
+    "IOU_THRESHOLD_LOSS": 0.6,
+    "EPOCHS": 51,
+    "NUMBER_WORKERS": 12,
     "MOMENTUM": 0.9,
     "WEIGHT_DECAY": 0.0005,
     "LR_INIT": 2e-4,
     "LR_END": 1e-6,
-    "WARMUP_EPOCHS": 5,
+    "WARMUP_EPOCHS": 3,
     "IOU_TYPE": 'GIOU'
 }
 
@@ -52,15 +54,15 @@
     "EVAL_JSON": 'test.json',
     "EVAL_NAME": 'test',
     "NUM_VIS_IMG": 0,
-    "TEST_IMG_SIZE": 896,
+    "TEST_IMG_SIZE": 800,
     "BATCH_SIZE": 4,
-    "NUMBER_WORKERS": 16,
-    "CONF_THRESH": 0.06,
-    "NMS_THRESH": 0.4,
+    "NUMBER_WORKERS": 24,
+    "CONF_THRESH": 0.2,
+    "NMS_THRESH": 0.45,
     "IOU_THRESHOLD": 0.5,
     "NMS_METHODS": 'NMS',
     "MULTI_SCALE_TEST": False,
-    "MULTI_TEST_RANGE": [832, 992, 32],
+    "MULTI_TEST_RANGE": [736, 864, 96],
     "FLIP_TEST": False
 }
 

diff --git a/dataR/trainDroneVehicle.txt b/dataR/trainDroneVehicle.txt
diff --git a/dataR/trainIR.txt b/dataR/trainIR.txt
diff --git a/dataloadR/__pycache__/augmentations.cpython-38.pyc b/dataloadR/__pycache__/augmentations.cpython-38.pyc
diff --git a/dataloadR/__pycache__/datasets_obb.cpython-38.pyc b/dataloadR/__pycache__/datasets_obb.cpython-38.pyc
diff --git a/dataloadR/__pycache__/datasets_obb_pro.cpython-38.pyc b/dataloadR/__pycache__/datasets_obb_pro.cpython-38.pyc