From b215992b7a187782cf494ab9f291195ffde9278e Mon Sep 17 00:00:00 2001
From: natanielruiz <nataniel777@hotmail.com>
Date: 星期五, 11 八月 2017 05:23:31 +0800
Subject: [PATCH] One shape param experiment

---
 code/datasets.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/code/datasets.py b/code/datasets.py
index 4d1f71f..29800fe 100644
--- a/code/datasets.py
+++ b/code/datasets.py
@@ -87,6 +87,7 @@
         img = Image.open(os.path.join(self.data_dir, self.X_train[index] + self.img_ext))
         img = img.convert(self.image_mode)
         mat_path = os.path.join(self.data_dir, self.y_train[index] + self.annot_ext)
+        shape_path = os.path.join(self.data_dir, self.y_train[index] + '_shape.npy')
 
         # Crop the face
         pt2d = utils.get_pt2d_from_mat(mat_path)
@@ -110,7 +111,12 @@
         roll = pose[2] * 180 / np.pi
         # Bin values
         bins = np.array(range(-99, 102, 3))
-        labels = torch.LongTensor(np.digitize([yaw, pitch, roll], bins) - 1)
+        binned_pose = np.digitize([yaw, pitch, roll], bins) - 1
+
+        # Get shape
+        shape = np.load(shape_path)
+
+        labels = torch.LongTensor(np.concatenate((binned_pose, shape), axis = 0))
 
         if self.transform is not None:
             img = self.transform(img)

--
Gitblit v1.8.0