diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-12 11:45:07 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-12 11:45:07 +0800 |
| commit | bbc2d84e59749e6fa1d87ffcc738419ff19a447e (patch) | |
| tree | 464ed1fa6b7be41b9163120d18bc53b33a0eac75 | |
| parent | 966d4431c037b0c4641aa2a5fc22f05be064b331 (diff) | |
| parent | 9bd6908ed77410e2efa439d26ebd1f9b60519f53 (diff) | |
Merge branch 'master' into python3.8
# Conflicts:
# models/model.py
# utils/dataset.py
| -rw-r--r-- | models/model.py | 2 | ||||
| -rw-r--r-- | utils/dataset.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/models/model.py b/models/model.py index 1154d7f..3f342ea 100644 --- a/models/model.py +++ b/models/model.py @@ -315,7 +315,7 @@ class Model: self, dataset_config: DatasetConfiguration, dataloader_config: DataloaderConfiguration, - ) -> Tuple[DataLoader, Dict[str: DataLoader]]: + ) -> Tuple[DataLoader, Dict[str, DataLoader]]: dataset_name = dataset_config.get('name', 'CASIA-B') if dataset_name == 'CASIA-B': gallery_dataset = self._parse_dataset_config( diff --git a/utils/dataset.py b/utils/dataset.py index e691157..ea678fb 100644 --- a/utils/dataset.py +++ b/utils/dataset.py @@ -75,7 +75,7 @@ class CASIAB(data.Dataset): self.views: np.ndarray[np.str_] # Labels, classes, conditions and views in dataset, # set of three attributes above - self.metadata = Dict[str, List[np.int64, str]] + self.metadata: Dict[str, List[np.int64, str]] # Dictionaries for indexing frames and frame names by clip name # and chip path when cache is on |