diff --git a/bob/learn/pytorch/datasets/utils.py b/bob/learn/pytorch/datasets/utils.py index 6d3b85c62a5219a0dd745423680cb2403a3af8ec..263c21ade84b01cc418f90d1a91faff7e4a89779 100644 --- a/bob/learn/pytorch/datasets/utils.py +++ b/bob/learn/pytorch/datasets/utils.py @@ -11,7 +11,7 @@ class FaceCropper(): """ def __init__(self, cropped_height, cropped_width, color_channel='rgb'): # the face cropper - from bob.bio.face.preprocessor import FaceCrop + from bob.bio.face_legacy.preprocessor import FaceCrop cropped_image_size = (cropped_height, cropped_width) right_eye_pos = (cropped_height // 5, cropped_width // 4 -1) left_eye_pos = (cropped_height // 5, cropped_width // 4 * 3) diff --git a/bob/learn/pytorch/extractor/audio/DummyExtractor.py b/bob/learn/pytorch/extractor/audio/DummyExtractor.py index da6d1f91b67a85bda6d406fae6c520bbe21544c2..437d812517d696ff5a405844551b4e0c3472c529 100644 --- a/bob/learn/pytorch/extractor/audio/DummyExtractor.py +++ b/bob/learn/pytorch/extractor/audio/DummyExtractor.py @@ -1,5 +1,5 @@ import numpy -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor class DummyExtractor(Extractor): """ The Dummy class for passing the extracted embedding. diff --git a/bob/learn/pytorch/extractor/image/DeepPixBiS.py b/bob/learn/pytorch/extractor/image/DeepPixBiS.py index b09a7c2cafdc835adff41a69ec893deb407e401d..95f4c4f86464e66be6eb4115b99feea54719ed3b 100644 --- a/bob/learn/pytorch/extractor/image/DeepPixBiS.py +++ b/bob/learn/pytorch/extractor/image/DeepPixBiS.py @@ -5,7 +5,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import DeepPixBiS -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor import logging logger = logging.getLogger("bob.learn.pytorch") diff --git a/bob/learn/pytorch/extractor/image/FASNet.py b/bob/learn/pytorch/extractor/image/FASNet.py index 913260d82be18f7cac15b16a58dde0cc25698ea7..e4d9341f8a1ae7c742bba4e146643c86e0a99e3a 100644 --- a/bob/learn/pytorch/extractor/image/FASNet.py +++ b/bob/learn/pytorch/extractor/image/FASNet.py @@ -5,7 +5,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import FASNet -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor import logging logger = logging.getLogger("bob.learn.pytorch") diff --git a/bob/learn/pytorch/extractor/image/LightCNN29.py b/bob/learn/pytorch/extractor/image/LightCNN29.py index 6a094546f5951c61bf4f1efcca390a56034a6172..0ac0f82297ffd1c08c1e752f7d2156ea747248c5 100644 --- a/bob/learn/pytorch/extractor/image/LightCNN29.py +++ b/bob/learn/pytorch/extractor/image/LightCNN29.py @@ -6,7 +6,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import LightCNN29 -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor class LightCNN29Extractor(Extractor): """ The class implementing the feature extraction of LightCNN29 embeddings. diff --git a/bob/learn/pytorch/extractor/image/LightCNN29v2.py b/bob/learn/pytorch/extractor/image/LightCNN29v2.py index 3d1f8a4c08a23507219870d37335456d33741fbb..da02cfd5bcf803cf363c375e6bd460fd0d858565 100644 --- a/bob/learn/pytorch/extractor/image/LightCNN29v2.py +++ b/bob/learn/pytorch/extractor/image/LightCNN29v2.py @@ -6,7 +6,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import LightCNN29v2 -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor class LightCNN29v2Extractor(Extractor): """ The class implementing the feature extraction of LightCNN29v2 embeddings. diff --git a/bob/learn/pytorch/extractor/image/LightCNN9.py b/bob/learn/pytorch/extractor/image/LightCNN9.py index 323db7628494a27b5c06e95600eff3c08a02db8d..7dca8995e818d74c60a11c5a953b8d8914074664 100644 --- a/bob/learn/pytorch/extractor/image/LightCNN9.py +++ b/bob/learn/pytorch/extractor/image/LightCNN9.py @@ -6,7 +6,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import LightCNN9 -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor class LightCNN9Extractor(Extractor): """ The class implementing the feature extraction of LightCNN9 embeddings. diff --git a/bob/learn/pytorch/extractor/image/MCCNN.py b/bob/learn/pytorch/extractor/image/MCCNN.py index 80eb8275d616106d42e92af87966726824f9e136..10678f6f06fa1f4f2c41b2273cd4a544811b1943 100644 --- a/bob/learn/pytorch/extractor/image/MCCNN.py +++ b/bob/learn/pytorch/extractor/image/MCCNN.py @@ -5,7 +5,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import MCCNN -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor import logging logger = logging.getLogger("bob.learn.pytorch") diff --git a/bob/learn/pytorch/extractor/image/MCCNNv2.py b/bob/learn/pytorch/extractor/image/MCCNNv2.py index af7bd9c8e3e7d6d3210421987c62e45a686c2486..315374c00dd4ed168e3658c0a8b99a6e63976994 100644 --- a/bob/learn/pytorch/extractor/image/MCCNNv2.py +++ b/bob/learn/pytorch/extractor/image/MCCNNv2.py @@ -5,7 +5,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import MCCNNv2 -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor import logging logger = logging.getLogger("bob.learn.pytorch") diff --git a/bob/learn/pytorch/extractor/image/MCDeepPixBiS.py b/bob/learn/pytorch/extractor/image/MCDeepPixBiS.py index 1f8a28ebc0b5d40b447294fd39372473eff9d501..8b82a1bd99c3e8843cc118918e9e81e95f3c8e3b 100644 --- a/bob/learn/pytorch/extractor/image/MCDeepPixBiS.py +++ b/bob/learn/pytorch/extractor/image/MCDeepPixBiS.py @@ -5,7 +5,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures import MCDeepPixBiS -from bob.bio.base.extractor import Extractor +from bob.bio.base_legacy.extractor import Extractor import logging logger = logging.getLogger("bob.learn.pytorch") diff --git a/bob/learn/pytorch/preprocessor/audio/DltResNet.py b/bob/learn/pytorch/preprocessor/audio/DltResNet.py index cefb9d7cbde93ee0e091ddb4a7f659ec49ddeda8..a3d2205276c8099f2f6ef30e29a706b86c5ed45c 100644 --- a/bob/learn/pytorch/preprocessor/audio/DltResNet.py +++ b/bob/learn/pytorch/preprocessor/audio/DltResNet.py @@ -4,7 +4,7 @@ from torch.autograd import Variable import torchvision.transforms as transforms from bob.learn.pytorch.architectures.DltResNet import dltresnet34 as drn_arc from bob.learn.pytorch.architectures.ResNet import resnet34 as resnet_arc -from bob.bio.base.preprocessor import Preprocessor +from bob.bio.base_legacy.preprocessor import Preprocessor import bob.io.base import torch.backends.cudnn as cudnn import pickle diff --git a/conda/meta.yaml b/conda/meta.yaml index 2c7dfd0ece85e739de8bfa0985c364963b0f5551..ea867d86b9c4cab447f49f06d902f0deab166b3e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -31,7 +31,7 @@ requirements: - bob.extension - bob.core - bob.io.base - - bob.bio.base + - bob.pad.base - bob.io.image - bob.ap - numpy {{ numpy }} diff --git a/doc/guide_audio_extractor.rst b/doc/guide_audio_extractor.rst index ac4ee6da9e3815dc31e1afc63169eba270bbf339..eb572dd2bc06ea2211f830987a00a7ca4134a664 100644 --- a/doc/guide_audio_extractor.rst +++ b/doc/guide_audio_extractor.rst @@ -6,14 +6,14 @@ This subpackage is part of ``bob.learn.pytorch`` package to extract features fr trained with pytorch_. For this purpose, you can specify your feature extractor in configuration -file to be used together with the ``verifiy.py`` script from :ref:`bob.bio.base <bob.bio.base>`. +file to be used together with the ``verifiy.py`` script from `bob.bio.base_legacy <bob.bio.base_legacy>`. DltResNet Model --------------- -:ref:`bob.bio.base <bob.bio.base>` wrapper DltResNet model. +`bob.bio.base_legacy <bob.bio.base_legacy>` wrapper DltResNet model. .. note:: @@ -29,7 +29,7 @@ ResNet Model ------------ -:ref:`bob.bio.base <bob.bio.base>` wrapper ResNet model. +`bob.bio.base_legacy <bob.bio.base_legacy>` wrapper ResNet model. .. note:: @@ -63,7 +63,7 @@ network (before loading it). ``_model``, ``_num_classes`` and ``_use_res`` are o .. code:: python - from bob.bio.base.extractor import CallableExtractor + from bob.bio.base_legacy.extractor import CallableExtractor extractor = CallableExtractor(lambda x: x) extracted_directory = "preprocessed" diff --git a/requirements.txt b/requirements.txt index f0b43c95a009587539d35bf8f029fe1b4c71807c..ddf456e02e933939f5a017f897fbc6236ae769df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ numpy bob.extension bob.core bob.io.base -bob.bio.base +bob.pad.base bob.io.image bob.ap torch