Skip to content

Commit

Permalink
[find_people/action_states] Fixed the use of the embedding model
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-mitrevski committed Aug 14, 2020
1 parent 911208f commit 082db55
Showing 1 changed file with 12 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import smach
import torch

from PIL import Image as PILImage
import cv2
import tf
import face_recognition
from sensor_msgs.msg import PointCloud2, Image
Expand All @@ -14,7 +16,7 @@
from mdr_find_people.find_people import FindPeople

from dataset_interface.siamese_net.model import SiameseNetwork
from dataset_interface.siamese_net.utils import get_grayscale_image_tensor
from dataset_interface.siamese_net.utils import get_transforms

class FindPeopleState(smach.State):
def __init__(self):
Expand Down Expand Up @@ -83,13 +85,18 @@ def execute(self, userdata):
face_view.image = face_images[i]

if self.face_embedding_model is not None:
if not face_view.image.data:
continue

face_cv2 = bridge.imgmsg_to_cv2(face_view.image)
grayscale_img = get_grayscale_image_tensor(face_cv2)
embedding = self.face_embedding_model.forward_once(grayscale_img)
face_view.embedding.embedding = embedding.tolist()
grayscale_img = cv2.cvtColor(face_cv2, cv2.COLOR_BGR2GRAY)
img_tensor = get_transforms()(PILImage.fromarray(grayscale_img))
img_tensor.unsqueeze_(0)

p.face.views.append(face_view)
embedding = self.face_embedding_model.forward_once(img_tensor)
face_view.embedding.embedding = embedding.detach().numpy().squeeze().tolist()

p.face.views.append(face_view)
pl.append(p)

# Package that actual PersonList message
Expand Down

0 comments on commit 082db55

Please sign in to comment.