Merge remote-tracking branch 'origin/master'

Author: xiaojieli0903

demo/live.py

@@ -177,7 +177,8 @@ def predict(self,img):
     top_k = (300, 200)[args.dataset == 'COCO']
     detector = Detect(num_classes,0,cfg)
     rgb_means = ((104, 117, 123),(103.94,116.78,123.68))[args.version == 'RFB_mobile']
-    transform = BaseTransform(net.size,rgb_means,(2,0,1))
+    rgb_stds = (1,1,1)
+    transform = BaseTransform(net.size,rgb_means,rgb_stds,(2,0,1))
     object_detector = ObjectDetector(net,detector,transform)
     cap = cv2.VideoCapture(0)
     while True:

refinedet_train_test.py

@@ -312,12 +312,12 @@ def train():
         load_t1 = time.time()
         if iteration % 10 == 0:
             print('Epoch:' + repr(epoch) + ' || epochiter: ' + repr(iteration % epoch_size) + '/' + repr(epoch_size)
-                  + '|| Totel iter ' +
+                  + '|| Total iter ' +
                   repr(iteration) + ' || AL: %.4f AC: %.4f OL: %.4f OC: %.4f||' % (
                 mean_arm_loss_l/10,mean_arm_loss_c/10,mean_odm_loss_l/10,mean_odm_loss_c/10) +
                 'Batch time: %.4f sec. ||' % (load_t1 - load_t0) + 'LR: %.8f' % (lr))
             log_file.write('Epoch:' + repr(epoch) + ' || epochiter: ' + repr(iteration % epoch_size) + '/' + repr(epoch_size)
-                  + '|| Totel iter ' +
+                  + '|| Total iter ' +
                    repr(iteration) + ' || AL: %.4f AC: %.4f OL: %.4f OC: %.4f||' % (
                    mean_arm_loss_l/10,mean_arm_loss_c/10,mean_odm_loss_l/10,mean_odm_loss_c/10) +
                   'Batch time: %.4f sec. ||' % (load_t1 - load_t0) + 'LR: %.8f' % (lr)+'\n')

train_test.py

@@ -321,12 +321,12 @@ def train():
         load_t1 = time.time()
         if iteration % 10 == 0:
             print('Epoch:' + repr(epoch) + ' || epochiter: ' + repr(iteration % epoch_size) + '/' + repr(epoch_size)
-                  + '|| Totel iter ' +
+                  + '|| Total iter ' +
                   repr(iteration) + ' || L: %.4f C: %.4f||' % (
                 mean_loss_l/10,mean_loss_c/10) +
                 'Batch time: %.4f sec. ||' % (load_t1 - load_t0) + 'LR: %.8f' % (lr))
             log_file.write('Epoch:' + repr(epoch) + ' || epochiter: ' + repr(iteration % epoch_size) + '/' + repr(epoch_size)
-                  + '|| Totel iter ' +
+                  + '|| Total iter ' +
                            repr(iteration) + ' || L: %.4f C: %.4f||' % (
                                mean_loss_l/10,mean_loss_c/10) +
                   'Batch time: %.4f sec. ||' % (load_t1 - load_t0) + 'LR: %.8f' % (lr)+'\n')

train_test_fssd_mobile_pre.py

@@ -319,12 +319,12 @@ def train():
         load_t1 = time.time()
         if iteration % 10 == 0:
             print(args.version+'Epoch:' + repr(epoch) + ' || epochiter: ' + repr(iteration % epoch_size) + '/' + repr(epoch_size)
-                  + '|| Totel iter ' +
+                  + '|| Total iter ' +
                   repr(iteration) + ' || L: %.4f C: %.4f||' % (
                 loss_l.data[0],loss_c.data[0]) + 
                 'Batch time: %.4f sec. ||' % (load_t1 - load_t0) + 'LR: %.8f' % (lr))
             log_file.write('Epoch:' + repr(epoch) + ' || epochiter: ' + repr(iteration % epoch_size) + '/' + repr(epoch_size)
-                  + '|| Totel iter ' +
+                  + '|| Total iter ' +
                   repr(iteration) + ' || L: %.4f C: %.4f||' % (
                       loss_l.data[0],loss_c.data[0]) +
                   'Batch time: %.4f sec. ||' % (load_t1 - load_t0) + 'LR: %.8f' % (lr)+'\n')