diff --git a/docs/README.md b/docs/README.md index fcfb4cb0..17859fe9 100644 --- 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) \ No newline at end of file diff --git a/src/python/nimbusml.pyproj b/src/python/nimbusml.pyproj index 0a59ab96..715eb81a 100644 --- a/src/python/nimbusml.pyproj +++ b/src/python/nimbusml.pyproj @@ -29,33 +29,33 @@ - + - + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + @@ -180,47 +180,47 @@ - - + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - + - - - - + + + + @@ -415,88 +415,88 @@ - - - - - + + + + + - + - + - - + + - - - + + + - - - + + + - - + + - + - - - - - - - - + + + + + + + + - - + + - - - + + + - - - + + + - - + + - - - - - - + + + + + + - + - - + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - + + @@ -510,42 +510,42 @@ - - - - - - + + + + + + - + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - + + - + @@ -705,8 +705,8 @@ - - + + @@ -1069,25 +1069,25 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + diff --git a/src/python/nimbusml/__init__.py b/src/python/nimbusml/__init__.py index 1403e7b4..b71be059 100644 --- 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 index 4837bb22..e9cb7c67 100644 --- 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 b/src/python/nimbusml/_pipeline.py similarity index 100% rename from src/python/nimbusml/pipeline.py rename to src/python/nimbusml/_pipeline.py diff --git a/src/python/nimbusml/cluster/__init__.py b/src/python/nimbusml/cluster/__init__.py index 13cda025..ea2b1e26 100644 --- 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' -] +] \ No newline at end of file diff --git a/src/python/nimbusml/cluster/kmeansplusplus.py b/src/python/nimbusml/cluster/_kmeansplusplus.py similarity index 98% rename from src/python/nimbusml/cluster/kmeansplusplus.py rename to src/python/nimbusml/cluster/_kmeansplusplus.py index f35d8c49..7b9ab64e 100644 --- a/src/python/nimbusml/cluster/kmeansplusplus.py +++ b/src/python/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/src/python/nimbusml/datasets/data/__init__.py b/src/python/nimbusml/datasets/_data/__init__.py similarity index 100% rename from src/python/nimbusml/datasets/data/__init__.py rename to src/python/nimbusml/datasets/_data/__init__.py diff --git a/src/python/nimbusml/datasets/data/gplv2/COPYING b/src/python/nimbusml/datasets/_data/gplv2/COPYING similarity index 100% rename from src/python/nimbusml/datasets/data/gplv2/COPYING rename to src/python/nimbusml/datasets/_data/gplv2/COPYING diff --git a/src/python/nimbusml/datasets/data/gplv2/airquality.csv b/src/python/nimbusml/datasets/_data/gplv2/airquality.csv similarity index 100% rename from src/python/nimbusml/datasets/data/gplv2/airquality.csv rename to src/python/nimbusml/datasets/_data/gplv2/airquality.csv diff --git a/src/python/nimbusml/datasets/data/gplv2/infert.csv b/src/python/nimbusml/datasets/_data/gplv2/infert.csv similarity index 100% rename from src/python/nimbusml/datasets/data/gplv2/infert.csv rename to src/python/nimbusml/datasets/_data/gplv2/infert.csv diff --git a/src/python/nimbusml/datasets/data/test-100.uciadult.sample.csv b/src/python/nimbusml/datasets/_data/test-100.uciadult.sample.csv similarity index 100% rename from src/python/nimbusml/datasets/data/test-100.uciadult.sample.csv rename to src/python/nimbusml/datasets/_data/test-100.uciadult.sample.csv diff --git a/src/python/nimbusml/datasets/data/test-msltr.sample.csv b/src/python/nimbusml/datasets/_data/test-msltr.sample.csv similarity index 100% rename from src/python/nimbusml/datasets/data/test-msltr.sample.csv rename to src/python/nimbusml/datasets/_data/test-msltr.sample.csv diff --git a/src/python/nimbusml/datasets/data/test-ticketchoice.csv b/src/python/nimbusml/datasets/_data/test-ticketchoice.csv similarity index 100% rename from src/python/nimbusml/datasets/data/test-ticketchoice.csv rename to src/python/nimbusml/datasets/_data/test-ticketchoice.csv diff --git a/src/python/nimbusml/datasets/data/test-twitter.gen-sample.tsv b/src/python/nimbusml/datasets/_data/test-twitter.gen-sample.tsv similarity index 100% rename from src/python/nimbusml/datasets/data/test-twitter.gen-sample.tsv rename to src/python/nimbusml/datasets/_data/test-twitter.gen-sample.tsv diff --git a/src/python/nimbusml/datasets/data/test.wikipedia.sample.tsv b/src/python/nimbusml/datasets/_data/test.wikipedia.sample.tsv similarity index 100% rename from src/python/nimbusml/datasets/data/test.wikipedia.sample.tsv rename to src/python/nimbusml/datasets/_data/test.wikipedia.sample.tsv diff --git a/src/python/nimbusml/datasets/data/test_fs.csv b/src/python/nimbusml/datasets/_data/test_fs.csv similarity index 100% rename from src/python/nimbusml/datasets/data/test_fs.csv rename to src/python/nimbusml/datasets/_data/test_fs.csv diff --git a/src/python/nimbusml/datasets/data/timeseries.csv b/src/python/nimbusml/datasets/_data/timeseries.csv similarity index 100% rename from src/python/nimbusml/datasets/data/timeseries.csv rename to src/python/nimbusml/datasets/_data/timeseries.csv diff --git a/src/python/nimbusml/datasets/data/topics.csv b/src/python/nimbusml/datasets/_data/topics.csv similarity index 100% rename from src/python/nimbusml/datasets/data/topics.csv rename to src/python/nimbusml/datasets/_data/topics.csv diff --git a/src/python/nimbusml/datasets/data/train-250.wikipedia.sample.tsv b/src/python/nimbusml/datasets/_data/train-250.wikipedia.sample.tsv similarity index 100% rename from src/python/nimbusml/datasets/data/train-250.wikipedia.sample.tsv rename to src/python/nimbusml/datasets/_data/train-250.wikipedia.sample.tsv diff --git a/src/python/nimbusml/datasets/data/train-500.uciadult.sample.csv b/src/python/nimbusml/datasets/_data/train-500.uciadult.sample.csv similarity index 100% rename from src/python/nimbusml/datasets/data/train-500.uciadult.sample.csv rename to src/python/nimbusml/datasets/_data/train-500.uciadult.sample.csv diff --git a/src/python/nimbusml/datasets/data/train-msltr.sample.csv b/src/python/nimbusml/datasets/_data/train-msltr.sample.csv similarity index 100% rename from src/python/nimbusml/datasets/data/train-msltr.sample.csv rename to src/python/nimbusml/datasets/_data/train-msltr.sample.csv diff --git a/src/python/nimbusml/datasets/data/train-ticketchoice.csv b/src/python/nimbusml/datasets/_data/train-ticketchoice.csv similarity index 100% rename from src/python/nimbusml/datasets/data/train-ticketchoice.csv rename to src/python/nimbusml/datasets/_data/train-ticketchoice.csv diff --git a/src/python/nimbusml/datasets/data/train-twitter.gen-sample.tsv b/src/python/nimbusml/datasets/_data/train-twitter.gen-sample.tsv similarity index 100% rename from src/python/nimbusml/datasets/data/train-twitter.gen-sample.tsv rename to src/python/nimbusml/datasets/_data/train-twitter.gen-sample.tsv diff --git a/src/python/nimbusml/datasets/data/train_fs.csv b/src/python/nimbusml/datasets/_data/train_fs.csv similarity index 100% rename from src/python/nimbusml/datasets/data/train_fs.csv rename to src/python/nimbusml/datasets/_data/train_fs.csv diff --git a/src/python/nimbusml/datasets/datasets.py b/src/python/nimbusml/datasets/datasets.py index 9cb85145..8e8cd8a2 100644 --- 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 index 7beb252f..c859c41d 100644 --- 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/src/python/nimbusml/decomposition/factorizationmachinebinaryclassifier.py b/src/python/nimbusml/decomposition/_factorizationmachinebinaryclassifier.py similarity index 97% rename from src/python/nimbusml/decomposition/factorizationmachinebinaryclassifier.py rename to src/python/nimbusml/decomposition/_factorizationmachinebinaryclassifier.py index 7382dd10..fd103ad9 100644 --- a/src/python/nimbusml/decomposition/factorizationmachinebinaryclassifier.py +++ b/src/python/nimbusml/decomposition/_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/src/python/nimbusml/decomposition/pcaanomalydetector.py b/src/python/nimbusml/decomposition/_pcaanomalydetector.py similarity index 98% rename from src/python/nimbusml/decomposition/pcaanomalydetector.py rename to src/python/nimbusml/decomposition/_pcaanomalydetector.py index 57b21b90..544bb3b6 100644 --- a/src/python/nimbusml/decomposition/pcaanomalydetector.py +++ b/src/python/nimbusml/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/src/python/nimbusml/decomposition/pcatransformer.py b/src/python/nimbusml/decomposition/_pcatransformer.py similarity index 98% rename from src/python/nimbusml/decomposition/pcatransformer.py rename to src/python/nimbusml/decomposition/_pcatransformer.py index 7ddb6326..c21b5925 100644 --- a/src/python/nimbusml/decomposition/pcatransformer.py +++ b/src/python/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 index b4934efa..04c555f8 100644 --- 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/src/python/nimbusml/ensemble/fastforestbinaryclassifier.py b/src/python/nimbusml/ensemble/_fastforestbinaryclassifier.py similarity index 99% rename from src/python/nimbusml/ensemble/fastforestbinaryclassifier.py rename to src/python/nimbusml/ensemble/_fastforestbinaryclassifier.py index 09c7677f..29a43b71 100644 --- a/src/python/nimbusml/ensemble/fastforestbinaryclassifier.py +++ b/src/python/nimbusml/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/src/python/nimbusml/ensemble/fastforestregressor.py b/src/python/nimbusml/ensemble/_fastforestregressor.py similarity index 99% rename from src/python/nimbusml/ensemble/fastforestregressor.py rename to src/python/nimbusml/ensemble/_fastforestregressor.py index 9255d953..ca330d5e 100644 --- a/src/python/nimbusml/ensemble/fastforestregressor.py +++ b/src/python/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/src/python/nimbusml/ensemble/fasttreesbinaryclassifier.py b/src/python/nimbusml/ensemble/_fasttreesbinaryclassifier.py similarity index 99% rename from src/python/nimbusml/ensemble/fasttreesbinaryclassifier.py rename to src/python/nimbusml/ensemble/_fasttreesbinaryclassifier.py index 7989a1e9..06009f71 100644 --- a/src/python/nimbusml/ensemble/fasttreesbinaryclassifier.py +++ b/src/python/nimbusml/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/src/python/nimbusml/ensemble/fasttreesregressor.py b/src/python/nimbusml/ensemble/_fasttreesregressor.py similarity index 99% rename from src/python/nimbusml/ensemble/fasttreesregressor.py rename to src/python/nimbusml/ensemble/_fasttreesregressor.py index 3a55bb4c..b5d3cd3b 100644 --- a/src/python/nimbusml/ensemble/fasttreesregressor.py +++ b/src/python/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/src/python/nimbusml/ensemble/fasttreestweedieregressor.py b/src/python/nimbusml/ensemble/_fasttreestweedieregressor.py similarity index 99% rename from src/python/nimbusml/ensemble/fasttreestweedieregressor.py rename to src/python/nimbusml/ensemble/_fasttreestweedieregressor.py index e9ac1750..0f0308b9 100644 --- a/src/python/nimbusml/ensemble/fasttreestweedieregressor.py +++ b/src/python/nimbusml/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/src/python/nimbusml/ensemble/gambinaryclassifier.py b/src/python/nimbusml/ensemble/_gambinaryclassifier.py similarity index 99% rename from src/python/nimbusml/ensemble/gambinaryclassifier.py rename to src/python/nimbusml/ensemble/_gambinaryclassifier.py index 2427c2ba..8e791440 100644 --- a/src/python/nimbusml/ensemble/gambinaryclassifier.py +++ b/src/python/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 b/src/python/nimbusml/ensemble/_gamregressor.py similarity index 99% rename from src/python/nimbusml/ensemble/gamregressor.py rename to src/python/nimbusml/ensemble/_gamregressor.py index 13587cd8..3043721b 100644 --- a/src/python/nimbusml/ensemble/gamregressor.py +++ b/src/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/src/python/nimbusml/ensemble/lightgbmbinaryclassifier.py b/src/python/nimbusml/ensemble/_lightgbmbinaryclassifier.py similarity index 99% rename from src/python/nimbusml/ensemble/lightgbmbinaryclassifier.py rename to src/python/nimbusml/ensemble/_lightgbmbinaryclassifier.py index 8f0d3673..93de3f83 100644 --- a/src/python/nimbusml/ensemble/lightgbmbinaryclassifier.py +++ b/src/python/nimbusml/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/src/python/nimbusml/ensemble/lightgbmclassifier.py b/src/python/nimbusml/ensemble/_lightgbmclassifier.py similarity index 99% rename from src/python/nimbusml/ensemble/lightgbmclassifier.py rename to src/python/nimbusml/ensemble/_lightgbmclassifier.py index a8e56eaf..806edad9 100644 --- a/src/python/nimbusml/ensemble/lightgbmclassifier.py +++ b/src/python/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/src/python/nimbusml/ensemble/lightgbmranker.py b/src/python/nimbusml/ensemble/_lightgbmranker.py similarity index 99% rename from src/python/nimbusml/ensemble/lightgbmranker.py rename to src/python/nimbusml/ensemble/_lightgbmranker.py index 890b4de0..f2796ac0 100644 --- a/src/python/nimbusml/ensemble/lightgbmranker.py +++ b/src/python/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/src/python/nimbusml/ensemble/lightgbmregressor.py b/src/python/nimbusml/ensemble/_lightgbmregressor.py similarity index 99% rename from src/python/nimbusml/ensemble/lightgbmregressor.py rename to src/python/nimbusml/ensemble/_lightgbmregressor.py index 8ad088c4..d6ff81c7 100644 --- a/src/python/nimbusml/ensemble/lightgbmregressor.py +++ b/src/python/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 index 91cf250a..608a2eca 100644 --- 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 b/src/python/nimbusml/ensemble/booster/_dart.py similarity index 98% rename from src/python/nimbusml/ensemble/booster/dart.py rename to src/python/nimbusml/ensemble/booster/_dart.py index a4536a2e..4bc0bd6b 100644 --- a/src/python/nimbusml/ensemble/booster/dart.py +++ b/src/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 diff --git a/src/python/nimbusml/ensemble/booster/gbdt.py b/src/python/nimbusml/ensemble/booster/_gbdt.py similarity index 98% rename from src/python/nimbusml/ensemble/booster/gbdt.py rename to src/python/nimbusml/ensemble/booster/_gbdt.py index ba69c9e2..aa16289b 100644 --- a/src/python/nimbusml/ensemble/booster/gbdt.py +++ b/src/python/nimbusml/ensemble/booster/_gbdt.py @@ -10,7 +10,7 @@ __all__ = ["Gbdt"] -from ...internal.core.ensemble.booster.gbdt import Gbdt as core +from ...internal.core.ensemble.booster._gbdt import Gbdt as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/ensemble/booster/goss.py b/src/python/nimbusml/ensemble/booster/_goss.py similarity index 98% rename from src/python/nimbusml/ensemble/booster/goss.py rename to src/python/nimbusml/ensemble/booster/_goss.py index 64863766..8da24823 100644 --- a/src/python/nimbusml/ensemble/booster/goss.py +++ b/src/python/nimbusml/ensemble/booster/_goss.py @@ -10,7 +10,7 @@ __all__ = ["Goss"] -from ...internal.core.ensemble.booster.goss import Goss as core +from ...internal.core.ensemble.booster._goss import Goss as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/__init__.py b/src/python/nimbusml/feature_extraction/__init__.py index 18ea3694..d7f47ac0 100644 --- a/src/python/nimbusml/feature_extraction/__init__.py +++ b/src/python/nimbusml/feature_extraction/__init__.py @@ -1,5 +1,6 @@ -from .treefeaturizer import TreeFeaturizer +from ._treefeaturizer import TreeFeaturizer __all__ = [ 'TreeFeaturizer' ] + diff --git a/src/python/nimbusml/feature_extraction/treefeaturizer.py b/src/python/nimbusml/feature_extraction/_treefeaturizer.py similarity index 97% rename from src/python/nimbusml/feature_extraction/treefeaturizer.py rename to src/python/nimbusml/feature_extraction/_treefeaturizer.py index 1b12fe35..a3ccd111 100644 --- a/src/python/nimbusml/feature_extraction/treefeaturizer.py +++ b/src/python/nimbusml/feature_extraction/_treefeaturizer.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.feature_extraction.treefeaturizer import \ +from ..internal.core.feature_extraction._treefeaturizer import \ TreeFeaturizer as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/categorical/__init__.py b/src/python/nimbusml/feature_extraction/categorical/__init__.py index 6e3ee58a..cd5239c0 100644 --- a/src/python/nimbusml/feature_extraction/categorical/__init__.py +++ b/src/python/nimbusml/feature_extraction/categorical/__init__.py @@ -1,7 +1,10 @@ -from .onehothashvectorizer import OneHotHashVectorizer -from .onehotvectorizer import OneHotVectorizer +from ._onehothashvectorizer import OneHotHashVectorizer +from ._onehotvectorizer import OneHotVectorizer + __all__ = [ 'OneHotHashVectorizer', 'OneHotVectorizer' ] + + diff --git a/src/python/nimbusml/feature_extraction/categorical/onehothashvectorizer.py b/src/python/nimbusml/feature_extraction/categorical/_onehothashvectorizer.py similarity index 97% rename from src/python/nimbusml/feature_extraction/categorical/onehothashvectorizer.py rename to src/python/nimbusml/feature_extraction/categorical/_onehothashvectorizer.py index 501ac7b8..d2bba455 100644 --- a/src/python/nimbusml/feature_extraction/categorical/onehothashvectorizer.py +++ b/src/python/nimbusml/feature_extraction/categorical/_onehothashvectorizer.py @@ -13,8 +13,8 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.categorical.onehothashvectorizer \ - import OneHotHashVectorizer as core +from ...internal.core.feature_extraction.categorical._onehothashvectorizer import \ + OneHotHashVectorizer as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/categorical/onehotvectorizer.py b/src/python/nimbusml/feature_extraction/categorical/_onehotvectorizer.py similarity index 98% rename from src/python/nimbusml/feature_extraction/categorical/onehotvectorizer.py rename to src/python/nimbusml/feature_extraction/categorical/_onehotvectorizer.py index bca0fa5b..7da2e4a8 100644 --- a/src/python/nimbusml/feature_extraction/categorical/onehotvectorizer.py +++ b/src/python/nimbusml/feature_extraction/categorical/_onehotvectorizer.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.categorical.onehotvectorizer import \ +from ...internal.core.feature_extraction.categorical._onehotvectorizer import \ OneHotVectorizer as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/image/__init__.py b/src/python/nimbusml/feature_extraction/image/__init__.py index 05a3deed..96a3ed4c 100644 --- a/src/python/nimbusml/feature_extraction/image/__init__.py +++ b/src/python/nimbusml/feature_extraction/image/__init__.py @@ -1,9 +1,11 @@ -from .loader import Loader -from .pixelextractor import PixelExtractor -from .resizer import Resizer +from ._loader import Loader +from ._pixelextractor import PixelExtractor +from ._resizer import Resizer __all__ = [ 'Loader', 'PixelExtractor', 'Resizer' ] + + diff --git a/src/python/nimbusml/feature_extraction/image/loader.py b/src/python/nimbusml/feature_extraction/image/_loader.py similarity index 96% rename from src/python/nimbusml/feature_extraction/image/loader.py rename to src/python/nimbusml/feature_extraction/image/_loader.py index bd93a080..c5bc6625 100644 --- a/src/python/nimbusml/feature_extraction/image/loader.py +++ b/src/python/nimbusml/feature_extraction/image/_loader.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.image.loader import Loader as core +from ...internal.core.feature_extraction.image._loader import Loader as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/image/pixelextractor.py b/src/python/nimbusml/feature_extraction/image/_pixelextractor.py similarity index 98% rename from src/python/nimbusml/feature_extraction/image/pixelextractor.py rename to src/python/nimbusml/feature_extraction/image/_pixelextractor.py index 89219e4c..14f4f305 100644 --- a/src/python/nimbusml/feature_extraction/image/pixelextractor.py +++ b/src/python/nimbusml/feature_extraction/image/_pixelextractor.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.image.pixelextractor import \ +from ...internal.core.feature_extraction.image._pixelextractor import \ PixelExtractor as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/image/resizer.py b/src/python/nimbusml/feature_extraction/image/_resizer.py similarity index 97% rename from src/python/nimbusml/feature_extraction/image/resizer.py rename to src/python/nimbusml/feature_extraction/image/_resizer.py index 77d9434f..bd8a9008 100644 --- a/src/python/nimbusml/feature_extraction/image/resizer.py +++ b/src/python/nimbusml/feature_extraction/image/_resizer.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.image.resizer import Resizer as core +from ...internal.core.feature_extraction.image._resizer import Resizer as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/text/__init__.py b/src/python/nimbusml/feature_extraction/text/__init__.py index 7dbd24cf..450a82b1 100644 --- a/src/python/nimbusml/feature_extraction/text/__init__.py +++ b/src/python/nimbusml/feature_extraction/text/__init__.py @@ -1,7 +1,7 @@ -from .lightlda import LightLda -from .ngramfeaturizer import NGramFeaturizer -from .sentiment import Sentiment -from .wordembedding import WordEmbedding +from ._lightlda import LightLda +from ._ngramfeaturizer import NGramFeaturizer +from ._sentiment import Sentiment +from ._wordembedding import WordEmbedding __all__ = [ 'LightLda', @@ -9,3 +9,4 @@ 'Sentiment', 'WordEmbedding' ] + diff --git a/src/python/nimbusml/feature_extraction/text/lightlda.py b/src/python/nimbusml/feature_extraction/text/_lightlda.py similarity index 98% rename from src/python/nimbusml/feature_extraction/text/lightlda.py rename to src/python/nimbusml/feature_extraction/text/_lightlda.py index 9e8ac415..27de602b 100644 --- a/src/python/nimbusml/feature_extraction/text/lightlda.py +++ b/src/python/nimbusml/feature_extraction/text/_lightlda.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.text.lightlda import LightLda as core +from ...internal.core.feature_extraction.text._lightlda import LightLda as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/text/ngramfeaturizer.py b/src/python/nimbusml/feature_extraction/text/_ngramfeaturizer.py similarity index 99% rename from src/python/nimbusml/feature_extraction/text/ngramfeaturizer.py rename to src/python/nimbusml/feature_extraction/text/_ngramfeaturizer.py index 7b19e916..f942b040 100644 --- a/src/python/nimbusml/feature_extraction/text/ngramfeaturizer.py +++ b/src/python/nimbusml/feature_extraction/text/_ngramfeaturizer.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.text.ngramfeaturizer import \ +from ...internal.core.feature_extraction.text._ngramfeaturizer import \ NGramFeaturizer as core from ...internal.utils.utils import trace from .extractor import Ngram diff --git a/src/python/nimbusml/feature_extraction/text/sentiment.py b/src/python/nimbusml/feature_extraction/text/_sentiment.py similarity index 97% rename from src/python/nimbusml/feature_extraction/text/sentiment.py rename to src/python/nimbusml/feature_extraction/text/_sentiment.py index a3363216..572dac3c 100644 --- a/src/python/nimbusml/feature_extraction/text/sentiment.py +++ b/src/python/nimbusml/feature_extraction/text/_sentiment.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.text.sentiment import \ +from ...internal.core.feature_extraction.text._sentiment import \ Sentiment as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/text/wordembedding.py b/src/python/nimbusml/feature_extraction/text/_wordembedding.py similarity index 98% rename from src/python/nimbusml/feature_extraction/text/wordembedding.py rename to src/python/nimbusml/feature_extraction/text/_wordembedding.py index 452c735e..c604df04 100644 --- a/src/python/nimbusml/feature_extraction/text/wordembedding.py +++ b/src/python/nimbusml/feature_extraction/text/_wordembedding.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.feature_extraction.text.wordembedding import \ +from ...internal.core.feature_extraction.text._wordembedding import \ WordEmbedding as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/text/extractor/__init__.py b/src/python/nimbusml/feature_extraction/text/extractor/__init__.py index dcef2742..53015647 100644 --- a/src/python/nimbusml/feature_extraction/text/extractor/__init__.py +++ b/src/python/nimbusml/feature_extraction/text/extractor/__init__.py @@ -1,7 +1,8 @@ -from .ngram import Ngram -from .ngramhash import NgramHash +from ._ngram import Ngram +from ._ngramhash import NgramHash __all__ = [ 'Ngram', 'NgramHash' ] + diff --git a/src/python/nimbusml/feature_extraction/text/extractor/ngram.py b/src/python/nimbusml/feature_extraction/text/extractor/_ngram.py similarity index 97% rename from src/python/nimbusml/feature_extraction/text/extractor/ngram.py rename to src/python/nimbusml/feature_extraction/text/extractor/_ngram.py index 8b40e117..cb4fc113 100644 --- a/src/python/nimbusml/feature_extraction/text/extractor/ngram.py +++ b/src/python/nimbusml/feature_extraction/text/extractor/_ngram.py @@ -10,7 +10,7 @@ __all__ = ["Ngram"] -from ....internal.core.feature_extraction.text.extractor.ngram import \ +from ....internal.core.feature_extraction.text.extractor._ngram import \ Ngram as core from ....internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/text/extractor/ngramhash.py b/src/python/nimbusml/feature_extraction/text/extractor/_ngramhash.py similarity index 98% rename from src/python/nimbusml/feature_extraction/text/extractor/ngramhash.py rename to src/python/nimbusml/feature_extraction/text/extractor/_ngramhash.py index 5a79b890..8d7c9c92 100644 --- a/src/python/nimbusml/feature_extraction/text/extractor/ngramhash.py +++ b/src/python/nimbusml/feature_extraction/text/extractor/_ngramhash.py @@ -10,7 +10,7 @@ __all__ = ["NgramHash"] -from ....internal.core.feature_extraction.text.extractor.ngramhash import \ +from ....internal.core.feature_extraction.text.extractor._ngramhash import \ NgramHash as core from ....internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py b/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py index d58465be..9f3dbb9b 100644 --- a/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py +++ b/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py @@ -1,7 +1,8 @@ -from .customstopwordsremover import CustomStopWordsRemover -from .predefinedstopwordsremover import PredefinedStopWordsRemover +from ._customstopwordsremover import CustomStopWordsRemover +from ._predefinedstopwordsremover import PredefinedStopWordsRemover __all__ = [ 'CustomStopWordsRemover', 'PredefinedStopWordsRemover' ] + diff --git a/src/python/nimbusml/feature_extraction/text/stopwords/customstopwordsremover.py b/src/python/nimbusml/feature_extraction/text/stopwords/_customstopwordsremover.py similarity index 93% rename from src/python/nimbusml/feature_extraction/text/stopwords/customstopwordsremover.py rename to src/python/nimbusml/feature_extraction/text/stopwords/_customstopwordsremover.py index b911ee10..d9ac5233 100644 --- a/src/python/nimbusml/feature_extraction/text/stopwords/customstopwordsremover.py +++ b/src/python/nimbusml/feature_extraction/text/stopwords/_customstopwordsremover.py @@ -9,9 +9,9 @@ __all__ = ["CustomStopWordsRemover"] -from \ - ....internal.core.feature_extraction.text.stopwords.customstopwordsremover \ - import CustomStopWordsRemover as core + +from ....internal.core.feature_extraction.text.stopwords._customstopwordsremover import \ + CustomStopWordsRemover as core from ....internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_extraction/text/stopwords/predefinedstopwordsremover.py b/src/python/nimbusml/feature_extraction/text/stopwords/_predefinedstopwordsremover.py similarity index 92% rename from src/python/nimbusml/feature_extraction/text/stopwords/predefinedstopwordsremover.py rename to src/python/nimbusml/feature_extraction/text/stopwords/_predefinedstopwordsremover.py index 1a236cb1..b2a56371 100644 --- a/src/python/nimbusml/feature_extraction/text/stopwords/predefinedstopwordsremover.py +++ b/src/python/nimbusml/feature_extraction/text/stopwords/_predefinedstopwordsremover.py @@ -9,9 +9,9 @@ __all__ = ["PredefinedStopWordsRemover"] -from \ - ....internal.core.feature_extraction.text.stopwords.predefinedstopwordsremover \ - import PredefinedStopWordsRemover as core + +from ....internal.core.feature_extraction.text.stopwords._predefinedstopwordsremover import \ + PredefinedStopWordsRemover as core from ....internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_selection/__init__.py b/src/python/nimbusml/feature_selection/__init__.py index 8b325f18..755dd694 100644 --- a/src/python/nimbusml/feature_selection/__init__.py +++ b/src/python/nimbusml/feature_selection/__init__.py @@ -1,7 +1,9 @@ -from .countselector import CountSelector -from .mutualinformationselector import MutualInformationSelector +from ._countselector import CountSelector +from ._mutualinformationselector import MutualInformationSelector __all__ = [ 'CountSelector', 'MutualInformationSelector' ] + + diff --git a/src/python/nimbusml/feature_selection/countselector.py b/src/python/nimbusml/feature_selection/_countselector.py similarity index 97% rename from src/python/nimbusml/feature_selection/countselector.py rename to src/python/nimbusml/feature_selection/_countselector.py index 7aabbf33..ddf15ef5 100644 --- a/src/python/nimbusml/feature_selection/countselector.py +++ b/src/python/nimbusml/feature_selection/_countselector.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.feature_selection.countselector import \ +from ..internal.core.feature_selection._countselector import \ CountSelector as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/feature_selection/mutualinformationselector.py b/src/python/nimbusml/feature_selection/_mutualinformationselector.py similarity index 98% rename from src/python/nimbusml/feature_selection/mutualinformationselector.py rename to src/python/nimbusml/feature_selection/_mutualinformationselector.py index a8837293..c9f6e6fa 100644 --- a/src/python/nimbusml/feature_selection/mutualinformationselector.py +++ b/src/python/nimbusml/feature_selection/_mutualinformationselector.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.feature_selection.mutualinformationselector import \ +from ..internal.core.feature_selection._mutualinformationselector import \ MutualInformationSelector as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/internal/core/cluster/kmeansplusplus.py b/src/python/nimbusml/internal/core/cluster/_kmeansplusplus.py similarity index 100% rename from src/python/nimbusml/internal/core/cluster/kmeansplusplus.py rename to src/python/nimbusml/internal/core/cluster/_kmeansplusplus.py diff --git a/src/python/nimbusml/internal/core/decomposition/factorizationmachinebinaryclassifier.py b/src/python/nimbusml/internal/core/decomposition/_factorizationmachinebinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/decomposition/factorizationmachinebinaryclassifier.py rename to src/python/nimbusml/internal/core/decomposition/_factorizationmachinebinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/decomposition/pcaanomalydetector.py b/src/python/nimbusml/internal/core/decomposition/_pcaanomalydetector.py similarity index 100% rename from src/python/nimbusml/internal/core/decomposition/pcaanomalydetector.py rename to src/python/nimbusml/internal/core/decomposition/_pcaanomalydetector.py diff --git a/src/python/nimbusml/internal/core/decomposition/pcatransformer.py b/src/python/nimbusml/internal/core/decomposition/_pcatransformer.py similarity index 100% rename from src/python/nimbusml/internal/core/decomposition/pcatransformer.py rename to src/python/nimbusml/internal/core/decomposition/_pcatransformer.py diff --git a/src/python/nimbusml/internal/core/ensemble/fastforestbinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_fastforestbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/fastforestbinaryclassifier.py rename to src/python/nimbusml/internal/core/ensemble/_fastforestbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/ensemble/fastforestregressor.py b/src/python/nimbusml/internal/core/ensemble/_fastforestregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/fastforestregressor.py rename to src/python/nimbusml/internal/core/ensemble/_fastforestregressor.py diff --git a/src/python/nimbusml/internal/core/ensemble/fasttreesbinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_fasttreesbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/fasttreesbinaryclassifier.py rename to src/python/nimbusml/internal/core/ensemble/_fasttreesbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/ensemble/fasttreesregressor.py b/src/python/nimbusml/internal/core/ensemble/_fasttreesregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/fasttreesregressor.py rename to src/python/nimbusml/internal/core/ensemble/_fasttreesregressor.py diff --git a/src/python/nimbusml/internal/core/ensemble/fasttreestweedieregressor.py b/src/python/nimbusml/internal/core/ensemble/_fasttreestweedieregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/fasttreestweedieregressor.py rename to src/python/nimbusml/internal/core/ensemble/_fasttreestweedieregressor.py diff --git a/src/python/nimbusml/internal/core/ensemble/gambinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_gambinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/gambinaryclassifier.py rename to src/python/nimbusml/internal/core/ensemble/_gambinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/ensemble/gamregressor.py b/src/python/nimbusml/internal/core/ensemble/_gamregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/gamregressor.py rename to src/python/nimbusml/internal/core/ensemble/_gamregressor.py diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmbinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/lightgbmbinaryclassifier.py rename to src/python/nimbusml/internal/core/ensemble/_lightgbmbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmclassifier.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/lightgbmclassifier.py rename to src/python/nimbusml/internal/core/ensemble/_lightgbmclassifier.py diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmranker.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmranker.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/lightgbmranker.py rename to src/python/nimbusml/internal/core/ensemble/_lightgbmranker.py diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmregressor.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/lightgbmregressor.py rename to src/python/nimbusml/internal/core/ensemble/_lightgbmregressor.py diff --git a/src/python/nimbusml/internal/core/ensemble/booster/dart.py b/src/python/nimbusml/internal/core/ensemble/booster/_dart.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/booster/dart.py rename to src/python/nimbusml/internal/core/ensemble/booster/_dart.py diff --git a/src/python/nimbusml/internal/core/ensemble/booster/gbdt.py b/src/python/nimbusml/internal/core/ensemble/booster/_gbdt.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/booster/gbdt.py rename to src/python/nimbusml/internal/core/ensemble/booster/_gbdt.py diff --git a/src/python/nimbusml/internal/core/ensemble/booster/goss.py b/src/python/nimbusml/internal/core/ensemble/booster/_goss.py similarity index 100% rename from src/python/nimbusml/internal/core/ensemble/booster/goss.py rename to src/python/nimbusml/internal/core/ensemble/booster/_goss.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/treefeaturizer.py b/src/python/nimbusml/internal/core/feature_extraction/_treefeaturizer.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/treefeaturizer.py rename to src/python/nimbusml/internal/core/feature_extraction/_treefeaturizer.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/categorical/onehothashvectorizer.py b/src/python/nimbusml/internal/core/feature_extraction/categorical/_onehothashvectorizer.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/categorical/onehothashvectorizer.py rename to src/python/nimbusml/internal/core/feature_extraction/categorical/_onehothashvectorizer.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/categorical/onehotvectorizer.py b/src/python/nimbusml/internal/core/feature_extraction/categorical/_onehotvectorizer.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/categorical/onehotvectorizer.py rename to src/python/nimbusml/internal/core/feature_extraction/categorical/_onehotvectorizer.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/image/loader.py b/src/python/nimbusml/internal/core/feature_extraction/image/_loader.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/image/loader.py rename to src/python/nimbusml/internal/core/feature_extraction/image/_loader.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/image/pixelextractor.py b/src/python/nimbusml/internal/core/feature_extraction/image/_pixelextractor.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/image/pixelextractor.py rename to src/python/nimbusml/internal/core/feature_extraction/image/_pixelextractor.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/image/resizer.py b/src/python/nimbusml/internal/core/feature_extraction/image/_resizer.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/image/resizer.py rename to src/python/nimbusml/internal/core/feature_extraction/image/_resizer.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/lightlda.py b/src/python/nimbusml/internal/core/feature_extraction/text/_lightlda.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/lightlda.py rename to src/python/nimbusml/internal/core/feature_extraction/text/_lightlda.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/ngramfeaturizer.py b/src/python/nimbusml/internal/core/feature_extraction/text/_ngramfeaturizer.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/ngramfeaturizer.py rename to src/python/nimbusml/internal/core/feature_extraction/text/_ngramfeaturizer.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/sentiment.py b/src/python/nimbusml/internal/core/feature_extraction/text/_sentiment.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/sentiment.py rename to src/python/nimbusml/internal/core/feature_extraction/text/_sentiment.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/wordembedding.py b/src/python/nimbusml/internal/core/feature_extraction/text/_wordembedding.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/wordembedding.py rename to src/python/nimbusml/internal/core/feature_extraction/text/_wordembedding.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngram.py b/src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngram.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngram.py rename to src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngram.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngramhash.py b/src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngramhash.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngramhash.py rename to src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngramhash.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/customstopwordsremover.py b/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_customstopwordsremover.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/stopwords/customstopwordsremover.py rename to src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_customstopwordsremover.py diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/predefinedstopwordsremover.py b/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_predefinedstopwordsremover.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_extraction/text/stopwords/predefinedstopwordsremover.py rename to src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_predefinedstopwordsremover.py diff --git a/src/python/nimbusml/internal/core/feature_selection/countselector.py b/src/python/nimbusml/internal/core/feature_selection/_countselector.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_selection/countselector.py rename to src/python/nimbusml/internal/core/feature_selection/_countselector.py diff --git a/src/python/nimbusml/internal/core/feature_selection/mutualinformationselector.py b/src/python/nimbusml/internal/core/feature_selection/_mutualinformationselector.py similarity index 100% rename from src/python/nimbusml/internal/core/feature_selection/mutualinformationselector.py rename to src/python/nimbusml/internal/core/feature_selection/_mutualinformationselector.py diff --git a/src/python/nimbusml/internal/core/linear_model/averagedperceptronbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_averagedperceptronbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/averagedperceptronbinaryclassifier.py rename to src/python/nimbusml/internal/core/linear_model/_averagedperceptronbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/linear_model/fastlinearbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_fastlinearbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/fastlinearbinaryclassifier.py rename to src/python/nimbusml/internal/core/linear_model/_fastlinearbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/linear_model/fastlinearclassifier.py b/src/python/nimbusml/internal/core/linear_model/_fastlinearclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/fastlinearclassifier.py rename to src/python/nimbusml/internal/core/linear_model/_fastlinearclassifier.py diff --git a/src/python/nimbusml/internal/core/linear_model/fastlinearregressor.py b/src/python/nimbusml/internal/core/linear_model/_fastlinearregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/fastlinearregressor.py rename to src/python/nimbusml/internal/core/linear_model/_fastlinearregressor.py diff --git a/src/python/nimbusml/internal/core/linear_model/logisticregressionbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_logisticregressionbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/logisticregressionbinaryclassifier.py rename to src/python/nimbusml/internal/core/linear_model/_logisticregressionbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/linear_model/logisticregressionclassifier.py b/src/python/nimbusml/internal/core/linear_model/_logisticregressionclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/logisticregressionclassifier.py rename to src/python/nimbusml/internal/core/linear_model/_logisticregressionclassifier.py diff --git a/src/python/nimbusml/internal/core/linear_model/onlinegradientdescentregressor.py b/src/python/nimbusml/internal/core/linear_model/_onlinegradientdescentregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/onlinegradientdescentregressor.py rename to src/python/nimbusml/internal/core/linear_model/_onlinegradientdescentregressor.py diff --git a/src/python/nimbusml/internal/core/linear_model/ordinaryleastsquaresregressor.py b/src/python/nimbusml/internal/core/linear_model/_ordinaryleastsquaresregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/ordinaryleastsquaresregressor.py rename to src/python/nimbusml/internal/core/linear_model/_ordinaryleastsquaresregressor.py diff --git a/src/python/nimbusml/internal/core/linear_model/poissonregressionregressor.py b/src/python/nimbusml/internal/core/linear_model/_poissonregressionregressor.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/poissonregressionregressor.py rename to src/python/nimbusml/internal/core/linear_model/_poissonregressionregressor.py diff --git a/src/python/nimbusml/internal/core/linear_model/sgdbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_sgdbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/sgdbinaryclassifier.py rename to src/python/nimbusml/internal/core/linear_model/_sgdbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/linear_model/symsgdbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_symsgdbinaryclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/linear_model/symsgdbinaryclassifier.py rename to src/python/nimbusml/internal/core/linear_model/_symsgdbinaryclassifier.py diff --git a/src/python/nimbusml/internal/core/loss/loss_factory.py b/src/python/nimbusml/internal/core/loss/loss_factory.py index ab097b3a..c34b809d 100644 --- a/src/python/nimbusml/internal/core/loss/loss_factory.py +++ b/src/python/nimbusml/internal/core/loss/loss_factory.py @@ -100,7 +100,7 @@ def create_loss(cls, component_kind, learner, api_loss): api_loss_name = getattr(api_loss, '_string_name') api_loss_params = getattr(api_loss, '_params') except BaseException: - # The given object is not a nimbusml loss object + # The given object is not a pytlc loss object raise TypeError(error_msg) if api_loss_name not in valid_str_losses: diff --git a/src/python/nimbusml/internal/core/multiclass/onevsrestclassifier.py b/src/python/nimbusml/internal/core/multiclass/_onevsrestclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/multiclass/onevsrestclassifier.py rename to src/python/nimbusml/internal/core/multiclass/_onevsrestclassifier.py diff --git a/src/python/nimbusml/internal/core/naive_bayes/naivebayesclassifier.py b/src/python/nimbusml/internal/core/naive_bayes/_naivebayesclassifier.py similarity index 100% rename from src/python/nimbusml/internal/core/naive_bayes/naivebayesclassifier.py rename to src/python/nimbusml/internal/core/naive_bayes/_naivebayesclassifier.py diff --git a/src/python/nimbusml/internal/core/preprocessing/fromkey.py b/src/python/nimbusml/internal/core/preprocessing/_fromkey.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/fromkey.py rename to src/python/nimbusml/internal/core/preprocessing/_fromkey.py diff --git a/src/python/nimbusml/internal/core/preprocessing/tensorflowscorer.py b/src/python/nimbusml/internal/core/preprocessing/_tensorflowscorer.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/tensorflowscorer.py rename to src/python/nimbusml/internal/core/preprocessing/_tensorflowscorer.py diff --git a/src/python/nimbusml/internal/core/preprocessing/tokey.py b/src/python/nimbusml/internal/core/preprocessing/_tokey.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/tokey.py rename to src/python/nimbusml/internal/core/preprocessing/_tokey.py diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/bootstrapsampler.py b/src/python/nimbusml/internal/core/preprocessing/filter/_bootstrapsampler.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/filter/bootstrapsampler.py rename to src/python/nimbusml/internal/core/preprocessing/filter/_bootstrapsampler.py diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/rangefilter.py b/src/python/nimbusml/internal/core/preprocessing/filter/_rangefilter.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/filter/rangefilter.py rename to src/python/nimbusml/internal/core/preprocessing/filter/_rangefilter.py diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/skipfilter.py b/src/python/nimbusml/internal/core/preprocessing/filter/_skipfilter.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/filter/skipfilter.py rename to src/python/nimbusml/internal/core/preprocessing/filter/_skipfilter.py diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/takefilter.py b/src/python/nimbusml/internal/core/preprocessing/filter/_takefilter.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/filter/takefilter.py rename to src/python/nimbusml/internal/core/preprocessing/filter/_takefilter.py diff --git a/src/python/nimbusml/internal/core/preprocessing/missing_values/filter.py b/src/python/nimbusml/internal/core/preprocessing/missing_values/_filter.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/missing_values/filter.py rename to src/python/nimbusml/internal/core/preprocessing/missing_values/_filter.py diff --git a/src/python/nimbusml/internal/core/preprocessing/missing_values/handler.py b/src/python/nimbusml/internal/core/preprocessing/missing_values/_handler.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/missing_values/handler.py rename to src/python/nimbusml/internal/core/preprocessing/missing_values/_handler.py diff --git a/src/python/nimbusml/internal/core/preprocessing/missing_values/indicator.py b/src/python/nimbusml/internal/core/preprocessing/missing_values/_indicator.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/missing_values/indicator.py rename to src/python/nimbusml/internal/core/preprocessing/missing_values/_indicator.py diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/binner.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_binner.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/normalization/binner.py rename to src/python/nimbusml/internal/core/preprocessing/normalization/_binner.py diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/globalcontrastrowscaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_globalcontrastrowscaler.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/normalization/globalcontrastrowscaler.py rename to src/python/nimbusml/internal/core/preprocessing/normalization/_globalcontrastrowscaler.py diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/logmeanvariancescaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_logmeanvariancescaler.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/normalization/logmeanvariancescaler.py rename to src/python/nimbusml/internal/core/preprocessing/normalization/_logmeanvariancescaler.py diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/meanvariancescaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_meanvariancescaler.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/normalization/meanvariancescaler.py rename to src/python/nimbusml/internal/core/preprocessing/normalization/_meanvariancescaler.py diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/minmaxscaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_minmaxscaler.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/normalization/minmaxscaler.py rename to src/python/nimbusml/internal/core/preprocessing/normalization/_minmaxscaler.py diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columnconcatenator.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columnconcatenator.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/schema/columnconcatenator.py rename to src/python/nimbusml/internal/core/preprocessing/schema/_columnconcatenator.py diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columndropper.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columndropper.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/schema/columndropper.py rename to src/python/nimbusml/internal/core/preprocessing/schema/_columndropper.py diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columnduplicator.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columnduplicator.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/schema/columnduplicator.py rename to src/python/nimbusml/internal/core/preprocessing/schema/_columnduplicator.py diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columnselector.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columnselector.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/schema/columnselector.py rename to src/python/nimbusml/internal/core/preprocessing/schema/_columnselector.py diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/typeconverter.py b/src/python/nimbusml/internal/core/preprocessing/schema/_typeconverter.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/schema/typeconverter.py rename to src/python/nimbusml/internal/core/preprocessing/schema/_typeconverter.py diff --git a/src/python/nimbusml/internal/core/preprocessing/text/chartokenizer.py b/src/python/nimbusml/internal/core/preprocessing/text/_chartokenizer.py similarity index 100% rename from src/python/nimbusml/internal/core/preprocessing/text/chartokenizer.py rename to src/python/nimbusml/internal/core/preprocessing/text/_chartokenizer.py diff --git a/src/python/nimbusml/internal/utils/data_stream.py b/src/python/nimbusml/internal/utils/data_stream.py index 8c4ef67f..9c648e63 100644 --- a/src/python/nimbusml/internal/utils/data_stream.py +++ b/src/python/nimbusml/internal/utils/data_stream.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # -------------------------------------------------------------------------------------------- """ -Owns nimbusml's containers. +Owns pytlc's containers. """ from shutil import copyfile diff --git a/src/python/nimbusml/internal/utils/dataframes.py b/src/python/nimbusml/internal/utils/dataframes.py index fe46ac20..cca54698 100644 --- a/src/python/nimbusml/internal/utils/dataframes.py +++ b/src/python/nimbusml/internal/utils/dataframes.py @@ -189,9 +189,9 @@ def get_obj(el): "of the input columns has name 'F?'.\n" + "This happens for example when X and y contain the " "same column name.\n" + - "nimbusml cannot distinguish between the label in X and " + "pytlc cannot distinguish between the label in X and " "the label in Y.\n" + - "nimbusml generates intermediate columns with this kind " + "pytlc generates intermediate columns with this kind " "of name. Issue with column '{0}' among " "columns\n{1}".format( i, diff --git a/src/python/nimbusml/linear_model/__init__.py b/src/python/nimbusml/linear_model/__init__.py index 146c79e0..21ffb89c 100644 --- a/src/python/nimbusml/linear_model/__init__.py +++ b/src/python/nimbusml/linear_model/__init__.py @@ -1,16 +1,14 @@ -from .averagedperceptronbinaryclassifier import \ - AveragedPerceptronBinaryClassifier -from .fastlinearbinaryclassifier import FastLinearBinaryClassifier -from .fastlinearclassifier import FastLinearClassifier -from .fastlinearregressor import FastLinearRegressor -from .logisticregressionbinaryclassifier import \ - LogisticRegressionBinaryClassifier -from .logisticregressionclassifier import LogisticRegressionClassifier -from .onlinegradientdescentregressor import OnlineGradientDescentRegressor -from .ordinaryleastsquaresregressor import OrdinaryLeastSquaresRegressor -from .poissonregressionregressor import PoissonRegressionRegressor -from .sgdbinaryclassifier import SgdBinaryClassifier -from .symsgdbinaryclassifier import SymSgdBinaryClassifier +from ._averagedperceptronbinaryclassifier import AveragedPerceptronBinaryClassifier +from ._fastlinearbinaryclassifier import FastLinearBinaryClassifier +from ._fastlinearclassifier import FastLinearClassifier +from ._fastlinearregressor import FastLinearRegressor +from ._logisticregressionbinaryclassifier import LogisticRegressionBinaryClassifier +from ._logisticregressionclassifier import LogisticRegressionClassifier +from ._onlinegradientdescentregressor import OnlineGradientDescentRegressor +from ._ordinaryleastsquaresregressor import OrdinaryLeastSquaresRegressor +from ._poissonregressionregressor import PoissonRegressionRegressor +from ._sgdbinaryclassifier import SgdBinaryClassifier +from ._symsgdbinaryclassifier import SymSgdBinaryClassifier __all__ = [ 'AveragedPerceptronBinaryClassifier', @@ -23,5 +21,6 @@ 'OrdinaryLeastSquaresRegressor', 'PoissonRegressionRegressor', 'SgdBinaryClassifier', - 'SymSgdBinaryClassifier' + 'SymSgdBinaryClassifier', ] + diff --git a/src/python/nimbusml/linear_model/averagedperceptronbinaryclassifier.py b/src/python/nimbusml/linear_model/_averagedperceptronbinaryclassifier.py similarity index 99% rename from src/python/nimbusml/linear_model/averagedperceptronbinaryclassifier.py rename to src/python/nimbusml/linear_model/_averagedperceptronbinaryclassifier.py index 02d48768..07e50525 100644 --- a/src/python/nimbusml/linear_model/averagedperceptronbinaryclassifier.py +++ b/src/python/nimbusml/linear_model/_averagedperceptronbinaryclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.averagedperceptronbinaryclassifier import \ +from ..internal.core.linear_model._averagedperceptronbinaryclassifier import \ AveragedPerceptronBinaryClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/fastlinearbinaryclassifier.py b/src/python/nimbusml/linear_model/_fastlinearbinaryclassifier.py similarity index 99% rename from src/python/nimbusml/linear_model/fastlinearbinaryclassifier.py rename to src/python/nimbusml/linear_model/_fastlinearbinaryclassifier.py index 9374edd6..672c1c3c 100644 --- a/src/python/nimbusml/linear_model/fastlinearbinaryclassifier.py +++ b/src/python/nimbusml/linear_model/_fastlinearbinaryclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.fastlinearbinaryclassifier import \ +from ..internal.core.linear_model._fastlinearbinaryclassifier import \ FastLinearBinaryClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/fastlinearclassifier.py b/src/python/nimbusml/linear_model/_fastlinearclassifier.py similarity index 99% rename from src/python/nimbusml/linear_model/fastlinearclassifier.py rename to src/python/nimbusml/linear_model/_fastlinearclassifier.py index c9546c25..16b2ad57 100644 --- a/src/python/nimbusml/linear_model/fastlinearclassifier.py +++ b/src/python/nimbusml/linear_model/_fastlinearclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.fastlinearclassifier import \ +from ..internal.core.linear_model._fastlinearclassifier import \ FastLinearClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/fastlinearregressor.py b/src/python/nimbusml/linear_model/_fastlinearregressor.py similarity index 99% rename from src/python/nimbusml/linear_model/fastlinearregressor.py rename to src/python/nimbusml/linear_model/_fastlinearregressor.py index 7e180d1c..bc8eab2a 100644 --- a/src/python/nimbusml/linear_model/fastlinearregressor.py +++ b/src/python/nimbusml/linear_model/_fastlinearregressor.py @@ -13,7 +13,7 @@ from sklearn.base import RegressorMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.fastlinearregressor import \ +from ..internal.core.linear_model._fastlinearregressor import \ FastLinearRegressor as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/logisticregressionbinaryclassifier.py b/src/python/nimbusml/linear_model/_logisticregressionbinaryclassifier.py similarity index 99% rename from src/python/nimbusml/linear_model/logisticregressionbinaryclassifier.py rename to src/python/nimbusml/linear_model/_logisticregressionbinaryclassifier.py index 7e434f4c..b752d999 100644 --- a/src/python/nimbusml/linear_model/logisticregressionbinaryclassifier.py +++ b/src/python/nimbusml/linear_model/_logisticregressionbinaryclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.logisticregressionbinaryclassifier import \ +from ..internal.core.linear_model._logisticregressionbinaryclassifier import \ LogisticRegressionBinaryClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/logisticregressionclassifier.py b/src/python/nimbusml/linear_model/_logisticregressionclassifier.py similarity index 99% rename from src/python/nimbusml/linear_model/logisticregressionclassifier.py rename to src/python/nimbusml/linear_model/_logisticregressionclassifier.py index 19c462e7..285ad543 100644 --- a/src/python/nimbusml/linear_model/logisticregressionclassifier.py +++ b/src/python/nimbusml/linear_model/_logisticregressionclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.logisticregressionclassifier import \ +from ..internal.core.linear_model._logisticregressionclassifier import \ LogisticRegressionClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/onlinegradientdescentregressor.py b/src/python/nimbusml/linear_model/_onlinegradientdescentregressor.py similarity index 98% rename from src/python/nimbusml/linear_model/onlinegradientdescentregressor.py rename to src/python/nimbusml/linear_model/_onlinegradientdescentregressor.py index 71796158..b5ef38de 100644 --- a/src/python/nimbusml/linear_model/onlinegradientdescentregressor.py +++ b/src/python/nimbusml/linear_model/_onlinegradientdescentregressor.py @@ -13,7 +13,7 @@ from sklearn.base import RegressorMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.onlinegradientdescentregressor import \ +from ..internal.core.linear_model._onlinegradientdescentregressor import \ OnlineGradientDescentRegressor as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/ordinaryleastsquaresregressor.py b/src/python/nimbusml/linear_model/_ordinaryleastsquaresregressor.py similarity index 98% rename from src/python/nimbusml/linear_model/ordinaryleastsquaresregressor.py rename to src/python/nimbusml/linear_model/_ordinaryleastsquaresregressor.py index 08d07ac6..d22352a0 100644 --- a/src/python/nimbusml/linear_model/ordinaryleastsquaresregressor.py +++ b/src/python/nimbusml/linear_model/_ordinaryleastsquaresregressor.py @@ -13,7 +13,7 @@ from sklearn.base import RegressorMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.ordinaryleastsquaresregressor import \ +from ..internal.core.linear_model._ordinaryleastsquaresregressor import \ OrdinaryLeastSquaresRegressor as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/poissonregressionregressor.py b/src/python/nimbusml/linear_model/_poissonregressionregressor.py similarity index 99% rename from src/python/nimbusml/linear_model/poissonregressionregressor.py rename to src/python/nimbusml/linear_model/_poissonregressionregressor.py index b260217d..faebd417 100644 --- a/src/python/nimbusml/linear_model/poissonregressionregressor.py +++ b/src/python/nimbusml/linear_model/_poissonregressionregressor.py @@ -13,7 +13,7 @@ from sklearn.base import RegressorMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.poissonregressionregressor import \ +from ..internal.core.linear_model._poissonregressionregressor import \ PoissonRegressionRegressor as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/sgdbinaryclassifier.py b/src/python/nimbusml/linear_model/_sgdbinaryclassifier.py similarity index 99% rename from src/python/nimbusml/linear_model/sgdbinaryclassifier.py rename to src/python/nimbusml/linear_model/_sgdbinaryclassifier.py index 21a5d471..3a5b928f 100644 --- a/src/python/nimbusml/linear_model/sgdbinaryclassifier.py +++ b/src/python/nimbusml/linear_model/_sgdbinaryclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.sgdbinaryclassifier import \ +from ..internal.core.linear_model._sgdbinaryclassifier import \ SgdBinaryClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/linear_model/symsgdbinaryclassifier.py b/src/python/nimbusml/linear_model/_symsgdbinaryclassifier.py similarity index 98% rename from src/python/nimbusml/linear_model/symsgdbinaryclassifier.py rename to src/python/nimbusml/linear_model/_symsgdbinaryclassifier.py index 5f5d1e87..4af5db42 100644 --- a/src/python/nimbusml/linear_model/symsgdbinaryclassifier.py +++ b/src/python/nimbusml/linear_model/_symsgdbinaryclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.linear_model.symsgdbinaryclassifier import \ +from ..internal.core.linear_model._symsgdbinaryclassifier import \ SymSgdBinaryClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/model_selection/__init__.py b/src/python/nimbusml/model_selection/__init__.py index 08f12c6b..3cf19ad4 100644 --- a/src/python/nimbusml/model_selection/__init__.py +++ b/src/python/nimbusml/model_selection/__init__.py @@ -1,4 +1,4 @@ -from .cv import CV +from ._cv import CV __all__ = [ 'CV' diff --git a/src/python/nimbusml/model_selection/cv.py b/src/python/nimbusml/model_selection/_cv.py similarity index 100% rename from src/python/nimbusml/model_selection/cv.py rename to src/python/nimbusml/model_selection/_cv.py diff --git a/src/python/nimbusml/multiclass/__init__.py b/src/python/nimbusml/multiclass/__init__.py index f5520192..71bad0cb 100644 --- a/src/python/nimbusml/multiclass/__init__.py +++ b/src/python/nimbusml/multiclass/__init__.py @@ -1,5 +1,6 @@ -from .onevsrestclassifier import OneVsRestClassifier +from ._onevsrestclassifier import OneVsRestClassifier __all__ = [ 'OneVsRestClassifier' ] + diff --git a/src/python/nimbusml/multiclass/onevsrestclassifier.py b/src/python/nimbusml/multiclass/_onevsrestclassifier.py similarity index 99% rename from src/python/nimbusml/multiclass/onevsrestclassifier.py rename to src/python/nimbusml/multiclass/_onevsrestclassifier.py index fc9a9abe..e7d388a2 100644 --- a/src/python/nimbusml/multiclass/onevsrestclassifier.py +++ b/src/python/nimbusml/multiclass/_onevsrestclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.multiclass.onevsrestclassifier import \ +from ..internal.core.multiclass._onevsrestclassifier import \ OneVsRestClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/naive_bayes/__init__.py b/src/python/nimbusml/naive_bayes/__init__.py index 22d10f3c..7852d66f 100644 --- a/src/python/nimbusml/naive_bayes/__init__.py +++ b/src/python/nimbusml/naive_bayes/__init__.py @@ -1,5 +1,7 @@ -from .naivebayesclassifier import NaiveBayesClassifier +from ._naivebayesclassifier import NaiveBayesClassifier __all__ = [ 'NaiveBayesClassifier' ] + + diff --git a/src/python/nimbusml/naive_bayes/naivebayesclassifier.py b/src/python/nimbusml/naive_bayes/_naivebayesclassifier.py similarity index 98% rename from src/python/nimbusml/naive_bayes/naivebayesclassifier.py rename to src/python/nimbusml/naive_bayes/_naivebayesclassifier.py index 5c971595..c28185e4 100644 --- a/src/python/nimbusml/naive_bayes/naivebayesclassifier.py +++ b/src/python/nimbusml/naive_bayes/_naivebayesclassifier.py @@ -13,7 +13,7 @@ from sklearn.base import ClassifierMixin from ..base_predictor import BasePredictor -from ..internal.core.naive_bayes.naivebayesclassifier import \ +from ..internal.core.naive_bayes._naivebayesclassifier import \ NaiveBayesClassifier as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/__init__.py b/src/python/nimbusml/preprocessing/__init__.py index e3d98fca..2af0b4b3 100644 --- a/src/python/nimbusml/preprocessing/__init__.py +++ b/src/python/nimbusml/preprocessing/__init__.py @@ -1,9 +1,10 @@ -from .fromkey import FromKey -from .tokey import ToKey -from .tensorflowscorer import TensorFlowScorer +from ._fromkey import FromKey +from ._tokey import ToKey +from ._tensorflowscorer import TensorFlowScorer __all__ = [ 'FromKey', 'ToKey', 'TensorFlowScorer' ] + diff --git a/src/python/nimbusml/preprocessing/fromkey.py b/src/python/nimbusml/preprocessing/_fromkey.py similarity index 96% rename from src/python/nimbusml/preprocessing/fromkey.py rename to src/python/nimbusml/preprocessing/_fromkey.py index f83d90a7..29319966 100644 --- a/src/python/nimbusml/preprocessing/fromkey.py +++ b/src/python/nimbusml/preprocessing/_fromkey.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.preprocessing.fromkey import FromKey as core +from ..internal.core.preprocessing._fromkey import FromKey as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/tensorflowscorer.py b/src/python/nimbusml/preprocessing/_tensorflowscorer.py similarity index 98% rename from src/python/nimbusml/preprocessing/tensorflowscorer.py rename to src/python/nimbusml/preprocessing/_tensorflowscorer.py index d0d256bc..9327ddc9 100644 --- a/src/python/nimbusml/preprocessing/tensorflowscorer.py +++ b/src/python/nimbusml/preprocessing/_tensorflowscorer.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.preprocessing.tensorflowscorer import \ +from ..internal.core.preprocessing._tensorflowscorer import \ TensorFlowScorer as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/tokey.py b/src/python/nimbusml/preprocessing/_tokey.py similarity index 98% rename from src/python/nimbusml/preprocessing/tokey.py rename to src/python/nimbusml/preprocessing/_tokey.py index 4f925784..b2b7a8a1 100644 --- a/src/python/nimbusml/preprocessing/tokey.py +++ b/src/python/nimbusml/preprocessing/_tokey.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.preprocessing.tokey import ToKey as core +from ..internal.core.preprocessing._tokey import ToKey as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/filter/__init__.py b/src/python/nimbusml/preprocessing/filter/__init__.py index 67b52df7..c089bf59 100644 --- a/src/python/nimbusml/preprocessing/filter/__init__.py +++ b/src/python/nimbusml/preprocessing/filter/__init__.py @@ -1,7 +1,7 @@ -from .bootstrapsampler import BootstrapSampler -from .rangefilter import RangeFilter -from .skipfilter import SkipFilter -from .takefilter import TakeFilter +from ._bootstrapsampler import BootstrapSampler +from ._rangefilter import RangeFilter +from ._skipfilter import SkipFilter +from ._takefilter import TakeFilter __all__ = [ 'BootstrapSampler', diff --git a/src/python/nimbusml/preprocessing/filter/bootstrapsampler.py b/src/python/nimbusml/preprocessing/filter/_bootstrapsampler.py similarity index 97% rename from src/python/nimbusml/preprocessing/filter/bootstrapsampler.py rename to src/python/nimbusml/preprocessing/filter/_bootstrapsampler.py index db57ebcd..a0b8fe9e 100644 --- a/src/python/nimbusml/preprocessing/filter/bootstrapsampler.py +++ b/src/python/nimbusml/preprocessing/filter/_bootstrapsampler.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.filter.bootstrapsampler import \ +from ...internal.core.preprocessing.filter._bootstrapsampler import \ BootstrapSampler as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/filter/rangefilter.py b/src/python/nimbusml/preprocessing/filter/_rangefilter.py similarity index 97% rename from src/python/nimbusml/preprocessing/filter/rangefilter.py rename to src/python/nimbusml/preprocessing/filter/_rangefilter.py index 89aa779d..d4ade4f2 100644 --- a/src/python/nimbusml/preprocessing/filter/rangefilter.py +++ b/src/python/nimbusml/preprocessing/filter/_rangefilter.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.filter.rangefilter import \ +from ...internal.core.preprocessing.filter._rangefilter import \ RangeFilter as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/filter/skipfilter.py b/src/python/nimbusml/preprocessing/filter/_skipfilter.py similarity index 95% rename from src/python/nimbusml/preprocessing/filter/skipfilter.py rename to src/python/nimbusml/preprocessing/filter/_skipfilter.py index 73b9c332..13040f05 100644 --- a/src/python/nimbusml/preprocessing/filter/skipfilter.py +++ b/src/python/nimbusml/preprocessing/filter/_skipfilter.py @@ -13,7 +13,8 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.filter.skipfilter import SkipFilter as core +from ...internal.core.preprocessing.filter._skipfilter import \ + SkipFilter as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/filter/takefilter.py b/src/python/nimbusml/preprocessing/filter/_takefilter.py similarity index 95% rename from src/python/nimbusml/preprocessing/filter/takefilter.py rename to src/python/nimbusml/preprocessing/filter/_takefilter.py index 6fe9722d..a4eee5fe 100644 --- a/src/python/nimbusml/preprocessing/filter/takefilter.py +++ b/src/python/nimbusml/preprocessing/filter/_takefilter.py @@ -13,7 +13,8 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.filter.takefilter import TakeFilter as core +from ...internal.core.preprocessing.filter._takefilter import \ + TakeFilter as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/missing_values/__init__.py b/src/python/nimbusml/preprocessing/missing_values/__init__.py index 9818e4d7..7eee5984 100644 --- a/src/python/nimbusml/preprocessing/missing_values/__init__.py +++ b/src/python/nimbusml/preprocessing/missing_values/__init__.py @@ -1,6 +1,6 @@ -from .filter import Filter -from .handler import Handler -from .indicator import Indicator +from ._filter import Filter +from ._handler import Handler +from ._indicator import Indicator __all__ = [ 'Filter', diff --git a/src/python/nimbusml/preprocessing/missing_values/filter.py b/src/python/nimbusml/preprocessing/missing_values/_filter.py similarity index 96% rename from src/python/nimbusml/preprocessing/missing_values/filter.py rename to src/python/nimbusml/preprocessing/missing_values/_filter.py index 18435c13..4b8e294d 100644 --- a/src/python/nimbusml/preprocessing/missing_values/filter.py +++ b/src/python/nimbusml/preprocessing/missing_values/_filter.py @@ -13,7 +13,8 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.missing_values.filter import Filter as core +from ...internal.core.preprocessing.missing_values._filter import \ + Filter as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/missing_values/handler.py b/src/python/nimbusml/preprocessing/missing_values/_handler.py similarity index 98% rename from src/python/nimbusml/preprocessing/missing_values/handler.py rename to src/python/nimbusml/preprocessing/missing_values/_handler.py index d390eb4a..de776ca7 100644 --- a/src/python/nimbusml/preprocessing/missing_values/handler.py +++ b/src/python/nimbusml/preprocessing/missing_values/_handler.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.missing_values.handler import \ +from ...internal.core.preprocessing.missing_values._handler import \ Handler as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/missing_values/indicator.py b/src/python/nimbusml/preprocessing/missing_values/_indicator.py similarity index 97% rename from src/python/nimbusml/preprocessing/missing_values/indicator.py rename to src/python/nimbusml/preprocessing/missing_values/_indicator.py index fdcfecc9..5299523c 100644 --- a/src/python/nimbusml/preprocessing/missing_values/indicator.py +++ b/src/python/nimbusml/preprocessing/missing_values/_indicator.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.missing_values.indicator import \ +from ...internal.core.preprocessing.missing_values._indicator import \ Indicator as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/normalization/__init__.py b/src/python/nimbusml/preprocessing/normalization/__init__.py index 5036a49a..2c05bf41 100644 --- a/src/python/nimbusml/preprocessing/normalization/__init__.py +++ b/src/python/nimbusml/preprocessing/normalization/__init__.py @@ -1,8 +1,8 @@ -from .binner import Binner -from .globalcontrastrowscaler import GlobalContrastRowScaler -from .logmeanvariancescaler import LogMeanVarianceScaler -from .meanvariancescaler import MeanVarianceScaler -from .minmaxscaler import MinMaxScaler +from ._binner import Binner +from ._globalcontrastrowscaler import GlobalContrastRowScaler +from ._logmeanvariancescaler import LogMeanVarianceScaler +from ._meanvariancescaler import MeanVarianceScaler +from ._minmaxscaler import MinMaxScaler __all__ = [ 'Binner', diff --git a/src/python/nimbusml/preprocessing/normalization/binner.py b/src/python/nimbusml/preprocessing/normalization/_binner.py similarity index 98% rename from src/python/nimbusml/preprocessing/normalization/binner.py rename to src/python/nimbusml/preprocessing/normalization/_binner.py index 9bf0c6de..d0e78b4a 100644 --- a/src/python/nimbusml/preprocessing/normalization/binner.py +++ b/src/python/nimbusml/preprocessing/normalization/_binner.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.normalization.binner import Binner as core +from ...internal.core.preprocessing.normalization._binner import Binner as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/normalization/globalcontrastrowscaler.py b/src/python/nimbusml/preprocessing/normalization/_globalcontrastrowscaler.py similarity index 98% rename from src/python/nimbusml/preprocessing/normalization/globalcontrastrowscaler.py rename to src/python/nimbusml/preprocessing/normalization/_globalcontrastrowscaler.py index 28ad5a52..f124a00b 100644 --- a/src/python/nimbusml/preprocessing/normalization/globalcontrastrowscaler.py +++ b/src/python/nimbusml/preprocessing/normalization/_globalcontrastrowscaler.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.normalization.globalcontrastrowscaler import \ +from ...internal.core.preprocessing.normalization._globalcontrastrowscaler import \ GlobalContrastRowScaler as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/normalization/logmeanvariancescaler.py b/src/python/nimbusml/preprocessing/normalization/_logmeanvariancescaler.py similarity index 98% rename from src/python/nimbusml/preprocessing/normalization/logmeanvariancescaler.py rename to src/python/nimbusml/preprocessing/normalization/_logmeanvariancescaler.py index 243cec08..6f8a8669 100644 --- a/src/python/nimbusml/preprocessing/normalization/logmeanvariancescaler.py +++ b/src/python/nimbusml/preprocessing/normalization/_logmeanvariancescaler.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.normalization.logmeanvariancescaler import \ +from ...internal.core.preprocessing.normalization._logmeanvariancescaler import \ LogMeanVarianceScaler as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/normalization/meanvariancescaler.py b/src/python/nimbusml/preprocessing/normalization/_meanvariancescaler.py similarity index 98% rename from src/python/nimbusml/preprocessing/normalization/meanvariancescaler.py rename to src/python/nimbusml/preprocessing/normalization/_meanvariancescaler.py index de4f4211..b0376382 100644 --- a/src/python/nimbusml/preprocessing/normalization/meanvariancescaler.py +++ b/src/python/nimbusml/preprocessing/normalization/_meanvariancescaler.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.normalization.meanvariancescaler import \ +from ...internal.core.preprocessing.normalization._meanvariancescaler import \ MeanVarianceScaler as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/normalization/minmaxscaler.py b/src/python/nimbusml/preprocessing/normalization/_minmaxscaler.py similarity index 98% rename from src/python/nimbusml/preprocessing/normalization/minmaxscaler.py rename to src/python/nimbusml/preprocessing/normalization/_minmaxscaler.py index b3bb3c3d..0398fda8 100644 --- a/src/python/nimbusml/preprocessing/normalization/minmaxscaler.py +++ b/src/python/nimbusml/preprocessing/normalization/_minmaxscaler.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.normalization.minmaxscaler import \ +from ...internal.core.preprocessing.normalization._minmaxscaler import \ MinMaxScaler as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/schema/__init__.py b/src/python/nimbusml/preprocessing/schema/__init__.py index 9f8ecfe4..a8dae9f8 100644 --- a/src/python/nimbusml/preprocessing/schema/__init__.py +++ b/src/python/nimbusml/preprocessing/schema/__init__.py @@ -1,8 +1,8 @@ -from .columnconcatenator import ColumnConcatenator -from .columndropper import ColumnDropper -from .columnduplicator import ColumnDuplicator -from .columnselector import ColumnSelector -from .typeconverter import TypeConverter +from ._columnconcatenator import ColumnConcatenator +from ._columndropper import ColumnDropper +from ._columnduplicator import ColumnDuplicator +from ._columnselector import ColumnSelector +from ._typeconverter import TypeConverter __all__ = [ 'ColumnConcatenator', @@ -11,3 +11,4 @@ 'ColumnSelector', 'TypeConverter' ] + diff --git a/src/python/nimbusml/preprocessing/schema/columnconcatenator.py b/src/python/nimbusml/preprocessing/schema/_columnconcatenator.py similarity index 97% rename from src/python/nimbusml/preprocessing/schema/columnconcatenator.py rename to src/python/nimbusml/preprocessing/schema/_columnconcatenator.py index f29c6b8f..c069b984 100644 --- a/src/python/nimbusml/preprocessing/schema/columnconcatenator.py +++ b/src/python/nimbusml/preprocessing/schema/_columnconcatenator.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.schema.columnconcatenator import \ +from ...internal.core.preprocessing.schema._columnconcatenator import \ ColumnConcatenator as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/schema/columndropper.py b/src/python/nimbusml/preprocessing/schema/_columndropper.py similarity index 96% rename from src/python/nimbusml/preprocessing/schema/columndropper.py rename to src/python/nimbusml/preprocessing/schema/_columndropper.py index 34f41ea9..6ea28366 100644 --- a/src/python/nimbusml/preprocessing/schema/columndropper.py +++ b/src/python/nimbusml/preprocessing/schema/_columndropper.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.schema.columndropper import \ +from ...internal.core.preprocessing.schema._columndropper import \ ColumnDropper as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/schema/columnduplicator.py b/src/python/nimbusml/preprocessing/schema/_columnduplicator.py similarity index 97% rename from src/python/nimbusml/preprocessing/schema/columnduplicator.py rename to src/python/nimbusml/preprocessing/schema/_columnduplicator.py index 11027e80..e0a5b511 100644 --- a/src/python/nimbusml/preprocessing/schema/columnduplicator.py +++ b/src/python/nimbusml/preprocessing/schema/_columnduplicator.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.schema.columnduplicator import \ +from ...internal.core.preprocessing.schema._columnduplicator import \ ColumnDuplicator as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/schema/columnselector.py b/src/python/nimbusml/preprocessing/schema/_columnselector.py similarity index 96% rename from src/python/nimbusml/preprocessing/schema/columnselector.py rename to src/python/nimbusml/preprocessing/schema/_columnselector.py index d01e8435..984a79cd 100644 --- a/src/python/nimbusml/preprocessing/schema/columnselector.py +++ b/src/python/nimbusml/preprocessing/schema/_columnselector.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.schema.columnselector import \ +from ...internal.core.preprocessing.schema._columnselector import \ ColumnSelector as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/schema/typeconverter.py b/src/python/nimbusml/preprocessing/schema/_typeconverter.py similarity index 96% rename from src/python/nimbusml/preprocessing/schema/typeconverter.py rename to src/python/nimbusml/preprocessing/schema/_typeconverter.py index 32cea7a1..b8224e18 100644 --- a/src/python/nimbusml/preprocessing/schema/typeconverter.py +++ b/src/python/nimbusml/preprocessing/schema/_typeconverter.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.schema.typeconverter import \ +from ...internal.core.preprocessing.schema._typeconverter import \ TypeConverter as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/preprocessing/text/__init__.py b/src/python/nimbusml/preprocessing/text/__init__.py index b255f350..c312a30e 100644 --- a/src/python/nimbusml/preprocessing/text/__init__.py +++ b/src/python/nimbusml/preprocessing/text/__init__.py @@ -1,5 +1,5 @@ -from .chartokenizer import CharTokenizer +from ._chartokenizer import CharTokenizer __all__ = [ 'CharTokenizer' -] +] \ No newline at end of file diff --git a/src/python/nimbusml/preprocessing/text/chartokenizer.py b/src/python/nimbusml/preprocessing/text/_chartokenizer.py similarity index 97% rename from src/python/nimbusml/preprocessing/text/chartokenizer.py rename to src/python/nimbusml/preprocessing/text/_chartokenizer.py index 76215fa8..78c61555 100644 --- a/src/python/nimbusml/preprocessing/text/chartokenizer.py +++ b/src/python/nimbusml/preprocessing/text/_chartokenizer.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ...base_transform import BaseTransform -from ...internal.core.preprocessing.text.chartokenizer import \ +from ...internal.core.preprocessing.text._chartokenizer import \ CharTokenizer as core from ...internal.utils.utils import trace diff --git a/src/python/nimbusml/tests/test_syntax_expected_failures.py b/src/python/nimbusml/tests/test_syntax_expected_failures.py index 916cf8be..e4e84158 100644 --- a/src/python/nimbusml/tests/test_syntax_expected_failures.py +++ b/src/python/nimbusml/tests/test_syntax_expected_failures.py @@ -11,7 +11,7 @@ from nimbusml.feature_extraction.categorical import OneHotVectorizer from nimbusml.internal.utils.data_roles import Role from nimbusml.linear_model import FastLinearRegressor -from nimbusml.pipeline import TrainedWarning +from nimbusml._pipeline import TrainedWarning if six.PY2: pass diff --git a/src/python/tools/entrypoint_compiler.py b/src/python/tools/entrypoint_compiler.py index d437f5ae..0bd8cbb8 100644 --- a/src/python/tools/entrypoint_compiler.py +++ b/src/python/tools/entrypoint_compiler.py @@ -185,7 +185,7 @@ def write_api(entrypoint, kind="node", pkg_path=None, overwrite=False): class_name = entrypoint['NewName'] class_dir = entrypoint['Module'] class_type = entrypoint['Type'] - class_file = class_name.lower() + class_file = '_' + class_name.lower() doc_builder = DocBuilder() doc_builder.class_name = class_name