diff --git a/examples/dataset_image_workflow/main.py b/examples/dataset_image_workflow/main.py index d8bff9e..26e639a 100644 --- a/examples/dataset_image_workflow/main.py +++ b/examples/dataset_image_workflow/main.py @@ -4,7 +4,8 @@ from get_data import * import os import random from utils import generate_uploader, generate_user, ImageDataLoader, train, eval_prediction -from learnware.learnware import Learnware, JobSelectorReuser, AveragingReuser +from learnware.learnware import Learnware +from learnware.reuse import JobSelectorReuser, AveragingReuser import time from learnware.market import EasyMarket, BaseUserInfo diff --git a/examples/dataset_pfs_workflow/main.py b/examples/dataset_pfs_workflow/main.py index 2ca972a..a465241 100644 --- a/examples/dataset_pfs_workflow/main.py +++ b/examples/dataset_pfs_workflow/main.py @@ -9,7 +9,8 @@ from shutil import copyfile, rmtree import learnware from learnware.market import EasyMarket, BaseUserInfo from learnware.market import database_ops -from learnware.learnware import Learnware, JobSelectorReuser, AveragingReuser +from learnware.learnware import Learnware +from learnware.reuse import JobSelectorReuser, AveragingReuser import learnware.specification as specification from pfs import Dataloader from learnware.logger import get_module_logger diff --git a/examples/workflow_by_code/main.py b/examples/workflow_by_code/main.py index 3534aae..8473209 100644 --- a/examples/workflow_by_code/main.py +++ b/examples/workflow_by_code/main.py @@ -11,7 +11,7 @@ from shutil import copyfile, rmtree import learnware from learnware.market import EasyMarket, BaseUserInfo -from learnware.learnware import JobSelectorReuser, AveragingReuser +from learnware.reuse import JobSelectorReuser, AveragingReuser import learnware.specification as specification from learnware.utils import get_module_by_module_path diff --git a/learnware/reuse/__init__.py b/learnware/reuse/__init__.py index e69de29..47212c9 100644 --- a/learnware/reuse/__init__.py +++ b/learnware/reuse/__init__.py @@ -0,0 +1,3 @@ +from .ensemble_pruning import EnsemblePruningReuser +from .averaging import AveragingReuser +from .job_selector import JobSelectorReuser \ No newline at end of file diff --git a/tests/test_learnware_client/test_docker.py b/tests/test_learnware_client/test_docker.py index 5a916cc..57d5188 100644 --- a/tests/test_learnware_client/test_docker.py +++ b/tests/test_learnware_client/test_docker.py @@ -5,7 +5,7 @@ import numpy as np import learnware from learnware.client import LearnwareClient from learnware.client.container import LearnwaresContainer -from learnware.learnware.reuse import AveragingReuser +from learnware.reuse import AveragingReuser if __name__ == "__main__": diff --git a/tests/test_learnware_client/test_load.py b/tests/test_learnware_client/test_load.py index 26b0bd5..cd77f12 100644 --- a/tests/test_learnware_client/test_load.py +++ b/tests/test_learnware_client/test_load.py @@ -7,7 +7,7 @@ import learnware from learnware.learnware import get_learnware_from_dirpath from learnware.client import LearnwareClient from learnware.client.container import ModelCondaContainer, LearnwaresContainer -from learnware.learnware.reuse import AveragingReuser +from learnware.reuse import AveragingReuser class TestLearnwareLoad(unittest.TestCase): diff --git a/tests/test_learnware_client/test_reuse.py b/tests/test_learnware_client/test_reuse.py index 4fde0d1..8acae9f 100644 --- a/tests/test_learnware_client/test_reuse.py +++ b/tests/test_learnware_client/test_reuse.py @@ -3,7 +3,7 @@ import numpy as np from learnware.learnware import get_learnware_from_dirpath from learnware.client.container import LearnwaresContainer -from learnware.learnware.reuse import AveragingReuser +from learnware.reuse import AveragingReuser from learnware.test.module import get_semantic_specification if __name__ == "__main__": diff --git a/tests/test_workflow/test_workflow.py b/tests/test_workflow/test_workflow.py index 38459ad..9aa3e86 100644 --- a/tests/test_workflow/test_workflow.py +++ b/tests/test_workflow/test_workflow.py @@ -12,7 +12,7 @@ from shutil import copyfile, rmtree import learnware from learnware.market import EasyMarket, BaseUserInfo -from learnware.learnware import JobSelectorReuser, AveragingReuser, EnsemblePruningReuser +from learnware.reuse import JobSelectorReuser, AveragingReuser, EnsemblePruningReuser import learnware.specification as specification curr_root = os.path.dirname(os.path.abspath(__file__))