Merge pull request #2 from JinkaiZheng/main

modify grew info
Gait3D · Mar 26, 2022 · 795d4c0 · 795d4c0
2 parents dc4ce35 + 5590d83
commit 795d4c0
Show file tree

Hide file tree

Showing 13 changed files with 150 additions and 15 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Gait3D-Benchmark.iml b/.idea/Gait3D-Benchmark.iml
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/config/gaitset_64pixel_GREW_office_split.yaml b/config/gaitset_64pixel_GREW_office_split.yaml
@@ -1,6 +1,6 @@
 data_cfg:
  dataset_name: GREW-office-64pixel
- dataset_root: GREW-office-64-44-pkl
+ dataset_root: GREW-64-44-pkl
  dataset_partition: ./misc/partitions/GREW_office_split.json
  num_workers: 1
  remove_no_gallery: false

diff --git a/config/gaitset_64pixel_GREW_our_split.yaml b/config/gaitset_64pixel_GREW_our_split.yaml
@@ -1,6 +1,6 @@
 data_cfg:
  dataset_name: GREW-our-64pixel
- dataset_root: GREW-our-64-44-pkl
+ dataset_root: GREW-64-44-pkl/train
  dataset_partition: ./misc/partitions/GREW_our_split.json
  num_workers: 1
  remove_no_gallery: false

diff --git a/lib/modeling/base_model.py b/lib/modeling/base_model.py
@@ -212,9 +212,9 @@ def get_loader(self, data_cfg, train=True):
  if data_cfg['dataset_root']['smpl_root'] is not None:
  dataset = DataSet_SMPLGait(data_cfg, train)
  except:
- if "GREW-office" in data_cfg['dataset_root']:
+ if "GREW-office" in data_cfg['dataset_name']:
  dataset = DataSet_GREW_office(data_cfg, train)
- elif "GREW-our" in data_cfg['dataset_root']:
+ elif "GREW-our" in data_cfg['dataset_name']:
  dataset = DataSet_GREW_our(data_cfg, train)
  else:
  dataset = DataSet(data_cfg, train)

diff --git a/lib/modeling/models/smplgait.py b/lib/modeling/models/smplgait.py
@@ -36,22 +36,21 @@ def build_network(self, model_cfg):
  self.bn3 = nn.BatchNorm1d(256)
  self.dropout2 = nn.Dropout(p=0.2)
  self.dropout3 = nn.Dropout(p=0.2)
- # self.relu = nn.ReLU()
 
  def forward(self, inputs):
  ipts, labs, _, _, seqL = inputs
 
  sils = ipts[0][0] # [n, s, h, w]
- smpls = ipts[1][0] # [n, s, h, w]
+ smpls = ipts[1][0] # [n, s, d]
 
  # extract SMPL features
  n, s, d = smpls.size()
  sps = smpls.view(-1, d)
  del smpls
 
  sps = F.relu(self.bn1(self.fc1(sps)))
- sps = F.relu(self.bn2(self.dropout2(self.fc2(sps)))) # (B, 256) or (n, c)
- sps = F.relu(self.bn3(self.dropout3(self.fc3(sps)))) # (B, 256) or (n, c)
+ sps = F.relu(self.bn2(self.dropout2(self.fc2(sps)))) # (B, 256)
+ sps = F.relu(self.bn3(self.dropout3(self.fc3(sps)))) # (B, 256)
  sps = sps.reshape(n*s, 16, 16)
  iden = Variable(torch.eye(16)).unsqueeze(0).repeat(n*s, 1, 1) # [n*s, 16, 16]
  if sps.is_cuda:
@@ -126,22 +125,21 @@ def build_network(self, model_cfg):
  self.bn3 = nn.BatchNorm1d(1024)
  self.dropout2 = nn.Dropout(p=0.2)
  self.dropout3 = nn.Dropout(p=0.2)
- # self.relu = nn.ReLU()
 
  def forward(self, inputs):
  ipts, labs, _, _, seqL = inputs
 
  sils = ipts[0][0] # [n, s, h, w]
- smpls = ipts[1][0] # [n, s, d, np]
+ smpls = ipts[1][0] # [n, s, d]
 
  # extract SMPL features
  n, s, d = smpls.size()
  sps = smpls.view(-1, d)
  del smpls
 
  sps = F.relu(self.bn1(self.fc1(sps)))
- sps = F.relu(self.bn2(self.dropout2(self.fc2(sps)))) # (B, 256) or (n, c)
- sps = F.relu(self.bn3(self.dropout3(self.fc3(sps)))) # (B, 1024) or (n, c)
+ sps = F.relu(self.bn2(self.dropout2(self.fc2(sps)))) # (B, 256)
+ sps = F.relu(self.bn3(self.dropout3(self.fc3(sps)))) # (B, 1024)
  sps = sps.reshape(n * s, 32, 32)
  iden = Variable(torch.eye(32)).unsqueeze(0).repeat(n * s, 1, 1) # [n*s, 32, 32]
  if sps.is_cuda:

diff --git a/misc/run_pretreatment_grew.sh b/misc/run_pretreatment_grew.sh
@@ -1,6 +1,6 @@
 # pretreat train set
-python misc/pretreatment_grew.py --input_path "/export/home/data/Gait/GREW/GREW" --output_path "/export/home/data/Gait/GREW/GREW-pkl" --img_h 64 --img_w 44 --subset "train"
+python misc/pretreatment_grew.py --input_path "/path/to/GREW/train" --output_path "GREW-64-44-pkl/train" --img_h 64 --img_w 44 --subset "train"
 # pretreat test-gallery set
-python misc/pretreatment_grew.py --input_path "/export/home/data/Gait/GREW/GREW" --output_path "/export/home/data/Gait/GREW/GREW-pkl" --img_h 64 --img_w 44 --subset "test/gallery"
+python misc/pretreatment_grew.py --input_path "/path/to/GREW/test/gallery" --output_path "GREW-64-44-pkl/test/gallery" --img_h 64 --img_w 44 --subset "test/gallery"
 # pretreat test-probe set
-python misc/pretreatment_grew_probe.py --input_path "/export/home/data/Gait/GREW/GREW" --output_path "/export/home/data/Gait/GREW/GREW-pkl" --img_h 64 --img_w 44
+python misc/pretreatment_grew_probe.py --input_path "/path/to/GREW/test/probe" --output_path "GREW-64-44-pkl/test/probe" --img_h 64 --img_w 44