Merge remote-tracking branch 'upstream/temp/docs'

Stephen0620 · Oct 30, 2018 · 93c7347 · 93c7347
2 parents 2350069 + 9337320
commit 93c7347
Show file tree

Hide file tree

Showing 187 changed files with 355 additions and 334 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -12,4 +12,4 @@ Project Docs
 - [API](https://docs.microsoft.com/en-us/nimbusml/overview)
 - [Tutorials](https://docs.microsoft.com/en-us/nimbusml/tutorials)
 - [Developer Guide](developers/developer-guide.md)
-- [Contributing to ML.NET](project-docs/contributing.md)
+- [Contributing to ML.NET](project-docs/contributing.md)
diff --git a/src/python/nimbusml.pyproj b/src/python/nimbusml.pyproj
diff --git a/src/python/nimbusml/__init__.py b/src/python/nimbusml/__init__.py
@@ -22,7 +22,7 @@
 from .internal.utils.data_stream import BinaryDataStream
 from .internal.utils.data_stream import FileDataStream
 from .internal.utils.utils import run_tests
-from .pipeline import Pipeline
+from ._pipeline import Pipeline
 
 if sys.platform.lower() == "linux":
     pkg_path = os.path.dirname(os.path.realpath(__file__))

diff --git a/src/python/nimbusml/__init__.py.in b/src/python/nimbusml/__init__.py.in
@@ -22,7 +22,7 @@ from .internal.utils.data_schema import DataSchema
 from .internal.utils.data_stream import BinaryDataStream
 from .internal.utils.data_stream import FileDataStream
 from .internal.utils.utils import run_tests
-from .pipeline import Pipeline
+from ._pipeline import Pipeline
 
 if sys.platform.lower() == "linux":
     pkg_path = os.path.dirname(os.path.realpath(__file__))

diff --git a/src/python/nimbusml/pipeline.py → src/python/nimbusml/_pipeline.py b/src/python/nimbusml/pipeline.py → src/python/nimbusml/_pipeline.py
diff --git a/src/python/nimbusml/cluster/__init__.py b/src/python/nimbusml/cluster/__init__.py
@@ -1,5 +1,5 @@
-from .kmeansplusplus import KMeansPlusPlus
+from ._kmeansplusplus import KMeansPlusPlus
 
 __all__ = [
     'KMeansPlusPlus'
-]
+]
diff --git a/...python/nimbusml/cluster/kmeansplusplus.py → ...ython/nimbusml/cluster/_kmeansplusplus.py b/...python/nimbusml/cluster/kmeansplusplus.py → ...ython/nimbusml/cluster/_kmeansplusplus.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClusterMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.cluster.kmeansplusplus import KMeansPlusPlus as core
+from ..internal.core.cluster._kmeansplusplus import KMeansPlusPlus as core
 from ..internal.utils.utils import trace
 
 

diff --git a/...python/nimbusml/datasets/data/__init__.py → ...ython/nimbusml/datasets/_data/__init__.py b/...python/nimbusml/datasets/data/__init__.py → ...ython/nimbusml/datasets/_data/__init__.py
diff --git a/...thon/nimbusml/datasets/data/gplv2/COPYING → ...hon/nimbusml/datasets/_data/gplv2/COPYING b/...thon/nimbusml/datasets/data/gplv2/COPYING → ...hon/nimbusml/datasets/_data/gplv2/COPYING
diff --git a/...mbusml/datasets/data/gplv2/airquality.csv → ...busml/datasets/_data/gplv2/airquality.csv b/...mbusml/datasets/data/gplv2/airquality.csv → ...busml/datasets/_data/gplv2/airquality.csv
diff --git a/...n/nimbusml/datasets/data/gplv2/infert.csv → .../nimbusml/datasets/_data/gplv2/infert.csv b/...n/nimbusml/datasets/data/gplv2/infert.csv → .../nimbusml/datasets/_data/gplv2/infert.csv
diff --git a/...atasets/data/test-100.uciadult.sample.csv → ...tasets/_data/test-100.uciadult.sample.csv b/...atasets/data/test-100.uciadult.sample.csv → ...tasets/_data/test-100.uciadult.sample.csv
diff --git a/...busml/datasets/data/test-msltr.sample.csv → ...usml/datasets/_data/test-msltr.sample.csv b/...busml/datasets/data/test-msltr.sample.csv → ...usml/datasets/_data/test-msltr.sample.csv
diff --git a/...busml/datasets/data/test-ticketchoice.csv → ...usml/datasets/_data/test-ticketchoice.csv b/...busml/datasets/data/test-ticketchoice.csv → ...usml/datasets/_data/test-ticketchoice.csv
diff --git a/...datasets/data/test-twitter.gen-sample.tsv → ...atasets/_data/test-twitter.gen-sample.tsv b/...datasets/data/test-twitter.gen-sample.tsv → ...atasets/_data/test-twitter.gen-sample.tsv
diff --git a/...l/datasets/data/test.wikipedia.sample.tsv → .../datasets/_data/test.wikipedia.sample.tsv b/...l/datasets/data/test.wikipedia.sample.tsv → .../datasets/_data/test.wikipedia.sample.tsv
diff --git a/...python/nimbusml/datasets/data/test_fs.csv → ...ython/nimbusml/datasets/_data/test_fs.csv b/...python/nimbusml/datasets/data/test_fs.csv → ...ython/nimbusml/datasets/_data/test_fs.csv
diff --git a/...hon/nimbusml/datasets/data/timeseries.csv → ...on/nimbusml/datasets/_data/timeseries.csv b/...hon/nimbusml/datasets/data/timeseries.csv → ...on/nimbusml/datasets/_data/timeseries.csv
diff --git a/src/python/nimbusml/datasets/data/topics.csv → ...python/nimbusml/datasets/_data/topics.csv b/src/python/nimbusml/datasets/data/topics.csv → ...python/nimbusml/datasets/_data/topics.csv
diff --git a/...asets/data/train-250.wikipedia.sample.tsv → ...sets/_data/train-250.wikipedia.sample.tsv b/...asets/data/train-250.wikipedia.sample.tsv → ...sets/_data/train-250.wikipedia.sample.tsv
diff --git a/...tasets/data/train-500.uciadult.sample.csv → ...asets/_data/train-500.uciadult.sample.csv b/...tasets/data/train-500.uciadult.sample.csv → ...asets/_data/train-500.uciadult.sample.csv
diff --git a/...usml/datasets/data/train-msltr.sample.csv → ...sml/datasets/_data/train-msltr.sample.csv b/...usml/datasets/data/train-msltr.sample.csv → ...sml/datasets/_data/train-msltr.sample.csv
diff --git a/...usml/datasets/data/train-ticketchoice.csv → ...sml/datasets/_data/train-ticketchoice.csv b/...usml/datasets/data/train-ticketchoice.csv → ...sml/datasets/_data/train-ticketchoice.csv
diff --git a/...atasets/data/train-twitter.gen-sample.tsv → ...tasets/_data/train-twitter.gen-sample.tsv b/...atasets/data/train-twitter.gen-sample.tsv → ...tasets/_data/train-twitter.gen-sample.tsv
diff --git a/...ython/nimbusml/datasets/data/train_fs.csv → ...thon/nimbusml/datasets/_data/train_fs.csv b/...ython/nimbusml/datasets/data/train_fs.csv → ...thon/nimbusml/datasets/_data/train_fs.csv
diff --git a/src/python/nimbusml/datasets/datasets.py b/src/python/nimbusml/datasets/datasets.py
@@ -177,7 +177,7 @@ def load(self):
             # pooled.stratum
             this = os.path.join(
                 os.path.dirname(__file__),
-                "data",
+                "_data",
                 "gplv2",
                 "infert.csv")
             self.__dict__['_data'] = pandas.read_csv(this)
@@ -231,7 +231,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "gplv2",
             "infert.csv")
 
