Reverts to SGD

abhi4ssj · Jan 22, 2019 · ec534f3 · ec534f3
1 parent 6dc9aa1
commit ec534f3
Show file tree

Hide file tree

Showing 24 changed files with 2,928 additions and 365 deletions.
diff --git a/datasets/eval_query.txt b/datasets/eval_query.txt
@@ -1,19 +1,19 @@
 10000100_1_CTce_ThAb.mat
-10000111_1_CTce_ThAb.mat
-10000131_1_CTce_ThAb.mat
 10000104_1_CTce_ThAb.mat
-10000112_1_CTce_ThAb.mat
-10000132_1_CTce_ThAb.mat
+10000105_1_CTce_ThAb.mat
+10000106_1_CTce_ThAb.mat
+10000108_1_CTce_ThAb.mat
 10000109_1_CTce_ThAb.mat
+10000110_1_CTce_ThAb.mat
+10000111_1_CTce_ThAb.mat
+10000112_1_CTce_ThAb.mat
 10000113_1_CTce_ThAb.mat
-10000133_1_CTce_ThAb.mat
-10000106_1_CTce_ThAb.mat
 10000127_1_CTce_ThAb.mat
-10000134_1_CTce_ThAb.mat
-10000108_1_CTce_ThAb.mat
 10000128_1_CTce_ThAb.mat
-10000135_1_CTce_ThAb.mat
 10000129_1_CTce_ThAb.mat
+10000130_1_CTce_ThAb.mat
+10000131_1_CTce_ThAb.mat
+10000133_1_CTce_ThAb.mat
+10000134_1_CTce_ThAb.mat
+10000135_1_CTce_ThAb.mat
 10000136_1_CTce_ThAb.mat
-10000110_1_CTce_ThAb.mat
-10000105_1_CTce_ThAb.mat
diff --git a/datasets/eval_support.txt b/datasets/eval_support.txt
@@ -1 +1 @@
-10000130_1_CTce_ThAb.mat
+10000132_1_CTce_ThAb.mat
diff --git a/few_shot_segmentor_model6.py b/few_shot_segmentor_model6.py
@@ -100,32 +100,33 @@ def forward(self, input):
         num_batch, ch = e_c1.size()
         e_c1 = e_c1.view(num_batch, ch, 1, 1)
 
-        # e_w1 = self.sigmoid(self.squeeze_conv_e1(e1))
         e2, out2, ind2 = self.encode2(e1)
         num_batch, ch, _, _ = out2.size()
         e_c2 = self.sigmoid(self.channel_conv_e2(out2.view(num_batch, ch, -1).mean(dim=2)))
         num_batch, ch = e_c2.size()
         e_c2 = e_c2.view(num_batch, ch, 1, 1)
-        # e_w2 = self.sigmoid(self.squeeze_conv_e2(e2))
+
         e3, _, ind3 = self.encode3(e2)
         e_w3 = self.sigmoid(self.squeeze_conv_e3(e3))
-        e4, _, ind4 = self.encode3(e3)
+        e4, _, ind4 = self.encode4(e3)
         e_w4 = self.sigmoid(self.squeeze_conv_e4(e4))
 
         bn = self.bottleneck(e4)
         bn_w = self.squeeze_conv_bn(bn)
 
-        d4 = self.decode1(bn, None, ind4)
+        d4 = self.decode4(bn, None, ind4)
         d_w4 = self.sigmoid(self.squeeze_conv_d4(d4))
-        d3 = self.decode1(d4, None, ind3)
+
+        d3 = self.decode3(d4, None, ind3)
         d_w3 = self.sigmoid(self.squeeze_conv_d3(d3))
+
         d2 = self.decode2(d3, None, ind2)
         num_batch, ch, _, _ = d2.size()
         d_c2 = self.sigmoid(self.channel_conv_d2(d2.view(num_batch, ch, -1).mean(dim=2)))
         num_batch, ch = d_c2.size()
         d_c2 = d_c2.view(num_batch, ch, 1, 1)
-        # d_w2 = self.sigmoid(self.squeeze_conv_d2(d2))
-        d1 = self.decode3(d2, None, ind1)
+
+        d1 = self.decode1(d2, None, ind1)
         num_batch, ch, _, _ = d1.size()
         d_c1 = self.sigmoid(self.channel_conv_d1(d1.view(num_batch, ch, -1).mean(dim=2)))
         num_batch, ch = d_c1.size()