Model update and bug fixed

hellbell · Mar 31, 2018 · 417abd4 · 417abd4
1 parent 2930281
commit 417abd4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/adnet_compile.m b/adnet_compile.m
@@ -3,7 +3,7 @@
 % 
 % Sangdoo Yun, 2017.
 if ispc
-    cudaRoot = 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.5';
+    cudaRoot = 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v8.0';
 else
     cudaRoot = '/usr/local/cuda-8.0';
 end

diff --git a/adnet_demo.m b/adnet_demo.m
@@ -20,6 +20,6 @@
 opts.printscreen = true;
 
 rng(1004);
-[results, t, p] = test_demo(net, vid_path, opts);
+[results, t, p] = adnet_test(net, vid_path, opts);
 fprintf('precision: %f, fps: %f\n', p(20), size(results, 1)/t);
 
diff --git a/adnet_test.m b/adnet_test.m
@@ -118,16 +118,18 @@
 
         net_fc_noah = copy(net_fc);
         net_fc_noah.removeLayer('concat');
-        net_fc_noah.layers(4).inputs = 'x13';
-        net_fc_noah.params(3).value(:,:,512+1:end,:) = [];
+        net_fc_noah.layers(7).inputs = 'x16';
+        net_fc_noah.layers(8).inputs = 'x16';
+        net_fc_noah.params(5).value(:,:,512+1:end,:) = [];
+        net_fc_noah.params(7).value(:,:,512+1:end,:) = [];
         net_fc_noah.rebuild();
         net_fc_noah.move('gpu');
         net_fc.move('gpu');
 
         [net_fc_noah, ~] =  train_fc_finetune_hem(net_fc_noah, opts, ...
             pos_data, neg_data, pos_action_labels);
         for fci = 1 : 8
-            if fci == 3
+            if fci == 5 || fci == 7
                 net_fc.params(fci).value(:,:,1:512,:) = net_fc_noah.params(fci).value;
             else
                 net_fc.params(fci).value = net_fc_noah.params(fci).value;
@@ -328,16 +330,18 @@
 
         net_fc_noah = copy(net_fc);
         net_fc_noah.removeLayer('concat');
-        net_fc_noah.layers(4).inputs = 'x13';
-        net_fc_noah.params(3).value(:,:,512+1:end,:) = [];
+        net_fc_noah.layers(7).inputs = 'x16';
+        net_fc_noah.layers(8).inputs = 'x16';
+        net_fc_noah.params(5).value(:,:,512+1:end,:) = [];
+        net_fc_noah.params(7).value(:,:,512+1:end,:) = [];
         net_fc_noah.rebuild();
         net_fc_noah.move('gpu');
         net_fc.move('gpu');        
 
         [net_fc_noah, ~] =  train_fc_finetune_hem(net_fc_noah, opts, ...
             pos_data, neg_data, pos_action_labels);
         for fci = 1 : 8
-            if fci == 3
+            if fci == 5 || fci == 7
                 net_fc.params(fci).value(:,:,1:512,:) = net_fc_noah.params(fci).value;
             else
                 net_fc.params(fci).value = net_fc_noah.params(fci).value;

diff --git a/models/net_rl.mat b/models/net_rl.mat