From 994d216ffe8c3105b750298324eee26071dcfcc4 Mon Sep 17 00:00:00 2001 From: Andre Anjos <andre.dos.anjos@gmail.com> Date: Thu, 19 Mar 2020 17:37:53 +0100 Subject: [PATCH] [all] Remove unused imports --- bob/ip/binseg/configs/datasets/amdrive.py | 1 - bob/ip/binseg/configs/datasets/amdrivetest.py | 1 - .../configs/datasets/drivestareiostarhrf960sslchase.py | 1 - bob/ip/binseg/configs/models/driu.py | 2 -- bob/ip/binseg/configs/models/driubn.py | 2 -- bob/ip/binseg/configs/models/driubnssl.py | 2 -- bob/ip/binseg/configs/models/driuod.py | 2 -- bob/ip/binseg/configs/models/driussl.py | 2 -- bob/ip/binseg/configs/models/hed.py | 1 - bob/ip/binseg/configs/models/m2unet.py | 2 -- bob/ip/binseg/configs/models/m2unetssl.py | 2 -- bob/ip/binseg/configs/models/resunet.py | 2 -- bob/ip/binseg/configs/models/unet.py | 2 -- bob/ip/binseg/data/imagefolderinference.py | 3 --- bob/ip/binseg/data/transforms.py | 2 -- bob/ip/binseg/engine/inferencer.py | 2 +- bob/ip/binseg/engine/predicter.py | 2 -- bob/ip/binseg/modeling/resunet.py | 1 - bob/ip/binseg/modeling/unet.py | 1 - bob/ip/binseg/script/binseg.py | 6 ------ bob/ip/binseg/test/test_basemetrics.py | 1 - bob/ip/binseg/test/test_batchmetrics.py | 1 - bob/ip/binseg/test/test_summary.py | 2 -- bob/ip/binseg/utils/evaluate.py | 6 +----- bob/ip/binseg/utils/metric.py | 1 - bob/ip/binseg/utils/model_zoo.py | 4 ---- bob/ip/binseg/utils/summary.py | 2 -- 27 files changed, 2 insertions(+), 54 deletions(-) diff --git a/bob/ip/binseg/configs/datasets/amdrive.py b/bob/ip/binseg/configs/datasets/amdrive.py index 0b1b1639..27f8d5c0 100644 --- a/bob/ip/binseg/configs/datasets/amdrive.py +++ b/bob/ip/binseg/configs/datasets/amdrive.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from bob.db.drive import Database as DRIVE from bob.db.stare import Database as STARE from bob.db.chasedb1 import Database as CHASEDB1 from bob.db.iostar import Database as IOSTAR diff --git a/bob/ip/binseg/configs/datasets/amdrivetest.py b/bob/ip/binseg/configs/datasets/amdrivetest.py index 5a6cc4af..0b71274f 100644 --- a/bob/ip/binseg/configs/datasets/amdrivetest.py +++ b/bob/ip/binseg/configs/datasets/amdrivetest.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from bob.db.drive import Database as DRIVE from bob.db.stare import Database as STARE from bob.db.chasedb1 import Database as CHASEDB1 from bob.db.iostar import Database as IOSTAR diff --git a/bob/ip/binseg/configs/datasets/drivestareiostarhrf960sslchase.py b/bob/ip/binseg/configs/datasets/drivestareiostarhrf960sslchase.py index 46a351d7..2aea4222 100644 --- a/bob/ip/binseg/configs/datasets/drivestareiostarhrf960sslchase.py +++ b/bob/ip/binseg/configs/datasets/drivestareiostarhrf960sslchase.py @@ -3,7 +3,6 @@ from bob.ip.binseg.configs.datasets.stare960 import dataset as stare from bob.ip.binseg.configs.datasets.hrf960 import dataset as hrf from bob.ip.binseg.configs.datasets.iostarvessel960 import dataset as iostar from bob.db.chasedb1 import Database as CHASE -from bob.db.hrf import Database as HRF from bob.ip.binseg.data.transforms import * import torch from bob.ip.binseg.data.binsegdataset import ( diff --git a/bob/ip/binseg/configs/models/driu.py b/bob/ip/binseg/configs/models/driu.py index 16ec3fca..cbf4f41e 100644 --- a/bob/ip/binseg/configs/models/driu.py +++ b/bob/ip/binseg/configs/models/driu.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.driu import build_driu -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import SoftJaccardBCELogitsLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/driubn.py b/bob/ip/binseg/configs/models/driubn.py index aedf52ed..2e69cadc 100644 --- a/bob/ip/binseg/configs/models/driubn.py +++ b/bob/ip/binseg/configs/models/driubn.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.driubn import build_driu -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import SoftJaccardBCELogitsLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/driubnssl.py b/bob/ip/binseg/configs/models/driubnssl.py index 429a0500..e04a47a1 100644 --- a/bob/ip/binseg/configs/models/driubnssl.py +++ b/bob/ip/binseg/configs/models/driubnssl.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.driubn import build_driu -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import MixJacLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/driuod.py b/bob/ip/binseg/configs/models/driuod.py index b53fc751..5fdbf582 100644 --- a/bob/ip/binseg/configs/models/driuod.py +++ b/bob/ip/binseg/configs/models/driuod.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.driuod import build_driuod -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import SoftJaccardBCELogitsLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/driussl.py b/bob/ip/binseg/configs/models/driussl.py index a5d49950..38c96982 100644 --- a/bob/ip/binseg/configs/models/driussl.py +++ b/bob/ip/binseg/configs/models/driussl.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.driu import build_driu -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import MixJacLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/hed.py b/bob/ip/binseg/configs/models/hed.py index ee905048..0a6b3250 100644 --- a/bob/ip/binseg/configs/models/hed.py +++ b/bob/ip/binseg/configs/models/hed.py @@ -3,7 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.hed import build_hed -import torch.optim as optim from bob.ip.binseg.modeling.losses import HEDSoftJaccardBCELogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/m2unet.py b/bob/ip/binseg/configs/models/m2unet.py index 4dd0da54..a1626c91 100644 --- a/bob/ip/binseg/configs/models/m2unet.py +++ b/bob/ip/binseg/configs/models/m2unet.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.m2u import build_m2unet -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import SoftJaccardBCELogitsLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/m2unetssl.py b/bob/ip/binseg/configs/models/m2unetssl.py index 4eab3c6c..a6ef11a5 100644 --- a/bob/ip/binseg/configs/models/m2unetssl.py +++ b/bob/ip/binseg/configs/models/m2unetssl.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.m2u import build_m2unet -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import MixJacLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/resunet.py b/bob/ip/binseg/configs/models/resunet.py index b2129d5e..ca9bc8b4 100644 --- a/bob/ip/binseg/configs/models/resunet.py +++ b/bob/ip/binseg/configs/models/resunet.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.resunet import build_res50unet -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import SoftJaccardBCELogitsLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/configs/models/unet.py b/bob/ip/binseg/configs/models/unet.py index c129c5d9..59d96eac 100644 --- a/bob/ip/binseg/configs/models/unet.py +++ b/bob/ip/binseg/configs/models/unet.py @@ -3,8 +3,6 @@ from torch.optim.lr_scheduler import MultiStepLR from bob.ip.binseg.modeling.unet import build_unet -import torch.optim as optim -from torch.nn import BCEWithLogitsLoss from bob.ip.binseg.utils.model_zoo import modelurls from bob.ip.binseg.modeling.losses import SoftJaccardBCELogitsLoss from bob.ip.binseg.engine.adabound import AdaBound diff --git a/bob/ip/binseg/data/imagefolderinference.py b/bob/ip/binseg/data/imagefolderinference.py index 5a3fdfa0..6f21d2e9 100644 --- a/bob/ip/binseg/data/imagefolderinference.py +++ b/bob/ip/binseg/data/imagefolderinference.py @@ -4,9 +4,6 @@ from torch.utils.data import Dataset from pathlib import Path import numpy as np from PIL import Image -import torch -import torchvision.transforms.functional as VF -import bob.io.base def get_file_lists(data_path, glob): diff --git a/bob/ip/binseg/data/transforms.py b/bob/ip/binseg/data/transforms.py index 05040e46..6dfd0f56 100644 --- a/bob/ip/binseg/data/transforms.py +++ b/bob/ip/binseg/data/transforms.py @@ -11,12 +11,10 @@ of `torchvision <https://github.com/pytorch/vision>`_. import torchvision.transforms.functional as VF import random -import PIL from PIL import Image from torchvision.transforms.transforms import Lambda from torchvision.transforms.transforms import Compose as TorchVisionCompose import math -from math import floor import warnings import collections import bob.core diff --git a/bob/ip/binseg/engine/inferencer.py b/bob/ip/binseg/engine/inferencer.py index 43f2dd7e..f09b39b0 100644 --- a/bob/ip/binseg/engine/inferencer.py +++ b/bob/ip/binseg/engine/inferencer.py @@ -13,7 +13,7 @@ from tqdm import tqdm import bob.io.base -from bob.ip.binseg.utils.metric import SmoothedValue, base_metrics +from bob.ip.binseg.utils.metric import base_metrics from bob.ip.binseg.utils.plot import precision_recall_f1iso_confintval from bob.ip.binseg.utils.summary import summary diff --git a/bob/ip/binseg/engine/predicter.py b/bob/ip/binseg/engine/predicter.py index d8fb2de3..764af86d 100644 --- a/bob/ip/binseg/engine/predicter.py +++ b/bob/ip/binseg/engine/predicter.py @@ -7,10 +7,8 @@ import time import datetime import numpy as np import torch -import torchvision.transforms.functional as VF from tqdm import tqdm -from bob.ip.binseg.utils.summary import summary from bob.ip.binseg.engine.inferencer import save_probability_images from bob.ip.binseg.engine.inferencer import save_hdf diff --git a/bob/ip/binseg/modeling/resunet.py b/bob/ip/binseg/modeling/resunet.py index 7b262c7a..c27efeb3 100644 --- a/bob/ip/binseg/modeling/resunet.py +++ b/bob/ip/binseg/modeling/resunet.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import torch.nn as nn -import torch from collections import OrderedDict from bob.ip.binseg.modeling.make_layers import ( conv_with_kaiming_uniform, diff --git a/bob/ip/binseg/modeling/unet.py b/bob/ip/binseg/modeling/unet.py index 7602d63a..ac3f1d58 100644 --- a/bob/ip/binseg/modeling/unet.py +++ b/bob/ip/binseg/modeling/unet.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import torch.nn as nn -import torch from collections import OrderedDict from bob.ip.binseg.modeling.make_layers import ( conv_with_kaiming_uniform, diff --git a/bob/ip/binseg/script/binseg.py b/bob/ip/binseg/script/binseg.py index 9fc05e9a..5bb0ece6 100644 --- a/bob/ip/binseg/script/binseg.py +++ b/bob/ip/binseg/script/binseg.py @@ -5,11 +5,7 @@ import os -import time -import numpy -import collections import pkg_resources -import glob import click from click_plugins import with_plugins @@ -17,7 +13,6 @@ from click_plugins import with_plugins import logging import torch -import bob.extension from bob.extension.scripts.click_helper import ( verbosity_option, ConfigCommand, @@ -45,7 +40,6 @@ logger = logging.getLogger(__name__) @click.group(cls=AliasedGroup) def binseg(): """Binary 2D Fundus Image Segmentation Benchmark commands.""" - pass # Train diff --git a/bob/ip/binseg/test/test_basemetrics.py b/bob/ip/binseg/test/test_basemetrics.py index 6cd71614..969894f5 100644 --- a/bob/ip/binseg/test/test_basemetrics.py +++ b/bob/ip/binseg/test/test_basemetrics.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import unittest -import numpy as np from bob.ip.binseg.utils.metric import base_metrics import random diff --git a/bob/ip/binseg/test/test_batchmetrics.py b/bob/ip/binseg/test/test_batchmetrics.py index 25868691..ca00945d 100644 --- a/bob/ip/binseg/test/test_batchmetrics.py +++ b/bob/ip/binseg/test/test_batchmetrics.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import unittest -import numpy as np from bob.ip.binseg.engine.inferencer import batch_metrics import random import shutil, tempfile diff --git a/bob/ip/binseg/test/test_summary.py b/bob/ip/binseg/test/test_summary.py index aebcaace..1c053b4f 100644 --- a/bob/ip/binseg/test/test_summary.py +++ b/bob/ip/binseg/test/test_summary.py @@ -1,9 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import torch import unittest -import numpy as np from bob.ip.binseg.modeling.driu import build_driu from bob.ip.binseg.modeling.driuod import build_driuod from bob.ip.binseg.modeling.hed import build_hed diff --git a/bob/ip/binseg/utils/evaluate.py b/bob/ip/binseg/utils/evaluate.py index d891a1ce..5015e5b3 100644 --- a/bob/ip/binseg/utils/evaluate.py +++ b/bob/ip/binseg/utils/evaluate.py @@ -4,20 +4,16 @@ # import os import logging -import time -import datetime import numpy as np import torch import pandas as pd -import torchvision.transforms.functional as VF from tqdm import tqdm -from bob.ip.binseg.utils.metric import SmoothedValue, base_metrics +from bob.ip.binseg.utils.metric import base_metrics from bob.ip.binseg.utils.plot import ( precision_recall_f1iso, precision_recall_f1iso_confintval, ) -from bob.ip.binseg.utils.summary import summary from PIL import Image from torchvision.transforms.functional import to_tensor diff --git a/bob/ip/binseg/utils/metric.py b/bob/ip/binseg/utils/metric.py index 471cac63..d38e80df 100644 --- a/bob/ip/binseg/utils/metric.py +++ b/bob/ip/binseg/utils/metric.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from collections import defaultdict from collections import deque import torch diff --git a/bob/ip/binseg/utils/model_zoo.py b/bob/ip/binseg/utils/model_zoo.py index 18052744..47197c88 100644 --- a/bob/ip/binseg/utils/model_zoo.py +++ b/bob/ip/binseg/utils/model_zoo.py @@ -5,16 +5,12 @@ # https://github.com/pytorch/pytorch/blob/master/torch/hub.py # https://github.com/facebookresearch/maskrcnn-benchmark/blob/master/maskrcnn_benchmark/utils/checkpoint.py -import errno import hashlib import os import re import shutil import sys import tempfile -import torch -import warnings -import zipfile from urllib.request import urlopen from urllib.parse import urlparse from tqdm import tqdm diff --git a/bob/ip/binseg/utils/summary.py b/bob/ip/binseg/utils/summary.py index 17cf07c3..97fc09da 100644 --- a/bob/ip/binseg/utils/summary.py +++ b/bob/ip/binseg/utils/summary.py @@ -3,11 +3,9 @@ # Adapted from https://github.com/pytorch/pytorch/issues/2001#issuecomment-405675488 import sys -import logging from functools import reduce from torch.nn.modules.module import _addindent -from bob.ip.binseg.modeling.driu import build_driu def summary(model, file=sys.stderr): -- GitLab