@@ -264,7 +264,7 @@ def load(self):
             # pooled.stratum
             this = os.path.join(
                 os.path.dirname(__file__),
-                "data",
+                "_data",
                 "gplv2",
                 "airquality.csv")
             self.__dict__['_data'] = pandas.read_csv(this)
@@ -296,7 +296,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "gplv2",
             "airquality.csv")
 
@@ -324,7 +324,7 @@ def as_filepath(self):
         """
         Return file name.
         """
-        return os.path.join(os.path.dirname(__file__), "data",
+        return os.path.join(os.path.dirname(__file__), "_data",
                             "topics.csv")
 
 
@@ -353,7 +353,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "timeseries.csv")
 
 
@@ -381,7 +381,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-250.wikipedia.sample.tsv")
 
 
@@ -409,7 +409,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test.wikipedia.sample.tsv")
 
 
@@ -437,7 +437,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train_fs.csv")
 
 
@@ -465,7 +465,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test_fs.csv")
 
 
@@ -494,7 +494,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-msltr.sample.csv")
 
 
@@ -523,7 +523,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-msltr.sample.csv")
 
 
@@ -550,7 +550,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-500.uciadult.sample.csv")
 
 
@@ -577,7 +577,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-100.uciadult.sample.csv")
 
 
@@ -605,7 +605,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-twitter.gen-sample.tsv")
 
 
@@ -633,7 +633,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-twitter.gen-sample.tsv")
 
 
@@ -661,7 +661,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-ticketchoice.csv")
 
 
@@ -689,7 +689,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-ticketchoice.csv")
 
 

