mirrors/deep-person-reid
1
0
Fork 0
mirror of https://github.com/KaiyangZhou/deep-person-reid.git synced 2025-06-03 14:53:23 +08:00
Code Issues Projects Releases Wiki Activity

update isinstance(outputs, (tuple, list))

Browse Source
This commit is contained in:
KaiyangZhou 2018-10-25 17:45:00 +01:00
parent 602971e4d7
commit 478da99655
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
train_imgreid_xent.py
View File

@ -287,7 +287,7 @@ def train(epoch, model, criterion, optimizer, trainloader, use_gpu, freeze_bn=Fa
imgs, pids = imgs.cuda(), pids.cuda() imgs, pids = imgs.cuda(), pids.cuda()
outputs = model(imgs) outputs = model(imgs)
if isinstance(outputs, tuple): if isinstance(outputs, (tuple, list)):
loss = DeepSupervision(criterion, outputs, pids) loss = DeepSupervision(criterion, outputs, pids)
else: else:
loss = criterion(outputs, pids) loss = criterion(outputs, pids)

6
train_imgreid_xent_htri.py
View File

@ -275,17 +275,17 @@ def train(epoch, model, criterion_xent, criterion_htri, optimizer, trainloader,
outputs, features = model(imgs) outputs, features = model(imgs)
if args.htri_only: if args.htri_only:
if isinstance(features, tuple): if isinstance(features, (tuple, list)):
loss = DeepSupervision(criterion_htri, features, pids) loss = DeepSupervision(criterion_htri, features, pids)
else: else:
loss = criterion_htri(features, pids) loss = criterion_htri(features, pids)
else: else:
if isinstance(outputs, tuple): if isinstance(outputs, (tuple, list)):
xent_loss = DeepSupervision(criterion_xent, outputs, pids) xent_loss = DeepSupervision(criterion_xent, outputs, pids)
else: else:
xent_loss = criterion_xent(outputs, pids) xent_loss = criterion_xent(outputs, pids)
if isinstance(features, tuple): if isinstance(features, (tuple, list)):
htri_loss = DeepSupervision(criterion_htri, features, pids) htri_loss = DeepSupervision(criterion_htri, features, pids)
else: else:
htri_loss = criterion_htri(features, pids) htri_loss = criterion_htri(features, pids)

3
train_vidreid_xent.py
View File

@ -284,6 +284,9 @@ def train(epoch, model, criterion, optimizer, trainloader, use_gpu, freeze_bn=Fa
imgs, pids = imgs.cuda(), pids.cuda() imgs, pids = imgs.cuda(), pids.cuda()
outputs = model(imgs) outputs = model(imgs)
if isinstance(outputs, (tuple, list)):
loss = DeepSupervision(criterion, outputs, pids)
else:
loss = criterion(outputs, pids) loss = criterion(outputs, pids)
optimizer.zero_grad() optimizer.zero_grad()
loss.backward() loss.backward()

6
train_vidreid_xent_htri.py
View File

@ -272,17 +272,17 @@ def train(epoch, model, criterion_xent, criterion_htri, optimizer, trainloader,
outputs, features = model(imgs) outputs, features = model(imgs)
if args.htri_only: if args.htri_only:
if isinstance(features, tuple): if isinstance(features, (tuple, list)):
loss = DeepSupervision(criterion_htri, features, pids) loss = DeepSupervision(criterion_htri, features, pids)
else: else:
loss = criterion_htri(features, pids) loss = criterion_htri(features, pids)
else: else:
if isinstance(outputs, tuple): if isinstance(outputs, (tuple, list)):
xent_loss = DeepSupervision(criterion_xent, outputs, pids) xent_loss = DeepSupervision(criterion_xent, outputs, pids)
else: else:
xent_loss = criterion_xent(outputs, pids) xent_loss = criterion_xent(outputs, pids)
if isinstance(features, tuple): if isinstance(features, (tuple, list)):
htri_loss = DeepSupervision(criterion_htri, features, pids) htri_loss = DeepSupervision(criterion_htri, features, pids)
else: else:
htri_loss = criterion_htri(features, pids) htri_loss = criterion_htri(features, pids)