Model baseline model imports to snorkel/labeling/model (#1535)

snorkel-team · Jan 20, 2020 · 4c227a0 · 4c227a0
1 parent 4c36133
commit 4c227a0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/docs/packages.json b/docs/packages.json
@@ -17,7 +17,11 @@
             "lf.nlp.NLPLabelingFunction",
             "lf.nlp.nlp_labeling_function",
             "lf.nlp_spark.SparkNLPLabelingFunction",
-            "lf.nlp_spark.spark_nlp_labeling_function"
+            "lf.nlp_spark.spark_nlp_labeling_function",
+            "model.baselines.MajorityClassVoter",
+            "model.baselines.MajorityLabelVoter",
+            "model.baselines.RandomVoter",
+            "model.label_model.LabelModel"
         ],
         "map": [
             "spark.make_spark_mapper"

diff --git a/docs/packages/labeling.rst b/docs/packages/labeling.rst
@@ -12,14 +12,14 @@ Programmatic data set labeling: LF creation, models, and analysis utilities.
    apply.dask.DaskLFApplier
    LFAnalysis
    LFApplier
-   LabelModel
+   model.label_model.LabelModel
    LabelingFunction
-   MajorityClassVoter
-   MajorityLabelVoter
+   model.baselines.MajorityClassVoter
+   model.baselines.MajorityLabelVoter
    lf.nlp.NLPLabelingFunction
    PandasLFApplier
    apply.dask.PandasParallelLFApplier
-   RandomVoter
+   model.baselines.RandomVoter
    apply.spark.SparkLFApplier
    lf.nlp_spark.SparkNLPLabelingFunction
    filter_unlabeled_dataframe

diff --git a/snorkel/labeling/__init__.py b/snorkel/labeling/__init__.py
@@ -4,10 +4,4 @@
 from .apply.core import LFApplier  # noqa: F401
 from .apply.pandas import PandasLFApplier  # noqa: F401
 from .lf.core import LabelingFunction, labeling_function  # noqa: F401
-from .model.baselines import (  # noqa: F401
-    MajorityClassVoter,
-    MajorityLabelVoter,
-    RandomVoter,
-)
-from .model.label_model import LabelModel  # noqa: F401
 from .utils import filter_unlabeled_dataframe  # noqa: F401
diff --git a/snorkel/labeling/model/__init__.py b/snorkel/labeling/model/__init__.py
@@ -0,0 +1,2 @@
+from .baselines import MajorityClassVoter, MajorityLabelVoter, RandomVoter  # noqa: F401
+from .label_model import LabelModel  # noqa: F401
diff --git a/test/labeling/model/test_baseline.py b/test/labeling/model/test_baseline.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from snorkel.labeling import MajorityClassVoter, MajorityLabelVoter, RandomVoter
+from snorkel.labeling.model import MajorityClassVoter, MajorityLabelVoter, RandomVoter
 
 
 class BaselineModelTest(unittest.TestCase):

diff --git a/test/labeling/model/test_label_model.py b/test/labeling/model/test_label_model.py
@@ -9,7 +9,7 @@
 import torch.nn as nn
 import torch.optim as optim
 
-from snorkel.labeling import LabelModel
+from snorkel.labeling.model import LabelModel
 from snorkel.labeling.model.label_model import TrainConfig
 from snorkel.synthetic.synthetic_data import generate_simple_label_matrix
 

diff --git a/test/labeling/test_convergence.py b/test/labeling/test_convergence.py
@@ -6,12 +6,8 @@
 import pytest
 import torch
 
-from snorkel.labeling import (
-    LabelingFunction,
-    LabelModel,
-    PandasLFApplier,
-    labeling_function,
-)
+from snorkel.labeling import LabelingFunction, PandasLFApplier, labeling_function
+from snorkel.labeling.model import LabelModel
 from snorkel.preprocess import preprocessor
 from snorkel.types import DataPoint
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from .baselines import MajorityClassVoter, MajorityLabelVoter, RandomVoter # noqa: F401
		from .label_model import LabelModel # noqa: F401