From b1411b403ae0258d4b920deacae8c95ea295694c Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 5 Aug 2021 10:27:52 +0200
Subject: [PATCH] [pre-commit] make isort black-compatible; avoid single line
imports
---
.pre-commit-config.yaml | 1 -
.../binseg/configs/datasets/chasedb1/mtest.py | 4 +---
bob/ip/binseg/configs/datasets/csv.py | 3 +--
bob/ip/binseg/configs/datasets/drive/mtest.py | 4 +---
.../binseg/configs/datasets/hrf/__init__.py | 3 +--
bob/ip/binseg/configs/datasets/hrf/mtest.py | 4 +---
.../configs/datasets/iostar/vessel_mtest.py | 5 +---
.../configs/datasets/refuge/__init__.py | 4 +---
bob/ip/binseg/configs/datasets/stare/mtest.py | 4 +---
bob/ip/binseg/data/JSRT/__init__.py | 4 +---
bob/ip/binseg/data/MC/__init__.py | 4 +---
bob/ip/binseg/data/Shenzhen/__init__.py | 4 +---
bob/ip/binseg/data/chasedb1/__init__.py | 4 +---
bob/ip/binseg/data/drhagis/__init__.py | 4 +---
bob/ip/binseg/data/drionsdb/__init__.py | 3 +--
bob/ip/binseg/data/drishtigs1/__init__.py | 3 +--
bob/ip/binseg/data/drive/__init__.py | 4 +---
bob/ip/binseg/data/hrf/__init__.py | 4 +---
bob/ip/binseg/data/iostar/__init__.py | 7 ++----
bob/ip/binseg/data/refuge/__init__.py | 3 +--
bob/ip/binseg/data/rimoner3/__init__.py | 4 +---
bob/ip/binseg/data/stare/__init__.py | 4 +---
bob/ip/binseg/data/utils.py | 3 +--
bob/ip/binseg/engine/evaluator.py | 3 +--
bob/ip/binseg/engine/ssltrainer.py | 8 ++-----
bob/ip/binseg/engine/trainer.py | 5 +---
bob/ip/binseg/models/driu.py | 3 +--
bob/ip/binseg/models/driu_bn.py | 3 +--
bob/ip/binseg/models/hed.py | 3 +--
bob/ip/binseg/models/make_layers.py | 3 +--
bob/ip/binseg/models/resunet.py | 10 ++++----
bob/ip/binseg/models/unet.py | 3 +--
bob/ip/binseg/script/analyze.py | 8 ++++---
bob/ip/binseg/script/config.py | 3 +--
bob/ip/binseg/script/dataset.py | 3 +--
bob/ip/binseg/script/evaluate.py | 11 +++++----
bob/ip/binseg/script/experiment.py | 8 ++++---
bob/ip/binseg/script/predict.py | 11 +++++----
bob/ip/binseg/script/significance.py | 24 +++++++++++--------
bob/ip/binseg/script/train.py | 11 +++++----
bob/ip/binseg/test/test_dataset.py | 3 +--
bob/ip/binseg/test/test_measures.py | 10 ++++----
bob/ip/binseg/test/test_models.py | 24 +++++++------------
bob/ip/binseg/test/test_significance.py | 8 ++++---
bob/ip/binseg/test/test_transforms.py | 24 ++++++++++---------
doc/conf.py | 3 +--
setup.py | 6 ++---
47 files changed, 118 insertions(+), 167 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8fc576d7..176b5c5c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,6 @@ repos:
- id: isort
args: [
--profile, "black",
- --force-single-line-imports,
--line-length, "80",
--order-by-type,
--lines-between-types, "1"
diff --git a/bob/ip/binseg/configs/datasets/chasedb1/mtest.py b/bob/ip/binseg/configs/datasets/chasedb1/mtest.py
index 75fa39b4..31a49025 100644
--- a/bob/ip/binseg/configs/datasets/chasedb1/mtest.py
+++ b/bob/ip/binseg/configs/datasets/chasedb1/mtest.py
@@ -8,9 +8,7 @@
from bob.ip.binseg.configs.datasets.chasedb1.xtest import dataset as _xt
from bob.ip.binseg.configs.datasets.chasedb1.xtest import second_annotator
-from bob.ip.binseg.data.transforms import CenterCrop
-from bob.ip.binseg.data.transforms import Pad
-from bob.ip.binseg.data.transforms import Resize
+from bob.ip.binseg.data.transforms import CenterCrop, Pad, Resize
dataset = {
"train": _xt["train"],
diff --git a/bob/ip/binseg/configs/datasets/csv.py b/bob/ip/binseg/configs/datasets/csv.py
index 76ed9ba3..14f89f46 100644
--- a/bob/ip/binseg/configs/datasets/csv.py
+++ b/bob/ip/binseg/configs/datasets/csv.py
@@ -61,8 +61,7 @@ More information:
import os
from bob.ip.binseg.data.dataset import CSVDataset
-from bob.ip.binseg.data.loader import load_pil_1
-from bob.ip.binseg.data.loader import load_pil_rgb
+from bob.ip.binseg.data.loader import load_pil_1, load_pil_rgb
from bob.ip.binseg.data.sample import Sample
# How we use the loaders - "sample" is a dictionary where keys are defined
diff --git a/bob/ip/binseg/configs/datasets/drive/mtest.py b/bob/ip/binseg/configs/datasets/drive/mtest.py
index e9e09a49..60920f9c 100644
--- a/bob/ip/binseg/configs/datasets/drive/mtest.py
+++ b/bob/ip/binseg/configs/datasets/drive/mtest.py
@@ -8,9 +8,7 @@
from bob.ip.binseg.configs.datasets.drive.xtest import dataset as _xt
from bob.ip.binseg.configs.datasets.drive.xtest import second_annotator
-from bob.ip.binseg.data.transforms import Crop
-from bob.ip.binseg.data.transforms import Pad
-from bob.ip.binseg.data.transforms import Resize
+from bob.ip.binseg.data.transforms import Crop, Pad, Resize
dataset = {
"train": _xt["train"],
diff --git a/bob/ip/binseg/configs/datasets/hrf/__init__.py b/bob/ip/binseg/configs/datasets/hrf/__init__.py
index 4153b42d..ef8285c8 100644
--- a/bob/ip/binseg/configs/datasets/hrf/__init__.py
+++ b/bob/ip/binseg/configs/datasets/hrf/__init__.py
@@ -5,8 +5,7 @@
def _maker_1168(protocol):
from ....data.hrf import dataset as raw
- from ....data.transforms import Crop
- from ....data.transforms import Resize
+ from ....data.transforms import Crop, Resize
from .. import make_dataset as mk
return mk(raw.subsets(protocol), [Crop(0, 108, 2336, 3296), Resize(1168)])
diff --git a/bob/ip/binseg/configs/datasets/hrf/mtest.py b/bob/ip/binseg/configs/datasets/hrf/mtest.py
index 72dd581d..1b5e6324 100644
--- a/bob/ip/binseg/configs/datasets/hrf/mtest.py
+++ b/bob/ip/binseg/configs/datasets/hrf/mtest.py
@@ -7,9 +7,7 @@
"""
from bob.ip.binseg.configs.datasets.hrf.xtest import dataset as _xt
-from bob.ip.binseg.data.transforms import Crop
-from bob.ip.binseg.data.transforms import Pad
-from bob.ip.binseg.data.transforms import Resize
+from bob.ip.binseg.data.transforms import Crop, Pad, Resize
dataset = {
"train": _xt["train"],
diff --git a/bob/ip/binseg/configs/datasets/iostar/vessel_mtest.py b/bob/ip/binseg/configs/datasets/iostar/vessel_mtest.py
index bfaad616..b120721b 100644
--- a/bob/ip/binseg/configs/datasets/iostar/vessel_mtest.py
+++ b/bob/ip/binseg/configs/datasets/iostar/vessel_mtest.py
@@ -7,10 +7,7 @@
"""
from bob.ip.binseg.configs.datasets.iostar.vessel_xtest import dataset as _xt
-from bob.ip.binseg.data.transforms import CenterCrop
-from bob.ip.binseg.data.transforms import Crop
-from bob.ip.binseg.data.transforms import Pad
-from bob.ip.binseg.data.transforms import Resize
+from bob.ip.binseg.data.transforms import CenterCrop, Crop, Pad, Resize
dataset = {
"train": _xt["train"],
diff --git a/bob/ip/binseg/configs/datasets/refuge/__init__.py b/bob/ip/binseg/configs/datasets/refuge/__init__.py
index 129020c1..cfd1afb4 100644
--- a/bob/ip/binseg/configs/datasets/refuge/__init__.py
+++ b/bob/ip/binseg/configs/datasets/refuge/__init__.py
@@ -5,9 +5,7 @@
def _maker(protocol):
from ....data.refuge import dataset as raw
- from ....data.transforms import CenterCrop
- from ....data.transforms import Pad
- from ....data.transforms import Resize
+ from ....data.transforms import CenterCrop, Pad, Resize
from .. import make_dataset as mk
# due to different sizes, we need to make the dataset twice
diff --git a/bob/ip/binseg/configs/datasets/stare/mtest.py b/bob/ip/binseg/configs/datasets/stare/mtest.py
index 8c48b00a..ba68168f 100644
--- a/bob/ip/binseg/configs/datasets/stare/mtest.py
+++ b/bob/ip/binseg/configs/datasets/stare/mtest.py
@@ -8,9 +8,7 @@
from bob.ip.binseg.configs.datasets.stare.xtest import dataset as _xt
from bob.ip.binseg.configs.datasets.stare.xtest import second_annotator
-from bob.ip.binseg.data.transforms import CenterCrop
-from bob.ip.binseg.data.transforms import Pad
-from bob.ip.binseg.data.transforms import Resize
+from bob.ip.binseg.data.transforms import CenterCrop, Pad, Resize
dataset = {
"train": _xt["train"],
diff --git a/bob/ip/binseg/data/JSRT/__init__.py b/bob/ip/binseg/data/JSRT/__init__.py
index 8091716e..42a26cc4 100644
--- a/bob/ip/binseg/data/JSRT/__init__.py
+++ b/bob/ip/binseg/data/JSRT/__init__.py
@@ -29,9 +29,7 @@ from PIL import Image
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "default.json"),
diff --git a/bob/ip/binseg/data/MC/__init__.py b/bob/ip/binseg/data/MC/__init__.py
index f2208e1c..d479eb61 100644
--- a/bob/ip/binseg/data/MC/__init__.py
+++ b/bob/ip/binseg/data/MC/__init__.py
@@ -29,9 +29,7 @@ from PIL import Image
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "default.json"),
diff --git a/bob/ip/binseg/data/Shenzhen/__init__.py b/bob/ip/binseg/data/Shenzhen/__init__.py
index b7cb2d6c..89f9e723 100644
--- a/bob/ip/binseg/data/Shenzhen/__init__.py
+++ b/bob/ip/binseg/data/Shenzhen/__init__.py
@@ -27,9 +27,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "default.json"),
diff --git a/bob/ip/binseg/data/chasedb1/__init__.py b/bob/ip/binseg/data/chasedb1/__init__.py
index 3cb27001..0878395d 100644
--- a/bob/ip/binseg/data/chasedb1/__init__.py
+++ b/bob/ip/binseg/data/chasedb1/__init__.py
@@ -38,9 +38,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "first-annotator.json"),
diff --git a/bob/ip/binseg/data/drhagis/__init__.py b/bob/ip/binseg/data/drhagis/__init__.py
index 20b1ad43..363e0644 100644
--- a/bob/ip/binseg/data/drhagis/__init__.py
+++ b/bob/ip/binseg/data/drhagis/__init__.py
@@ -33,9 +33,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "default.json"),
diff --git a/bob/ip/binseg/data/drionsdb/__init__.py b/bob/ip/binseg/data/drionsdb/__init__.py
index 8732d60d..aa6226c2 100644
--- a/bob/ip/binseg/data/drionsdb/__init__.py
+++ b/bob/ip/binseg/data/drionsdb/__init__.py
@@ -31,8 +31,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "expert1.json"),
diff --git a/bob/ip/binseg/data/drishtigs1/__init__.py b/bob/ip/binseg/data/drishtigs1/__init__.py
index cb9cadcf..c80cabc8 100644
--- a/bob/ip/binseg/data/drishtigs1/__init__.py
+++ b/bob/ip/binseg/data/drishtigs1/__init__.py
@@ -29,8 +29,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_rgb, make_delayed
_protocols = {
"optic-disc-all": pkg_resources.resource_filename(
diff --git a/bob/ip/binseg/data/drive/__init__.py b/bob/ip/binseg/data/drive/__init__.py
index ea702976..698395b4 100644
--- a/bob/ip/binseg/data/drive/__init__.py
+++ b/bob/ip/binseg/data/drive/__init__.py
@@ -27,9 +27,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "default.json"),
diff --git a/bob/ip/binseg/data/hrf/__init__.py b/bob/ip/binseg/data/hrf/__init__.py
index 35f84a37..0a256660 100644
--- a/bob/ip/binseg/data/hrf/__init__.py
+++ b/bob/ip/binseg/data/hrf/__init__.py
@@ -26,9 +26,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "default.json"),
diff --git a/bob/ip/binseg/data/iostar/__init__.py b/bob/ip/binseg/data/iostar/__init__.py
index 6c773ec9..8118f781 100644
--- a/bob/ip/binseg/data/iostar/__init__.py
+++ b/bob/ip/binseg/data/iostar/__init__.py
@@ -29,11 +29,8 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
-from ..utils import invert_mode1_image
-from ..utils import subtract_mode1_images
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
+from ..utils import invert_mode1_image, subtract_mode1_images
_protocols = [
pkg_resources.resource_filename(__name__, "vessel.json"),
diff --git a/bob/ip/binseg/data/refuge/__init__.py b/bob/ip/binseg/data/refuge/__init__.py
index d3ed9472..538f7b38 100644
--- a/bob/ip/binseg/data/refuge/__init__.py
+++ b/bob/ip/binseg/data/refuge/__init__.py
@@ -39,8 +39,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_rgb, make_delayed
_protocols = {
"optic-disc": pkg_resources.resource_filename(__name__, "default.json"),
diff --git a/bob/ip/binseg/data/rimoner3/__init__.py b/bob/ip/binseg/data/rimoner3/__init__.py
index 2d20b226..d6132465 100644
--- a/bob/ip/binseg/data/rimoner3/__init__.py
+++ b/bob/ip/binseg/data/rimoner3/__init__.py
@@ -27,9 +27,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "optic-disc-exp1.json"),
diff --git a/bob/ip/binseg/data/stare/__init__.py b/bob/ip/binseg/data/stare/__init__.py
index bb4b7040..902cc236 100644
--- a/bob/ip/binseg/data/stare/__init__.py
+++ b/bob/ip/binseg/data/stare/__init__.py
@@ -31,9 +31,7 @@ import pkg_resources
import bob.extension
from ..dataset import JSONDataset
-from ..loader import load_pil_1
-from ..loader import load_pil_rgb
-from ..loader import make_delayed
+from ..loader import load_pil_1, load_pil_rgb, make_delayed
_protocols = [
pkg_resources.resource_filename(__name__, "ah.json"),
diff --git a/bob/ip/binseg/data/utils.py b/bob/ip/binseg/data/utils.py
index 9ec9fdcc..54a187c0 100644
--- a/bob/ip/binseg/data/utils.py
+++ b/bob/ip/binseg/data/utils.py
@@ -10,8 +10,7 @@ import PIL.ImageOps
import torch
import torch.utils.data
-from .transforms import Compose
-from .transforms import ToTensor
+from .transforms import Compose, ToTensor
def invert_mode1_image(img):
diff --git a/bob/ip/binseg/engine/evaluator.py b/bob/ip/binseg/engine/evaluator.py
index c838425f..c27384c2 100644
--- a/bob/ip/binseg/engine/evaluator.py
+++ b/bob/ip/binseg/engine/evaluator.py
@@ -16,8 +16,7 @@ import torchvision.transforms.functional as VF
from tqdm import tqdm
-from ..utils.measure import base_measures
-from ..utils.measure import bayesian_measures
+from ..utils.measure import base_measures, bayesian_measures
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/engine/ssltrainer.py b/bob/ip/binseg/engine/ssltrainer.py
index c4039345..735b6c1f 100644
--- a/bob/ip/binseg/engine/ssltrainer.py
+++ b/bob/ip/binseg/engine/ssltrainer.py
@@ -15,13 +15,9 @@ import torch
from tqdm import tqdm
from ..utils.measure import SmoothedValue
-from ..utils.resources import cpu_constants
-from ..utils.resources import cpu_log
-from ..utils.resources import gpu_constants
-from ..utils.resources import gpu_log
+from ..utils.resources import cpu_constants, cpu_log, gpu_constants, gpu_log
from ..utils.summary import summary
-from .trainer import PYTORCH_GE_110
-from .trainer import torch_evaluation
+from .trainer import PYTORCH_GE_110, torch_evaluation
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/engine/trainer.py b/bob/ip/binseg/engine/trainer.py
index 5e2e4f4a..aa7f8d8f 100644
--- a/bob/ip/binseg/engine/trainer.py
+++ b/bob/ip/binseg/engine/trainer.py
@@ -16,10 +16,7 @@ import torch
from tqdm import tqdm
from ..utils.measure import SmoothedValue
-from ..utils.resources import cpu_constants
-from ..utils.resources import cpu_log
-from ..utils.resources import gpu_constants
-from ..utils.resources import gpu_log
+from ..utils.resources import cpu_constants, cpu_log, gpu_constants, gpu_log
from ..utils.summary import summary
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/models/driu.py b/bob/ip/binseg/models/driu.py
index 9381e00a..333370b0 100644
--- a/bob/ip/binseg/models/driu.py
+++ b/bob/ip/binseg/models/driu.py
@@ -7,8 +7,7 @@ import torch
import torch.nn
from .backbones.vgg import vgg16_for_segmentation
-from .make_layers import UpsampleCropBlock
-from .make_layers import conv_with_kaiming_uniform
+from .make_layers import UpsampleCropBlock, conv_with_kaiming_uniform
class ConcatFuseBlock(torch.nn.Module):
diff --git a/bob/ip/binseg/models/driu_bn.py b/bob/ip/binseg/models/driu_bn.py
index a28c462f..2219ecce 100644
--- a/bob/ip/binseg/models/driu_bn.py
+++ b/bob/ip/binseg/models/driu_bn.py
@@ -7,8 +7,7 @@ import torch
import torch.nn
from .backbones.vgg import vgg16_bn_for_segmentation
-from .make_layers import UpsampleCropBlock
-from .make_layers import conv_with_kaiming_uniform
+from .make_layers import UpsampleCropBlock, conv_with_kaiming_uniform
class ConcatFuseBlock(torch.nn.Module):
diff --git a/bob/ip/binseg/models/hed.py b/bob/ip/binseg/models/hed.py
index ef27486f..2eeada2b 100644
--- a/bob/ip/binseg/models/hed.py
+++ b/bob/ip/binseg/models/hed.py
@@ -7,8 +7,7 @@ import torch
import torch.nn
from .backbones.vgg import vgg16_for_segmentation
-from .make_layers import UpsampleCropBlock
-from .make_layers import conv_with_kaiming_uniform
+from .make_layers import UpsampleCropBlock, conv_with_kaiming_uniform
class ConcatFuseBlock(torch.nn.Module):
diff --git a/bob/ip/binseg/models/make_layers.py b/bob/ip/binseg/models/make_layers.py
index 7aa9547b..f93b579e 100644
--- a/bob/ip/binseg/models/make_layers.py
+++ b/bob/ip/binseg/models/make_layers.py
@@ -4,8 +4,7 @@
import torch
import torch.nn
-from torch.nn import Conv2d
-from torch.nn import ConvTranspose2d
+from torch.nn import Conv2d, ConvTranspose2d
def conv_with_kaiming_uniform(
diff --git a/bob/ip/binseg/models/resunet.py b/bob/ip/binseg/models/resunet.py
index 1a887580..6d3493ff 100644
--- a/bob/ip/binseg/models/resunet.py
+++ b/bob/ip/binseg/models/resunet.py
@@ -6,10 +6,12 @@ from collections import OrderedDict
import torch.nn
from .backbones.resnet import resnet50_for_segmentation
-from .make_layers import PixelShuffle_ICNR
-from .make_layers import UnetBlock
-from .make_layers import conv_with_kaiming_uniform
-from .make_layers import convtrans_with_kaiming_uniform
+from .make_layers import (
+ PixelShuffle_ICNR,
+ UnetBlock,
+ conv_with_kaiming_uniform,
+ convtrans_with_kaiming_uniform,
+)
class ResUNet(torch.nn.Module):
diff --git a/bob/ip/binseg/models/unet.py b/bob/ip/binseg/models/unet.py
index 6d736222..adfdd8d8 100644
--- a/bob/ip/binseg/models/unet.py
+++ b/bob/ip/binseg/models/unet.py
@@ -6,8 +6,7 @@ from collections import OrderedDict
import torch.nn
from .backbones.vgg import vgg16_for_segmentation
-from .make_layers import UnetBlock
-from .make_layers import conv_with_kaiming_uniform
+from .make_layers import UnetBlock, conv_with_kaiming_uniform
class UNet(torch.nn.Module):
diff --git a/bob/ip/binseg/script/analyze.py b/bob/ip/binseg/script/analyze.py
index 6ffd5b26..ea1ad37e 100644
--- a/bob/ip/binseg/script/analyze.py
+++ b/bob/ip/binseg/script/analyze.py
@@ -6,9 +6,11 @@ import os
import click
-from bob.extension.scripts.click_helper import ConfigCommand
-from bob.extension.scripts.click_helper import ResourceOption
-from bob.extension.scripts.click_helper import verbosity_option
+from bob.extension.scripts.click_helper import (
+ ConfigCommand,
+ ResourceOption,
+ verbosity_option,
+)
from .binseg import save_sh_command
diff --git a/bob/ip/binseg/script/config.py b/bob/ip/binseg/script/config.py
index 74d42bac..458fa484 100644
--- a/bob/ip/binseg/script/config.py
+++ b/bob/ip/binseg/script/config.py
@@ -8,8 +8,7 @@ import shutil
import click
import pkg_resources
-from bob.extension.scripts.click_helper import AliasedGroup
-from bob.extension.scripts.click_helper import verbosity_option
+from bob.extension.scripts.click_helper import AliasedGroup, verbosity_option
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/script/dataset.py b/bob/ip/binseg/script/dataset.py
index 9931f3d2..366755a8 100644
--- a/bob/ip/binseg/script/dataset.py
+++ b/bob/ip/binseg/script/dataset.py
@@ -9,8 +9,7 @@ import click
import pkg_resources
from bob.extension import rc
-from bob.extension.scripts.click_helper import AliasedGroup
-from bob.extension.scripts.click_helper import verbosity_option
+from bob.extension.scripts.click_helper import AliasedGroup, verbosity_option
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/script/evaluate.py b/bob/ip/binseg/script/evaluate.py
index 2fce03e5..16ba96a5 100644
--- a/bob/ip/binseg/script/evaluate.py
+++ b/bob/ip/binseg/script/evaluate.py
@@ -5,12 +5,13 @@ import logging
import click
-from bob.extension.scripts.click_helper import ConfigCommand
-from bob.extension.scripts.click_helper import ResourceOption
-from bob.extension.scripts.click_helper import verbosity_option
+from bob.extension.scripts.click_helper import (
+ ConfigCommand,
+ ResourceOption,
+ verbosity_option,
+)
-from ..engine.evaluator import compare_annotators
-from ..engine.evaluator import run
+from ..engine.evaluator import compare_annotators, run
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/script/experiment.py b/bob/ip/binseg/script/experiment.py
index 63c90a95..20702c51 100644
--- a/bob/ip/binseg/script/experiment.py
+++ b/bob/ip/binseg/script/experiment.py
@@ -7,9 +7,11 @@ import shutil
import click
-from bob.extension.scripts.click_helper import ConfigCommand
-from bob.extension.scripts.click_helper import ResourceOption
-from bob.extension.scripts.click_helper import verbosity_option
+from bob.extension.scripts.click_helper import (
+ ConfigCommand,
+ ResourceOption,
+ verbosity_option,
+)
from .binseg import save_sh_command
diff --git a/bob/ip/binseg/script/predict.py b/bob/ip/binseg/script/predict.py
index dd506259..3972a18d 100644
--- a/bob/ip/binseg/script/predict.py
+++ b/bob/ip/binseg/script/predict.py
@@ -11,14 +11,15 @@ import torch
from torch.utils.data import DataLoader
-from bob.extension.scripts.click_helper import ConfigCommand
-from bob.extension.scripts.click_helper import ResourceOption
-from bob.extension.scripts.click_helper import verbosity_option
+from bob.extension.scripts.click_helper import (
+ ConfigCommand,
+ ResourceOption,
+ verbosity_option,
+)
from ..engine.predictor import run
from ..utils.checkpointer import Checkpointer
-from .binseg import download_to_tempfile
-from .binseg import setup_pytorch_device
+from .binseg import download_to_tempfile, setup_pytorch_device
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/script/significance.py b/bob/ip/binseg/script/significance.py
index 52a0d46f..f248472b 100755
--- a/bob/ip/binseg/script/significance.py
+++ b/bob/ip/binseg/script/significance.py
@@ -8,16 +8,20 @@ import sys
import click
import numpy
-from bob.extension.scripts.click_helper import ConfigCommand
-from bob.extension.scripts.click_helper import ResourceOption
-from bob.extension.scripts.click_helper import verbosity_option
-
-from ..engine.significance import PERFORMANCE_FIGURES
-from ..engine.significance import index_of_outliers
-from ..engine.significance import sliding_window_performances
-from ..engine.significance import visual_performances
-from ..engine.significance import write_analysis_figures
-from ..engine.significance import write_analysis_text
+from bob.extension.scripts.click_helper import (
+ ConfigCommand,
+ ResourceOption,
+ verbosity_option,
+)
+
+from ..engine.significance import (
+ PERFORMANCE_FIGURES,
+ index_of_outliers,
+ sliding_window_performances,
+ visual_performances,
+ write_analysis_figures,
+ write_analysis_text,
+)
from .evaluate import _validate_threshold
from .evaluate import run as run_evaluation
diff --git a/bob/ip/binseg/script/train.py b/bob/ip/binseg/script/train.py
index c5d8bfae..78de7c37 100644
--- a/bob/ip/binseg/script/train.py
+++ b/bob/ip/binseg/script/train.py
@@ -10,13 +10,14 @@ import torch
from torch.utils.data import DataLoader
-from bob.extension.scripts.click_helper import ConfigCommand
-from bob.extension.scripts.click_helper import ResourceOption
-from bob.extension.scripts.click_helper import verbosity_option
+from bob.extension.scripts.click_helper import (
+ ConfigCommand,
+ ResourceOption,
+ verbosity_option,
+)
from ..utils.checkpointer import Checkpointer
-from .binseg import set_seeds
-from .binseg import setup_pytorch_device
+from .binseg import set_seeds, setup_pytorch_device
logger = logging.getLogger(__name__)
diff --git a/bob/ip/binseg/test/test_dataset.py b/bob/ip/binseg/test/test_dataset.py
index 6b907871..329ab12c 100644
--- a/bob/ip/binseg/test/test_dataset.py
+++ b/bob/ip/binseg/test/test_dataset.py
@@ -7,8 +7,7 @@ import os
import pkg_resources
-from ..data.dataset import CSVDataset
-from ..data.dataset import JSONDataset
+from ..data.dataset import CSVDataset, JSONDataset
from ..data.sample import Sample
diff --git a/bob/ip/binseg/test/test_measures.py b/bob/ip/binseg/test/test_measures.py
index 17eed8b4..8c65a4d9 100644
--- a/bob/ip/binseg/test/test_measures.py
+++ b/bob/ip/binseg/test/test_measures.py
@@ -10,10 +10,12 @@ import pytest
import torch
from ..engine.evaluator import sample_measures_for_threshold
-from ..utils.measure import auc
-from ..utils.measure import base_measures
-from ..utils.measure import bayesian_measures
-from ..utils.measure import beta_credible_region
+from ..utils.measure import (
+ auc,
+ base_measures,
+ bayesian_measures,
+ beta_credible_region,
+)
class TestFrequentist(unittest.TestCase):
diff --git a/bob/ip/binseg/test/test_models.py b/bob/ip/binseg/test/test_models.py
index a4288f44..63f2fab0 100644
--- a/bob/ip/binseg/test/test_models.py
+++ b/bob/ip/binseg/test/test_models.py
@@ -10,8 +10,7 @@ from ..models.normalizer import TorchVisionNormalizer
def test_driu():
- from ..models.driu import DRIU
- from ..models.driu import driu
+ from ..models.driu import DRIU, driu
model = driu(pretrained_backbone=True, progress=True)
assert len(model) == 3
@@ -27,8 +26,7 @@ def test_driu():
def test_driu_bn():
- from ..models.driu_bn import DRIUBN
- from ..models.driu_bn import driu_bn
+ from ..models.driu_bn import DRIUBN, driu_bn
model = driu_bn(pretrained_backbone=True, progress=True)
assert len(model) == 3
@@ -44,8 +42,7 @@ def test_driu_bn():
def test_driu_od():
- from ..models.driu_od import DRIUOD
- from ..models.driu_od import driu_od
+ from ..models.driu_od import DRIUOD, driu_od
model = driu_od(pretrained_backbone=True, progress=True)
assert len(model) == 3
@@ -61,8 +58,7 @@ def test_driu_od():
def test_driu_pix():
- from ..models.driu_pix import DRIUPIX
- from ..models.driu_pix import driu_pix
+ from ..models.driu_pix import DRIUPIX, driu_pix
model = driu_pix(pretrained_backbone=True, progress=True)
assert len(model) == 3
@@ -78,8 +74,7 @@ def test_driu_pix():
def test_unet():
- from ..models.unet import UNet
- from ..models.unet import unet
+ from ..models.unet import UNet, unet
model = unet(pretrained_backbone=True, progress=True)
assert len(model) == 3
@@ -95,8 +90,7 @@ def test_unet():
def test_hed():
- from ..models.hed import HED
- from ..models.hed import hed
+ from ..models.hed import HED, hed
model = hed(pretrained_backbone=True, progress=True)
assert len(model) == 3
@@ -113,8 +107,7 @@ def test_hed():
def test_m2unet():
from ..models.backbones.mobilenetv2 import MobileNetV24Segmentation
- from ..models.m2unet import M2UNet
- from ..models.m2unet import m2unet
+ from ..models.m2unet import M2UNet, m2unet
model = m2unet(pretrained_backbone=True, progress=True)
assert len(model) == 3
@@ -131,8 +124,7 @@ def test_m2unet():
def test_resunet50():
from ..models.backbones.resnet import ResNet4Segmentation
- from ..models.resunet import ResUNet
- from ..models.resunet import resunet50
+ from ..models.resunet import ResUNet, resunet50
model = resunet50(pretrained_backbone=True, progress=True)
assert len(model) == 3
diff --git a/bob/ip/binseg/test/test_significance.py b/bob/ip/binseg/test/test_significance.py
index 8ece30d8..9d124a7c 100644
--- a/bob/ip/binseg/test/test_significance.py
+++ b/bob/ip/binseg/test/test_significance.py
@@ -8,9 +8,11 @@ import numpy
import pytest
import torch
-from ..engine.significance import PERFORMANCE_FIGURES
-from ..engine.significance import _performance_summary
-from ..engine.significance import _winperf_measures
+from ..engine.significance import (
+ PERFORMANCE_FIGURES,
+ _performance_summary,
+ _winperf_measures,
+)
from ..utils.measure import base_measures
diff --git a/bob/ip/binseg/test/test_transforms.py b/bob/ip/binseg/test/test_transforms.py
index 01a59fa1..82f0ef98 100644
--- a/bob/ip/binseg/test/test_transforms.py
+++ b/bob/ip/binseg/test/test_transforms.py
@@ -10,17 +10,19 @@ import pkg_resources
import torch
import torchvision.transforms.functional
-from ..data.transforms import CenterCrop
-from ..data.transforms import ColorJitter
-from ..data.transforms import Compose
-from ..data.transforms import Crop
-from ..data.transforms import Pad
-from ..data.transforms import RandomHorizontalFlip
-from ..data.transforms import RandomRotation
-from ..data.transforms import RandomVerticalFlip
-from ..data.transforms import Resize
-from ..data.transforms import SingleAutoLevel16to8
-from ..data.transforms import ToTensor
+from ..data.transforms import (
+ CenterCrop,
+ ColorJitter,
+ Compose,
+ Crop,
+ Pad,
+ RandomHorizontalFlip,
+ RandomRotation,
+ RandomVerticalFlip,
+ Resize,
+ SingleAutoLevel16to8,
+ ToTensor,
+)
def _create_img(size):
diff --git a/doc/conf.py b/doc/conf.py
index 24ddcf7e..33402703 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -244,8 +244,7 @@ autodoc_default_options = {
# For inter-documentation mapping:
-from bob.extension.utils import link_documentation
-from bob.extension.utils import load_requirements
+from bob.extension.utils import link_documentation, load_requirements
sphinx_requirements = "extra-intersphinx.txt"
if os.path.exists(sphinx_requirements):
diff --git a/setup.py b/setup.py
index 1a61c278..33cb7e73 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
-from setuptools import dist
-from setuptools import setup
+from setuptools import dist, setup
-from bob.extension.utils import find_packages
-from bob.extension.utils import load_requirements
+from bob.extension.utils import find_packages, load_requirements
dist.Distribution(dict(setup_requires=["bob.extension"]))
install_requires = load_requirements()
--
GitLab