From 514b4fb5543dc2ea2f1c70b6fefcd5b8f0ab548e Mon Sep 17 00:00:00 2001
From: lynn <lyx95lynn@gmail.com>
Date: Sun, 29 Sep 2019 13:13:23 +0800
Subject: [PATCH] test

---
 cfg/ccmcpe.json.legacy | 22 ++++++++++++++++++++++
 models.py              |  2 +-
 syncbn                 |  1 +
 track.py               | 12 +++++++++---
 utils/utils.py         |  1 -
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 cfg/ccmcpe.json.legacy
 create mode 160000 syncbn

diff --git a/cfg/ccmcpe.json.legacy b/cfg/ccmcpe.json.legacy
new file mode 100644
index 0000000..4ab60a3
--- /dev/null
+++ b/cfg/ccmcpe.json.legacy
@@ -0,0 +1,22 @@
+{
+    "train":
+    {
+        "mot17":"./data/mot17.train",
+        "caltech":"./data/caltech.train",
+        "citypersons":"./data/citypersons.train",
+        "cuhksysu":"./data/cuhksysu.train",
+        "prw":"./data/prw.train",
+        "eth":"./data/eth.train"
+    },
+    "test_emb":
+    {
+        "caltech":"./data/caltech.val",
+        "cuhksysu":"./data/cuhksysu.val",
+        "prw":"./data/prw.val"
+    },
+    "test":
+    {
+        "caltech+citypersons":"./data/caltech+citypersons.val"
+    },
+    "names": "./data/mot.names"
+}
diff --git a/models.py b/models.py
index bac66fd..ffb622f 100644
--- a/models.py
+++ b/models.py
@@ -185,7 +185,7 @@ class YOLOLayer(nn.Module):
             #loss = torch.exp(-self.s_r)*lbox + torch.exp(-self.s_c)*lconf + torch.exp(-self.s_id)*lid + \
             #       (self.s_r + self.s_c + self.s_id)
             #loss *= 0.5
-            loss = lbox + lconf + lid
+            loss = 1*lbox + 1*lconf + 1*lid
 
             return loss, loss.item(), lbox.item(), lconf.item(), lid.item(), nT
 
diff --git a/syncbn b/syncbn
new file mode 160000
index 0000000..265a705
--- /dev/null
+++ b/syncbn
@@ -0,0 +1 @@
+Subproject commit 265a7059ebbd20c27a81c3d74d43773779fe70d7
diff --git a/track.py b/track.py
index f705bfc..c8bc2f4 100644
--- a/track.py
+++ b/track.py
@@ -153,7 +153,13 @@ if __name__ == '__main__':
                       CVPR19-02
                       CVPR19-03
                       CVPR19-05'''
-        data_root = '/home/wangzd/datasets/MOT/MOT19/train'
+        seqs_str = '''KITTI-13
+                      KITTI-17
+                      ADL-Rundle-6
+                      PETS09-S2L1
+                      TUD-Campus
+                      TUD-Stadtmitte'''
+        data_root = '/home/liuyx/datasets/MOT/MOT15/train'
     else:
         seqs_str = '''MOT16-01
                      MOT16-03
@@ -162,13 +168,13 @@ if __name__ == '__main__':
                      MOT16-08
                      MOT16-12
                      MOT16-14'''
-        data_root = '/home/wangzd/datasets/MOT/MOT16/test'
+        data_root = '/home/liuyx/datasets/MOT/MOT16/test'
     seqs = [seq.strip() for seq in seqs_str.split()]
 
     main(opt,
          data_root=data_root,
          seqs=seqs,
-         exp_name='darknet53',
+         exp_name=opt.weights.split('/')[-2],
          show_image=False,
          save_images=opt.save_images, 
          save_videos=opt.save_videos)
diff --git a/utils/utils.py b/utils/utils.py
index 195a5a7..ddd91fa 100644
--- a/utils/utils.py
+++ b/utils/utils.py
@@ -12,7 +12,6 @@ import torch.nn.functional as F
 
 from utils import torch_utils
 import maskrcnn_benchmark.layers.nms as nms
-from external.lib.nms.cpu_nms import cpu_soft_nms
 # Set printoptions
 torch.set_printoptions(linewidth=1320, precision=5, profile='long')
 np.set_printoptions(linewidth=320, formatter={'float_kind': '{:11.5g}'.format})  # format short g, %precision=5