diff --git a/examples/dataset_image_workflow/example_files/example_yaml.yaml b/examples/dataset_image_workflow/example_files/example_yaml.yaml index 2f2b4cd..c49ba4a 100644 --- a/examples/dataset_image_workflow/example_files/example_yaml.yaml +++ b/examples/dataset_image_workflow/example_files/example_yaml.yaml @@ -2,7 +2,7 @@ model: class_name: Model kwargs: {} stat_specifications: - - module_path: learnware.specification.image + - module_path: learnware.specification class_name: RKMEImageStatSpecification file_name: rkme.json kwargs: {} \ No newline at end of file diff --git a/learnware/market/easy2/organizer.py b/learnware/market/easy2/organizer.py index 830b5d3..9b6bf8c 100644 --- a/learnware/market/easy2/organizer.py +++ b/learnware/market/easy2/organizer.py @@ -20,7 +20,7 @@ from ... import utils from ...config import C as conf from ...logger import get_module_logger from ...learnware import Learnware, get_learnware_from_dirpath -from ...specification import RKMEStatSpecification, Specification +from ...specification import Specification from ..base import BaseOrganizer, BaseChecker from ...logger import get_module_logger diff --git a/learnware/specification/__init__.py b/learnware/specification/__init__.py index c54cafc..f086c61 100644 --- a/learnware/specification/__init__.py +++ b/learnware/specification/__init__.py @@ -1,3 +1,3 @@ from .utils import generate_stat_spec, generate_rkme_spec, generate_rkme_image_spec from .base import Specification, BaseStatSpecification -from .regular import RKMEStatSpecification, RKMEImageStatSpecification +from .regular import RegularStatsSpecification, RKMEStatSpecification, RKMEImageStatSpecification diff --git a/learnware/specification/regular/__init__.py b/learnware/specification/regular/__init__.py index ba6c866..29e78c2 100644 --- a/learnware/specification/regular/__init__.py +++ b/learnware/specification/regular/__init__.py @@ -1,2 +1,3 @@ from .table import RKMEStatSpecification from .image import RKMEImageStatSpecification +from .base import RegularStatsSpecification \ No newline at end of file diff --git a/learnware/specification/regular/table/rkme.py b/learnware/specification/regular/table/rkme.py index e001dd5..da3e3c6 100644 --- a/learnware/specification/regular/table/rkme.py +++ b/learnware/specification/regular/table/rkme.py @@ -26,8 +26,7 @@ from ....logger import get_module_logger logger = get_module_logger("rkme") if not _FAISS_INSTALLED: - logger.warning("Required faiss version >= 1.7.1 is not detected!") - logger.warning('Please run "conda install -c pytorch faiss-cpu" first.') + logger.warning("Required faiss version >= 1.7.1 is not detected! Please run 'conda install -c pytorch faiss-cpu' first") class RKMEStatSpecification(RegularStatsSpecification): diff --git a/tests/test_specification/test_rkme.py b/tests/test_specification/test_rkme.py index bdf8e74..89905f6 100644 --- a/tests/test_specification/test_rkme.py +++ b/tests/test_specification/test_rkme.py @@ -5,13 +5,13 @@ import unittest import tempfile import numpy as np -import learnware from learnware.specification import RKMEStatSpecification, RKMEImageStatSpecification from learnware.specification import generate_rkme_image_spec, generate_rkme_spec class TestRKME(unittest.TestCase): def test_rkme(self): + pass X = np.random.uniform(-10000, 10000, size=(5000, 200)) rkme = generate_rkme_spec(X) rkme.generate_stat_spec_from_data(X)