diff --git a/bob/ip/binseg/engine/ssltrainer.py b/bob/ip/binseg/engine/ssltrainer.py index 2448782cc6b1b00965a4974af13f58e36a0dd0fc..d56202074bd77c4513b243eff0f71dfec4e8307e 100644 --- a/bob/ip/binseg/engine/ssltrainer.py +++ b/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__) diff --git a/bob/ip/binseg/modeling/driu.py b/bob/ip/binseg/modeling/driu.py index c63dc843a7a267fd9a2f1f6bbc7dd20b4cd1a2a1..94cf77b3b72501571ecd6fa78c04897331ea4a8e 100644 --- a/bob/ip/binseg/modeling/driu.py +++ b/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, diff --git a/bob/ip/binseg/modeling/driubn.py b/bob/ip/binseg/modeling/driubn.py index fd834353eedd5a15e7fa017b97e517966f2a740c..24055dec02be4f18465ab110bcf25775d6130a0b 100644 --- a/bob/ip/binseg/modeling/driubn.py +++ b/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, diff --git a/bob/ip/binseg/modeling/driuod.py b/bob/ip/binseg/modeling/driuod.py index dbd26167eda41e196bf33a6c52eb9e0cf63bc59d..80336c6f5c23847120d384792aa79d6e4d7a33fe 100644 --- a/bob/ip/binseg/modeling/driuod.py +++ b/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, diff --git a/bob/ip/binseg/modeling/driupix.py b/bob/ip/binseg/modeling/driupix.py index eef95c9f9ac237c1f9235b7fc34f3e90752ccfeb..5d4a6ce79613161b1222f7e4c63a83e0cc8bdbe1 100644 --- a/bob/ip/binseg/modeling/driupix.py +++ b/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, diff --git a/bob/ip/binseg/modeling/hed.py b/bob/ip/binseg/modeling/hed.py index db42515c78c137b93153df9f33d17e7a3a3bd7a1..5c059b3dd86a45de5fec0ec422b4769f180d214f 100644 --- a/bob/ip/binseg/modeling/hed.py +++ b/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, diff --git a/bob/ip/binseg/modeling/m2u.py b/bob/ip/binseg/modeling/m2u.py index 8861b965e3294a472da5edf54d23d215536f8c0d..c4ac69c38077213447ecc8f0a181b9d32aa22fe1 100644 --- a/bob/ip/binseg/modeling/m2u.py +++ b/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): diff --git a/bob/ip/binseg/modeling/resunet.py b/bob/ip/binseg/modeling/resunet.py index cce8242ec957dc9814186ee5967b5cb3ae57b5cd..f53ff73d5262e8d46480ce2c3d28ce951bd84b74 100644 --- a/bob/ip/binseg/modeling/resunet.py +++ b/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): diff --git a/bob/ip/binseg/modeling/unet.py b/bob/ip/binseg/modeling/unet.py index ac3f1d5850a066da01b20cf37620c29c2cb20e62..37b6de6ae4d307b04674080ef19ce258fce66c3e 100644 --- a/bob/ip/binseg/modeling/unet.py +++ b/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): diff --git a/bob/ip/binseg/test/test_checkpointer.py b/bob/ip/binseg/test/test_checkpointer.py index 52bd9ac0fafefd1d7d250bfcd87c4d3e6703ad15..7f0ca50d3df58ff896f0642a69dbcede5ffc3f1a 100644 --- a/bob/ip/binseg/test/test_checkpointer.py +++ b/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() diff --git a/bob/ip/binseg/test/test_summary.py b/bob/ip/binseg/test/test_summary.py index a6d9948aed57612f238ec3a1333e7148b5401cb7..b29bfcc87af1568fe58d8df4984a01f3a74d1e00 100644 --- a/bob/ip/binseg/test/test_summary.py +++ b/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() diff --git a/bob/ip/binseg/utils/checkpointer.py b/bob/ip/binseg/utils/checkpointer.py index 4ae57e5c1a5f58727edc990f04e8553bc6f8de4e..33c200adf4ea23b59952bbfb661c1164a7c8744b 100644 --- a/bob/ip/binseg/utils/checkpointer.py +++ b/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__)