[*] Use package import when possible

bob/ip/binseg/engine/ssltrainer.py

@@ -12,8 +12,8 @@ import pandas
 import torch
 from tqdm import tqdm
 
-from bob.ip.binseg.utils.metric import SmoothedValue
-from bob.ip.binseg.utils.plot import loss_curve
+from ..utils.metric import SmoothedValue
+from ..utils.plot import loss_curve
 
 import logging
 logger = logging.getLogger(__name__)

bob/ip/binseg/modeling/driu.py

@@ -4,8 +4,8 @@
 import torch
 import torch.nn
 from collections import OrderedDict
-from bob.ip.binseg.modeling.backbones.vgg import vgg16
-from bob.ip.binseg.modeling.make_layers import (
+from .backbones.vgg import vgg16
+from .make_layers import (
     conv_with_kaiming_uniform,
     convtrans_with_kaiming_uniform,
     UpsampleCropBlock,

bob/ip/binseg/modeling/driubn.py

@@ -4,8 +4,8 @@
 import torch
 import torch.nn
 from collections import OrderedDict
-from bob.ip.binseg.modeling.backbones.vgg import vgg16_bn
-from bob.ip.binseg.modeling.make_layers import (
+from .backbones.vgg import vgg16_bn
+from .make_layers import (
     conv_with_kaiming_uniform,
     convtrans_with_kaiming_uniform,
     UpsampleCropBlock,

bob/ip/binseg/modeling/driuod.py

@@ -4,8 +4,8 @@
 import torch
 import torch.nn
 from collections import OrderedDict
-from bob.ip.binseg.modeling.backbones.vgg import vgg16
-from bob.ip.binseg.modeling.make_layers import (
+from .backbones.vgg import vgg16
+from .make_layers import (
     conv_with_kaiming_uniform,
     convtrans_with_kaiming_uniform,
     UpsampleCropBlock,

bob/ip/binseg/modeling/driupix.py

@@ -4,8 +4,8 @@
 import torch
 import torch.nn
 from collections import OrderedDict
-from bob.ip.binseg.modeling.backbones.vgg import vgg16
-from bob.ip.binseg.modeling.make_layers import (
+from .backbones.vgg import vgg16
+from .make_layers import (
     conv_with_kaiming_uniform,
     convtrans_with_kaiming_uniform,
     UpsampleCropBlock,

bob/ip/binseg/modeling/hed.py

@@ -4,8 +4,8 @@
 import torch
 import torch.nn
 from collections import OrderedDict
-from bob.ip.binseg.modeling.backbones.vgg import vgg16
-from bob.ip.binseg.modeling.make_layers import (
+from .backbones.vgg import vgg16
+from .make_layers import (
     conv_with_kaiming_uniform,
     convtrans_with_kaiming_uniform,
     UpsampleCropBlock,

bob/ip/binseg/modeling/m2u.py

@@ -6,7 +6,7 @@
 from collections import OrderedDict
 import torch
 import torch.nn
-from bob.ip.binseg.modeling.backbones.mobilenetv2 import MobileNetV2, InvertedResidual
+from .backbones.mobilenetv2 import MobileNetV2, InvertedResidual
 
 
 class DecoderBlock(torch.nn.Module):

bob/ip/binseg/modeling/resunet.py

@@ -3,13 +3,13 @@
 
 import torch.nn as nn
 from collections import OrderedDict
-from bob.ip.binseg.modeling.make_layers import (
+from .make_layers import (
     conv_with_kaiming_uniform,
     convtrans_with_kaiming_uniform,
     PixelShuffle_ICNR,
     UnetBlock,
 )
-from bob.ip.binseg.modeling.backbones.resnet import resnet50
+from .backbones.resnet import resnet50
 
 
 class ResUNet(nn.Module):

bob/ip/binseg/modeling/unet.py

@@ -3,13 +3,13 @@
 
 import torch.nn as nn
 from collections import OrderedDict
-from bob.ip.binseg.modeling.make_layers import (
+from .make_layers import (
     conv_with_kaiming_uniform,
     convtrans_with_kaiming_uniform,
     PixelShuffle_ICNR,
     UnetBlock,
 )
-from bob.ip.binseg.modeling.backbones.vgg import vgg16
+from .backbones.vgg import vgg16
 
 
 class UNet(nn.Module):

bob/ip/binseg/test/test_checkpointer.py

@@ -9,7 +9,7 @@ import torch
 from torch import nn
 import os
 
-from bob.ip.binseg.utils.checkpointer import Checkpointer
+from ..utils.checkpointer import Checkpointer
 
 
 class TestCheckpointer(unittest.TestCase):
@@ -81,7 +81,3 @@ class TestCheckpointer(unittest.TestCase):
             self.assertFalse(id(trained_p) == id(loaded_p))
             # same content
             self.assertTrue(trained_p.equal(loaded_p))
-
-
-if __name__ == "__main__":
-    unittest.main()

bob/ip/binseg/test/test_summary.py

@@ -3,12 +3,13 @@
 
 import os
 import unittest
-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
-from bob.ip.binseg.modeling.unet import build_unet
-from bob.ip.binseg.modeling.resunet import build_res50unet
-from bob.ip.binseg.utils.summary import summary
+
+from ..modeling.driu import build_driu
+from ..modeling.driuod import build_driuod
+from ..modeling.hed import build_hed
+from ..modeling.unet import build_unet
+from ..modeling.resunet import build_res50unet
+from ..utils.summary import summary
 
 
 class Tester(unittest.TestCase):
@@ -45,7 +46,3 @@ class Tester(unittest.TestCase):
         s, param = summary(model)
         self.assertIsInstance(s, str)
         self.assertIsInstance(param, int)
-
-
-if __name__ == "__main__":
-    unittest.main()

bob/ip/binseg/utils/checkpointer.py

@@ -5,8 +5,9 @@
 
 import torch
 import os
-from bob.ip.binseg.utils.model_serialization import load_state_dict
-from bob.ip.binseg.utils.model_zoo import cache_url
+
+from .model_serialization import load_state_dict
+from .model_zoo import cache_url
 
 import logging
 logger = logging.getLogger(__name__)