diff --git a/bob/ip/binseg/configs/datasets/amdrive.py b/bob/ip/binseg/configs/datasets/amdrive.py index 0b1b1639580939fde75d93f7082db7875f6aea85..27f8d5c01816f5acfe44d8ec6916a91021a9fa8d 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 5a6cc4af189fe226f772c258524593b6c7867fb4..0b71274f2fe963e3db30a2449ca6640e6ff2b478 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 46a351d72425f8c7a138553020220436cafbedad..2aea4222b4094b9d655036c1a76fb34da481d229 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 16ec3fca2680781d584ff885a547a4d797246d29..cbf4f41ed129193935d62a2647d654d8a25ab436 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 aedf52ed430ac46003009e310cfdcfbd94633f4d..2e69cadc6dcefba74840d36d0e68716a062fa2a9 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 429a0500232aa0078633222b6dabac77603326c8..e04a47a1827e210ee62044d8a0f07227f04ffeae 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 b53fc751066d7a45537f848624546508dcaf68b8..5fdbf58220b9c24f03f33334e06cc729366f738b 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 a5d49950d3e3360d7bb64e810d98fb3760c1d547..38c969827cf930e2aa0740b4d2d4a57c0fcbd8e5 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 ee905048f388a74a6c928b9605e6a418e2e5dea8..0a6b3250caff4446629980aa3a5825d73fcb17e0 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 4dd0da54215a23a9808963dca4d3cac738240448..a1626c9145812783d32f66c8f7c4a49ce20d54b6 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 4eab3c6c5b447cb8a4e43923ce3081bebe0b9503..a6ef11a50fd6cb9db7c085ac46ec53bb3ca50ea0 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 b2129d5e9ab32ca8a1fea2b77d9e2b5f8e3821d5..ca9bc8b41b631b2d5881bcee370142c55aa1be11 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 c129c5d99813cb7089a04c4397f669cad0678217..59d96eacbf2de0a2f4e2dab7bafaa8645a8848e6 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 5a3fdfa0b336595c7ca52092c6fe456a08a1910f..6f21d2e91a6ae391179c3b8cb87a15f26c953b3f 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 05040e4697c1cc3835b76fd513f65b662d1bb7e3..6dfd0f560f55c468a7fc8541bf7c507363b3d8eb 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 43f2dd7ecca2344f39e66fb549de42ff4da9a904..f09b39b04be9dd623b6e6b2006ccdf2506e7768d 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 d8fb2de3515cb963f633151db779fdc5813c53e9..764af86de5a74fa0924178a761f7308d28f18c1a 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 7b262c7a95680f5972cb17374ac0e4aa12d6efc9..c27efeb34e392df44ee2428164fb149209a3d39c 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 7602d63aae183936a66f5d1986ce454ba6e32516..ac3f1d5850a066da01b20cf37620c29c2cb20e62 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 9fc05e9ae1744ade6dca5c2041691efae92e13be..5bb0ece67128d9020b4f63f126972e996abbfc85 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 6cd716149e9b421b3a5bca7acd64e325076804c7..969894f5e453bfdf6fc86fe07448d8e1c8f7ece2 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 25868691d9c4fd13c73a31b4bcf7d671f2e0404b..ca00945d604edf35629719867999b0d8cdbf659f 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 aebcaace81971f00d15443dc946ccf11905bdfc0..1c053b4fcddd88e1621d5aea80d26ba5640d4da5 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 d891a1ce71d8aa85b4c4777c570fc4544c22e728..5015e5b35eb7b7a883894c82edfdc27b7e552591 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 471cac63e3c383295732eeefa4a5f7e6a899a0d0..d38e80df89a3c225e31a5b4ce7a9e6c930a4f81c 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 18052744b49c5f884ab02da78a5ebf208894f5a3..47197c888b30b33efca98ee96e0667b65d91fed7 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 17cf07c3cb6e70246b5b7fba523fcf75978611ae..97fc09da9b89404d96e2230ca49c8a0b81db9c8f 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):