From b53917de8d204be075d82b1392562aacb397fe64 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 26 Apr 2022 15:00:01 -0700 Subject: [PATCH] Remove `tqdm.auto` (#7599) --- data/Argoverse.yaml | 2 +- data/Objects365.yaml | 2 +- data/SKU-110K.yaml | 2 +- data/VOC.yaml | 2 +- data/VisDrone.yaml | 2 +- data/xView.yaml | 2 +- train.py | 2 +- utils/autoanchor.py | 2 +- utils/datasets.py | 2 +- utils/loggers/wandb/wandb_utils.py | 2 +- val.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/Argoverse.yaml b/data/Argoverse.yaml index 9d114f5..43426f5 100644 --- a/data/Argoverse.yaml +++ b/data/Argoverse.yaml @@ -22,7 +22,7 @@ names: ['person', 'bicycle', 'car', 'motorcycle', 'bus', 'truck', 'traffic download: | import json - from tqdm.auto import tqdm + from tqdm import tqdm from utils.general import download, Path diff --git a/data/Objects365.yaml b/data/Objects365.yaml index 334c23c..4cc9475 100644 --- a/data/Objects365.yaml +++ b/data/Objects365.yaml @@ -60,7 +60,7 @@ names: ['Person', 'Sneakers', 'Chair', 'Other Shoes', 'Hat', 'Car', 'Lamp', 'Gla # Download script/URL (optional) --------------------------------------------------------------------------------------- download: | - from tqdm.auto import tqdm + from tqdm import tqdm from utils.general import Path, check_requirements, download, np, xyxy2xywhn diff --git a/data/SKU-110K.yaml b/data/SKU-110K.yaml index 2fd689b..2acf34d 100644 --- a/data/SKU-110K.yaml +++ b/data/SKU-110K.yaml @@ -21,7 +21,7 @@ names: ['object'] # class names # Download script/URL (optional) --------------------------------------------------------------------------------------- download: | import shutil - from tqdm.auto import tqdm + from tqdm import tqdm from utils.general import np, pd, Path, download, xyxy2xywh diff --git a/data/VOC.yaml b/data/VOC.yaml index 93a1f18..ba73479 100644 --- a/data/VOC.yaml +++ b/data/VOC.yaml @@ -29,7 +29,7 @@ names: ['aeroplane', 'bicycle', 'bird', 'boat', 'bottle', 'bus', 'car', 'cat', ' download: | import xml.etree.ElementTree as ET - from tqdm.auto import tqdm + from tqdm import tqdm from utils.general import download, Path diff --git a/data/VisDrone.yaml b/data/VisDrone.yaml index c38fb2a..10337b4 100644 --- a/data/VisDrone.yaml +++ b/data/VisDrone.yaml @@ -24,7 +24,7 @@ download: | def visdrone2yolo(dir): from PIL import Image - from tqdm.auto import tqdm + from tqdm import tqdm def convert_box(size, box): # Convert VisDrone box to YOLO xywh box diff --git a/data/xView.yaml b/data/xView.yaml index aac2d02..3b38f1f 100644 --- a/data/xView.yaml +++ b/data/xView.yaml @@ -34,7 +34,7 @@ download: | import numpy as np from PIL import Image - from tqdm.auto import tqdm + from tqdm import tqdm from utils.datasets import autosplit from utils.general import download, xyxy2xywhn diff --git a/train.py b/train.py index 50501fc..86247c4 100644 --- a/train.py +++ b/train.py @@ -30,7 +30,7 @@ import yaml from torch.cuda import amp from torch.nn.parallel import DistributedDataParallel as DDP from torch.optim import SGD, Adam, AdamW, lr_scheduler -from tqdm.auto import tqdm +from tqdm import tqdm FILE = Path(__file__).resolve() ROOT = FILE.parents[0] # YOLOv5 root directory diff --git a/utils/autoanchor.py b/utils/autoanchor.py index cdcecd8..77518ab 100644 --- a/utils/autoanchor.py +++ b/utils/autoanchor.py @@ -8,7 +8,7 @@ import random import numpy as np import torch import yaml -from tqdm.auto import tqdm +from tqdm import tqdm from utils.general import LOGGER, colorstr, emojis diff --git a/utils/datasets.py b/utils/datasets.py index ef04f51..912c2cd 100755 --- a/utils/datasets.py +++ b/utils/datasets.py @@ -24,7 +24,7 @@ import torch.nn.functional as F import yaml from PIL import ExifTags, Image, ImageOps from torch.utils.data import DataLoader, Dataset, dataloader, distributed -from tqdm.auto import tqdm +from tqdm import tqdm from utils.augmentations import Albumentations, augment_hsv, copy_paste, letterbox, mixup, random_perspective from utils.general import (DATASETS_DIR, LOGGER, NUM_THREADS, check_dataset, check_requirements, check_yaml, clean_str, diff --git a/utils/loggers/wandb/wandb_utils.py b/utils/loggers/wandb/wandb_utils.py index 713b25c..1ac8ce7 100644 --- a/utils/loggers/wandb/wandb_utils.py +++ b/utils/loggers/wandb/wandb_utils.py @@ -8,7 +8,7 @@ from pathlib import Path from typing import Dict import yaml -from tqdm.auto import tqdm +from tqdm import tqdm FILE = Path(__file__).resolve() ROOT = FILE.parents[3] # YOLOv5 root directory diff --git a/val.py b/val.py index 58113f0..e7ef547 100644 --- a/val.py +++ b/val.py @@ -27,7 +27,7 @@ from threading import Thread import numpy as np import torch -from tqdm.auto import tqdm +from tqdm import tqdm FILE = Path(__file__).resolve() ROOT = FILE.parents[0] # YOLOv5 root directory