From a53fd17874a54bec843bf302e929bf596ec03eca Mon Sep 17 00:00:00 2001
From: liaoxingyu <sherlockliao01@gmail.com>
Date: Sat, 23 Jan 2021 15:25:58 +0800
Subject: [PATCH] update docs
---
docs/index.rst | 4 +--
docs/modules/export.rst | 9 ------
docs/requirements.txt | 36 +++++++++++-----------
fastreid/data/datasets/caviara.py | 6 +---
fastreid/data/datasets/cuhk03.py | 6 ++--
fastreid/data/datasets/sysu_mm.py | 5 +--
fastreid/data/datasets/thermalworld.py | 8 ++---
fastreid/engine/defaults.py | 3 +-
fastreid/engine/hooks.py | 2 +-
fastreid/engine/train_loop.py | 1 -
fastreid/evaluation/__init__.py | 3 +-
fastreid/evaluation/rank_cylib/rank_cy.pyx | 1 -
fastreid/modeling/__init__.py | 2 +-
fastreid/modeling/losses/__init__.py | 2 +-
fastreid/utils/logger.py | 4 ++-
requirements.txt | 20 ------------
16 files changed, 35 insertions(+), 77 deletions(-)
delete mode 100644 docs/modules/export.rst
delete mode 100644 requirements.txt
diff --git a/docs/index.rst b/docs/index.rst
index 8634b7b..e333d34 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,9 +1,9 @@
-.. detectron2 documentation master file, created by
+.. fastreid documentation master file, created by
sphinx-quickstart on Sat Sep 21 13:46:45 2019.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-Welcome to detectron2's documentation!
+Welcome to fastreid's documentation!
======================================
.. toctree::
diff --git a/docs/modules/export.rst b/docs/modules/export.rst
deleted file mode 100644
index 3d4ad21..0000000
--- a/docs/modules/export.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-fastreid.export
-=========================
-
-Related tutorial: :doc:`../tutorials/deployment`.
-
-.. automodule:: fastreid.export
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 54b184b..a53f22c 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,20 +1,20 @@
-termcolor
-numpy
-tqdm
-docutils==0.16
-# https://github.com/sphinx-doc/sphinx/commit/7acd3ada3f38076af7b2b5c9f3b60bb9c2587a3d
-git+git://github.com/sphinx-doc/sphinx.git@7acd3ada3f38076af7b2b5c9f3b60bb9c2587a3d
-recommonmark==0.6.0
-sphinx_rtd_theme
matplotlib
-termcolor
-yacs
-tabulate
-cloudpickle
+scipy
Pillow
-future
-requests
-six
-git+git://github.com/facebookresearch/fvcore.git
-https://download.pytorch.org/whl/cpu/torch-1.5.0%2Bcpu-cp37-cp37m-linux_x86_64.whl
-https://download.pytorch.org/whl/cpu/torchvision-0.6.0%2Bcpu-cp37-cp37m-linux_x86_64.whl
+numpy
+prettytable
+easydict
+scikit-learn
+pyyaml
+yacs
+termcolor
+tabulate
+tensorboard
+opencv-python
+pyyaml
+yacs
+termcolor
+scikit-learn
+tabulate
+gdown
+faiss-gpu
\ No newline at end of file
diff --git a/fastreid/data/datasets/caviara.py b/fastreid/data/datasets/caviara.py
index bb4e4ca..62856f2 100644
--- a/fastreid/data/datasets/caviara.py
+++ b/fastreid/data/datasets/caviara.py
@@ -5,16 +5,12 @@
"""
import os
-from scipy.io import loadmat
from glob import glob
from fastreid.data.datasets import DATASET_REGISTRY
from fastreid.data.datasets.bases import ImageDataset
-import pdb
-import random
-import numpy as np
-__all__ = ['CAVIARa',]
+__all__ = ['CAVIARa', ]
@DATASET_REGISTRY.register()
diff --git a/fastreid/data/datasets/cuhk03.py b/fastreid/data/datasets/cuhk03.py
index 96fdaa5..4875695 100644
--- a/fastreid/data/datasets/cuhk03.py
+++ b/fastreid/data/datasets/cuhk03.py
@@ -100,7 +100,7 @@ class CUHK03(ImageDataset):
import h5py
from imageio import imwrite
- from scipy.io import loadmat
+ from scipy import io
PathManager.mkdirs(self.imgs_detected_dir)
PathManager.mkdirs(self.imgs_labeled_dir)
@@ -236,7 +236,7 @@ class CUHK03(ImageDataset):
print('Creating new split for detected images (767/700) ...')
train_info, query_info, gallery_info = _extract_new_split(
- loadmat(self.split_new_det_mat_path),
+ io.loadmat(self.split_new_det_mat_path),
self.imgs_detected_dir
)
split = [{
@@ -256,7 +256,7 @@ class CUHK03(ImageDataset):
print('Creating new split for labeled images (767/700) ...')
train_info, query_info, gallery_info = _extract_new_split(
- loadmat(self.split_new_lab_mat_path),
+ io.loadmat(self.split_new_lab_mat_path),
self.imgs_labeled_dir
)
split = [{
diff --git a/fastreid/data/datasets/sysu_mm.py b/fastreid/data/datasets/sysu_mm.py
index 06c598c..c907b5d 100644
--- a/fastreid/data/datasets/sysu_mm.py
+++ b/fastreid/data/datasets/sysu_mm.py
@@ -5,12 +5,10 @@
"""
import os
-from scipy.io import loadmat
from glob import glob
from fastreid.data.datasets import DATASET_REGISTRY
from fastreid.data.datasets.bases import ImageDataset
-import pdb
__all__ = ['SYSU_mm', ]
@@ -37,7 +35,7 @@ class SYSU_mm(ImageDataset):
data = []
file_path_list = ['cam1', 'cam2', 'cam4', 'cam5']
-
+
for file_path in file_path_list:
camid = self.dataset_name + "_" + file_path
pid_list = os.listdir(os.path.join(train_path, file_path))
@@ -47,4 +45,3 @@ class SYSU_mm(ImageDataset):
for img_path in img_list:
data.append([img_path, pid, camid])
return data
-
diff --git a/fastreid/data/datasets/thermalworld.py b/fastreid/data/datasets/thermalworld.py
index 4c52fd1..5622d09 100644
--- a/fastreid/data/datasets/thermalworld.py
+++ b/fastreid/data/datasets/thermalworld.py
@@ -5,16 +5,12 @@
"""
import os
-from scipy.io import loadmat
from glob import glob
from fastreid.data.datasets import DATASET_REGISTRY
from fastreid.data.datasets.bases import ImageDataset
-import pdb
-import random
-import numpy as np
-__all__ = ['Thermalworld',]
+__all__ = ['Thermalworld', ]
@DATASET_REGISTRY.register()
@@ -40,7 +36,7 @@ class Thermalworld(ImageDataset):
pid_list = os.listdir(train_path)
for pid_dir in pid_list:
pid = self.dataset_name + "_" + pid_dir
- img_list = glob(os.path.join(train_path, pid_dir, "*.jpg"))
+ img_list = glob(os.path.join(train_path, pid_dir, "*.jpg"))
for img_path in img_list:
camid = self.dataset_name + "_cam0"
data.append([img_path, pid, camid])
diff --git a/fastreid/engine/defaults.py b/fastreid/engine/defaults.py
index 28bb560..2950775 100644
--- a/fastreid/engine/defaults.py
+++ b/fastreid/engine/defaults.py
@@ -11,7 +11,6 @@ since they are meant to represent the "common default behavior" people need in t
import argparse
import logging
import os
-import math
import sys
from collections import OrderedDict
@@ -247,7 +246,6 @@ class DefaultTrainer(TrainerBase):
**self.scheduler,
)
-
self.start_epoch = 0
self.max_epoch = cfg.SOLVER.MAX_EPOCH
self.max_iter = self.max_epoch * self.iters_per_epoch
@@ -323,6 +321,7 @@ class DefaultTrainer(TrainerBase):
cfg.SOLVER.FREEZE_ITERS,
cfg.SOLVER.FREEZE_FC_ITERS,
))
+
# Do PreciseBN before checkpointer, because it updates the model and need to
# be saved by checkpointer.
# This is not always the best: if checkpointing has a different frequency,
diff --git a/fastreid/engine/hooks.py b/fastreid/engine/hooks.py
index f7111a3..9226315 100644
--- a/fastreid/engine/hooks.py
+++ b/fastreid/engine/hooks.py
@@ -10,8 +10,8 @@ import time
from collections import Counter
import torch
-from torch import nn
from apex.parallel import DistributedDataParallel
+from torch import nn
from fastreid.evaluation.testing import flatten_results_dict
from fastreid.solver import optim
diff --git a/fastreid/engine/train_loop.py b/fastreid/engine/train_loop.py
index c1ec35c..179f9e3 100644
--- a/fastreid/engine/train_loop.py
+++ b/fastreid/engine/train_loop.py
@@ -12,7 +12,6 @@ from typing import Dict
import numpy as np
import torch
from apex import amp
-from apex.parallel import DistributedDataParallel
import fastreid.utils.comm as comm
from fastreid.utils.events import EventStorage, get_event_storage
diff --git a/fastreid/evaluation/__init__.py b/fastreid/evaluation/__init__.py
index aec369c..6d04af9 100644
--- a/fastreid/evaluation/__init__.py
+++ b/fastreid/evaluation/__init__.py
@@ -1,8 +1,7 @@
-# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
from .evaluator import DatasetEvaluator, inference_context, inference_on_dataset
from .rank import evaluate_rank
-from .roc import evaluate_roc
from .reid_evaluation import ReidEvaluator
+from .roc import evaluate_roc
from .testing import print_csv_format, verify_results
__all__ = [k for k in globals().keys() if not k.startswith("_")]
diff --git a/fastreid/evaluation/rank_cylib/rank_cy.pyx b/fastreid/evaluation/rank_cylib/rank_cy.pyx
index be45e10..ac2c61e 100644
--- a/fastreid/evaluation/rank_cylib/rank_cy.pyx
+++ b/fastreid/evaluation/rank_cylib/rank_cy.pyx
@@ -5,7 +5,6 @@ import cython
import numpy as np
cimport numpy as np
from collections import defaultdict
-import faiss
"""
diff --git a/fastreid/modeling/__init__.py b/fastreid/modeling/__init__.py
index bfa62fa..b24c9cb 100644
--- a/fastreid/modeling/__init__.py
+++ b/fastreid/modeling/__init__.py
@@ -20,4 +20,4 @@ from .meta_arch import (
META_ARCH_REGISTRY,
)
-__all__ = [k for k in globals().keys() if k not in k.startswith("_")]
+__all__ = [k for k in globals().keys() if not k.startswith("_")]
\ No newline at end of file
diff --git a/fastreid/modeling/losses/__init__.py b/fastreid/modeling/losses/__init__.py
index c760405..4ce007b 100644
--- a/fastreid/modeling/losses/__init__.py
+++ b/fastreid/modeling/losses/__init__.py
@@ -9,4 +9,4 @@ from .cross_entroy_loss import cross_entropy_loss, log_accuracy
from .focal_loss import focal_loss
from .triplet_loss import triplet_loss
-__all__ = [k for k in globals().keys() if k not in k.startswith("_")]
+__all__ = [k for k in globals().keys() if not k.startswith("_")]
\ No newline at end of file
diff --git a/fastreid/utils/logger.py b/fastreid/utils/logger.py
index d51f127..7464e52 100644
--- a/fastreid/utils/logger.py
+++ b/fastreid/utils/logger.py
@@ -5,9 +5,11 @@ import os
import sys
import time
from collections import Counter
-from .file_io import PathManager
+
from termcolor import colored
+from .file_io import PathManager
+
class _ColorfulFormatter(logging.Formatter):
def __init__(self, *args, **kwargs):
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index a53f22c..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-matplotlib
-scipy
-Pillow
-numpy
-prettytable
-easydict
-scikit-learn
-pyyaml
-yacs
-termcolor
-tabulate
-tensorboard
-opencv-python
-pyyaml
-yacs
-termcolor
-scikit-learn
-tabulate
-gdown
-faiss-gpu
\ No newline at end of file