diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-04-03 21:30:35 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-04-03 23:06:07 +0800 |
| commit | f6f133fa7b926ce0c7d28bbf0ba4de41b3708d4a (patch) | |
| tree | 4bf9b80c1c7a96f081a4e3b3b751145054fccc39 /utils/dataset.py | |
| parent | d12dd6b04a4e7c2b1ee43ab6f36f25d0c35ca364 (diff) | |
| parent | b9f35fbe7d78b3c478086ea26c2a76f72ce35687 (diff) | |
Merge branch 'master' into disentangling_only
# Conflicts:
# config.py
# models/hpm.py
# models/layers.py
# models/model.py
# models/part_net.py
# models/rgb_part_net.py
# test/part_net.py
# utils/configuration.py
# utils/triplet_loss.py
Diffstat (limited to 'utils/dataset.py')
| -rw-r--r-- | utils/dataset.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/dataset.py b/utils/dataset.py index c487988..387c211 100644 --- a/utils/dataset.py +++ b/utils/dataset.py @@ -111,9 +111,9 @@ class CASIAB(data.Dataset): # in Bag #2 condition from 90 degree angle classes, conditions, views = [], [], [] if selector: - selected_classes = selector.pop('classes', None) - selected_conditions = selector.pop('conditions', None) - selected_views = selector.pop('views', None) + selected_classes = selector.get('classes', None) + selected_conditions = selector.get('conditions', None) + selected_views = selector.get('views', None) class_regex = r'\d{3}' condition_regex = r'(nm|bg|cl)-0[0-6]' |