Update siamese_model.t7

app/Hackathon_setup/face_recognition.py

@@ -1,4 +1,3 @@
-from . import face_recognition_model
 import numpy as np
 import cv2
 from matplotlib import pyplot as plt
@@ -72,30 +71,21 @@ def get_similarity(img1, img2):
     ##the same path as this file, we recommend to put in the same directory                 ##
     ##########################################################################################
     ##########################################################################################
- 
+    feature_net = face_recognition_model.Siamese()
+    model = torch.load('./siamese_model.t7', map_location=device)
+    feature_net.load_state_dict(model['net_dict'])
 
-    feature_net = Siamese()
-    ckpt = torch.load(current_path + '/siamese_model.t7', map_location=device)
-    # model_path = current_path + "/Hackathon-setup/siamese_model.t7"
-    feature_net.load_state_dict(ckpt['net_dict'])
-    # model.eval()
+   
 
-    with torch.no_grad():
-        output1, output2 = feature_net(face1.to(device), face2.to(device))
-        # Calculate similarity measure - for instance, using cosine similarity
-        euclidean_distance = F.pairwise_distance(output1, output2)
-    
-    return euclidean_distance.item()
+    output1, output2 = feature_net(Variable(face1).to(device), Variable(face2).to(device))
+    euclidean_distance = F.pairwise_distance(output1, output2)
 
-    # ckpt = torch.load(current_path + "/Hackathon-setup/siamese_model.t7", map_location=device)
-    # # YOUR CODE HERE, load the model
-    # similarity_measure = ckpt(face1.to(device), face2.to(device))
-    # # YOUR CODE HERE, return similarity measure using your model
+  
+    return euclidean_distance.item()
+    # YOUR CODE HERE, load the model
+    
+    # YOUR CODE HERE, return similarity measure using your model
     
-    # return similarity_measure
-
-
-    # Load the Siamese network model
     
     
 #1) Image captured from mobile is passed as parameter to this function in the API call, It returns the face class in the string form ex: "Person1"

app/Hackathon_setup/face_recognition_model.py

@@ -14,9 +14,10 @@ trnscm = transforms.Compose([transforms.Resize((100,100)), transforms.ToTensor()
 class Siamese(torch.nn.Module):
     def __init__(self):
         super(Siamese, self).__init__()
-        #YOUR CODE HERE
+        super(SiameseNetwork, self).__init__()
         self.cnn1 = nn.Sequential(
-            nn.ReflectionPad2d(1),       #Pads the input tensor using the reflection of the input boundary, it similar to the padding.
+            nn.ReflectionPad2d(1),
+            # Pads the input tensor using the reflection of the input boundary, it similar to the padding.
             nn.Conv2d(1, 4, kernel_size=3),
             nn.ReLU(inplace=True),
             nn.BatchNorm2d(4),
@@ -26,7 +27,6 @@ class Siamese(torch.nn.Module):
             nn.ReLU(inplace=True),
             nn.BatchNorm2d(8),
 
-
             nn.ReflectionPad2d(1),
             nn.Conv2d(8, 8, kernel_size=3),
             nn.ReLU(inplace=True),
@@ -34,26 +34,28 @@ class Siamese(torch.nn.Module):
         )
 
         self.fc1 = nn.Sequential(
-            nn.Linear(8*100*100, 500),
+            nn.Linear(8 * 100 * 100, 500),
             nn.ReLU(inplace=True),
 
             nn.Linear(500, 500),
             nn.ReLU(inplace=True),
 
             nn.Linear(500, 5))
-        
+        #YOUR CODE HERE
+        # forward_once is for one image. This can be used while classifying the face images
+        # forward_once is for one image. This can be used while classifying the face images
     def forward_once(self, x):
         output = self.cnn1(x)
         output = output.view(output.size()[0], -1)
         output = self.fc1(output)
         return output
 
-    def forward(self, input1, input2):
+    def forward(self, x):
         output1 = self.forward_once(input1)
         output2 = self.forward_once(input2)
         return output1, output2
-
-
+        # remove 'pass' once you have written your code
+        #YOUR CODE HERE
         
 ##########################################################################################################
 ## Sample classification network (Specify if you are using a pytorch classifier during the training)    ##
@@ -61,14 +63,6 @@ class Siamese(torch.nn.Module):
 ##########################################################################################################
 
 # YOUR CODE HERE for pytorch classifier
-num_of_classes = 6
-classifier = nn.Sequential(nn.Linear(256, 64),
-                           nn.BatchNorm1d(64),
-                           nn.ReLU(),
-                           nn.Linear(64, 32),
-                           nn.BatchNorm1d(32),
-                           nn.ReLU(),
-                           nn.Linear(32, num_of_classes))
 
 # Definition of classes as dictionary
-classes = ['person1','person2','person3','person4','person5','person6']
+classes = ['person1','person2','person3','person4','person5','person6','person7']

app/Hackathon_setup/siamese_model.t7

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89ba48883946d0b23823b102e7f5faea3bd0a2d9e3e43e42b2c81cba73f46098
-size 161026623
+oid sha256:b9f59cf1183afc46088d6974f13e190ff3f3304be426e7e2491a10855b57011d
+size 161529663