mirrors/mmclassification
1
0
Fork 0
mirror of https://github.com/open-mmlab/mmclassification.git synced 2025-06-03 21:53:55 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/rm-tqdm' into 'master'

Browse Source 
use mmcv.ProgressBar to replace tqdm

See merge request open-mmlab/mmclassification!35
This commit is contained in:
chenkai 2020-07-05 21:57:42 +08:00
commit a19d5c4105
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mmcls/datasets/utils.py
View File

@ -3,9 +3,12 @@ import hashlib
import os import os
import os.path import os.path
import tarfile import tarfile
import urllib.error
import urllib.request
import zipfile import zipfile
from functools import partial
from tqdm import tqdm import mmcv
__all__ = ['rm_suffix', 'check_integrity', 'download_and_extract_archive'] __all__ = ['rm_suffix', 'check_integrity', 'download_and_extract_archive']
@ -18,15 +21,16 @@ def rm_suffix(s, suffix=None):
def gen_bar_updater(): def gen_bar_updater():
pbar = tqdm(total=None)
def bar_update(count, block_size, total_size): def bar_update(count, block_size, total_size, pbar):
if pbar.total is None and total_size: if pbar is None and total_size:
pbar.total = total_size pbar = mmcv.ProgressBar(total_size)
progress_bytes = count * block_size progress_bytes = count * block_size
pbar.update(progress_bytes - pbar.n) for _ in range(progress_bytes):
pbar.update()
return bar_update _bar_update = partial(bar_update, pbar=None)
return _bar_update
def calculate_md5(fpath, chunk_size=1024 * 1024): def calculate_md5(fpath, chunk_size=1024 * 1024):
@ -60,8 +64,6 @@ def download_url(url, root, filename=None, md5=None):
md5 (str | None): MD5 checksum of the download. md5 (str | None): MD5 checksum of the download.
If md5 is None, download without md5 check. If md5 is None, download without md5 check.
""" """
import urllib
root = os.path.expanduser(root) root = os.path.expanduser(root)
if not filename: if not filename:
filename = os.path.basename(url) filename = os.path.basename(url)