diff --git a/src/python/nimbusml/decomposition/__init__.py b/src/python/nimbusml/decomposition/__init__.py
@@ -1,7 +1,6 @@
-from .factorizationmachinebinaryclassifier import \
-    FactorizationMachineBinaryClassifier
-from .pcaanomalydetector import PcaAnomalyDetector
-from .pcatransformer import PcaTransformer
+from ._factorizationmachinebinaryclassifier import FactorizationMachineBinaryClassifier
+from ._pcaanomalydetector import PcaAnomalyDetector
+from ._pcatransformer import PcaTransformer
 
 __all__ = [
     'FactorizationMachineBinaryClassifier',

diff --git a/...n/factorizationmachinebinaryclassifier.py → .../_factorizationmachinebinaryclassifier.py b/...n/factorizationmachinebinaryclassifier.py → .../_factorizationmachinebinaryclassifier.py
@@ -13,8 +13,8 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.decomposition.factorizationmachinebinaryclassifier \
-    import FactorizationMachineBinaryClassifier as core
+from ..internal.core.decomposition._factorizationmachinebinaryclassifier import \
+    FactorizationMachineBinaryClassifier as core
 from ..internal.utils.utils import trace
 
 

diff --git a/...busml/decomposition/pcaanomalydetector.py → ...usml/decomposition/_pcaanomalydetector.py b/...busml/decomposition/pcaanomalydetector.py → ...usml/decomposition/_pcaanomalydetector.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.decomposition.pcaanomalydetector import \
+from ..internal.core.decomposition._pcaanomalydetector import \
     PcaAnomalyDetector as core
 from ..internal.utils.utils import trace
 

diff --git a/.../nimbusml/decomposition/pcatransformer.py → ...nimbusml/decomposition/_pcatransformer.py b/.../nimbusml/decomposition/pcatransformer.py → ...nimbusml/decomposition/_pcatransformer.py
@@ -13,7 +13,8 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.decomposition.pcatransformer import PcaTransformer as core
+from ..internal.core.decomposition._pcatransformer import \
+    PcaTransformer as core
 from ..internal.utils.utils import trace
 
 

diff --git a/src/python/nimbusml/ensemble/__init__.py b/src/python/nimbusml/ensemble/__init__.py
@@ -1,14 +1,14 @@
-from .fastforestbinaryclassifier import FastForestBinaryClassifier
-from .fastforestregressor import FastForestRegressor
-from .fasttreesbinaryclassifier import FastTreesBinaryClassifier
-from .fasttreesregressor import FastTreesRegressor
-from .fasttreestweedieregressor import FastTreesTweedieRegressor
-from .gambinaryclassifier import GamBinaryClassifier
-from .gamregressor import GamRegressor
-from .lightgbmbinaryclassifier import LightGbmBinaryClassifier
-from .lightgbmclassifier import LightGbmClassifier
-from .lightgbmranker import LightGbmRanker
-from .lightgbmregressor import LightGbmRegressor
+from ._fastforestbinaryclassifier import FastForestBinaryClassifier
+from ._fastforestregressor import FastForestRegressor
+from ._fasttreesbinaryclassifier import FastTreesBinaryClassifier
+from ._fasttreesregressor import FastTreesRegressor
+from ._fasttreestweedieregressor import FastTreesTweedieRegressor
+from ._gambinaryclassifier import GamBinaryClassifier
+from ._gamregressor import GamRegressor
+from ._lightgbmbinaryclassifier import LightGbmBinaryClassifier
+from ._lightgbmclassifier import LightGbmClassifier
+from ._lightgbmranker import LightGbmRanker
+from ._lightgbmregressor import LightGbmRegressor
 
 __all__ = [
     'FastForestBinaryClassifier',
@@ -23,3 +23,5 @@
     'LightGbmRanker',
     'LightGbmRegressor'
 ]
+
+
diff --git a/...ml/ensemble/fastforestbinaryclassifier.py → ...l/ensemble/_fastforestbinaryclassifier.py b/...ml/ensemble/fastforestbinaryclassifier.py → ...l/ensemble/_fastforestbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fastforestbinaryclassifier import \
+from ..internal.core.ensemble._fastforestbinaryclassifier import \
     FastForestBinaryClassifier as core
 from ..internal.utils.utils import trace
 

diff --git a/.../nimbusml/ensemble/fastforestregressor.py → ...nimbusml/ensemble/_fastforestregressor.py b/.../nimbusml/ensemble/fastforestregressor.py → ...nimbusml/ensemble/_fastforestregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fastforestregressor import \
+from ..internal.core.ensemble._fastforestregressor import \
     FastForestRegressor as core
 from ..internal.utils.utils import trace
 

diff --git a/...sml/ensemble/fasttreesbinaryclassifier.py → ...ml/ensemble/_fasttreesbinaryclassifier.py b/...sml/ensemble/fasttreesbinaryclassifier.py → ...ml/ensemble/_fasttreesbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fasttreesbinaryclassifier import \
+from ..internal.core.ensemble._fasttreesbinaryclassifier import \
     FastTreesBinaryClassifier as core
 from ..internal.utils.utils import trace
 

diff --git a/...n/nimbusml/ensemble/fasttreesregressor.py → .../nimbusml/ensemble/_fasttreesregressor.py b/...n/nimbusml/ensemble/fasttreesregressor.py → .../nimbusml/ensemble/_fasttreesregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fasttreesregressor import \
+from ..internal.core.ensemble._fasttreesregressor import \
     FastTreesRegressor as core
 from ..internal.utils.utils import trace
 

diff --git a/...sml/ensemble/fasttreestweedieregressor.py → ...ml/ensemble/_fasttreestweedieregressor.py b/...sml/ensemble/fasttreestweedieregressor.py → ...ml/ensemble/_fasttreestweedieregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fasttreestweedieregressor import \
+from ..internal.core.ensemble._fasttreestweedieregressor import \
     FastTreesTweedieRegressor as core
 from ..internal.utils.utils import trace
 

diff --git a/.../nimbusml/ensemble/gambinaryclassifier.py → ...nimbusml/ensemble/_gambinaryclassifier.py b/.../nimbusml/ensemble/gambinaryclassifier.py → ...nimbusml/ensemble/_gambinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.gambinaryclassifier import \
+from ..internal.core.ensemble._gambinaryclassifier import \
     GamBinaryClassifier as core
 from ..internal.utils.utils import trace
 

diff --git a/src/python/nimbusml/ensemble/gamregressor.py → ...python/nimbusml/ensemble/_gamregressor.py b/src/python/nimbusml/ensemble/gamregressor.py → ...python/nimbusml/ensemble/_gamregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.gamregressor import GamRegressor as core
+from ..internal.core.ensemble._gamregressor import GamRegressor as core
 from ..internal.utils.utils import trace
 
 

diff --git a/...usml/ensemble/lightgbmbinaryclassifier.py → ...sml/ensemble/_lightgbmbinaryclassifier.py b/...usml/ensemble/lightgbmbinaryclassifier.py → ...sml/ensemble/_lightgbmbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmbinaryclassifier import \
+from ..internal.core.ensemble._lightgbmbinaryclassifier import \
     LightGbmBinaryClassifier as core
 from ..internal.utils.utils import trace
 

diff --git a/...n/nimbusml/ensemble/lightgbmclassifier.py → .../nimbusml/ensemble/_lightgbmclassifier.py b/...n/nimbusml/ensemble/lightgbmclassifier.py → .../nimbusml/ensemble/_lightgbmclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmclassifier import \
+from ..internal.core.ensemble._lightgbmclassifier import \
     LightGbmClassifier as core
 from ..internal.utils.utils import trace
 

diff --git a/...ython/nimbusml/ensemble/lightgbmranker.py → ...thon/nimbusml/ensemble/_lightgbmranker.py b/...ython/nimbusml/ensemble/lightgbmranker.py → ...thon/nimbusml/ensemble/_lightgbmranker.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmranker import LightGbmRanker as core
+from ..internal.core.ensemble._lightgbmranker import LightGbmRanker as core
 from ..internal.utils.utils import trace
 
 

diff --git a/...on/nimbusml/ensemble/lightgbmregressor.py → ...n/nimbusml/ensemble/_lightgbmregressor.py b/...on/nimbusml/ensemble/lightgbmregressor.py → ...n/nimbusml/ensemble/_lightgbmregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmregressor import \
+from ..internal.core.ensemble._lightgbmregressor import \
     LightGbmRegressor as core
 from ..internal.utils.utils import trace
 

diff --git a/src/python/nimbusml/ensemble/booster/__init__.py b/src/python/nimbusml/ensemble/booster/__init__.py
@@ -1,9 +1,10 @@
-from .dart import Dart
-from .gbdt import Gbdt
-from .goss import Goss
+from ._dart import Dart
+from ._gbdt import Gbdt
+from ._goss import Goss
 
 __all__ = [
     'Dart',
     'Gbdt',
     'Goss'
 ]
+
diff --git a/src/python/nimbusml/ensemble/booster/dart.py → ...python/nimbusml/ensemble/booster/_dart.py b/src/python/nimbusml/ensemble/booster/dart.py → ...python/nimbusml/ensemble/booster/_dart.py
@@ -10,7 +10,7 @@
 __all__ = ["Dart"]
 
 
-from ...internal.core.ensemble.booster.dart import Dart as core
+from ...internal.core.ensemble.booster._dart import Dart as core
 from ...internal.utils.utils import trace