Setup entry_points to work with MLBlocks>=0.3.0

MLBazaar · Jan 10, 2019 · bf7a4f5 · bf7a4f5
1 parent 97343c2
commit bf7a4f5
Show file tree

Hide file tree

Showing 101 changed files with 5 additions and 10 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,6 +3,7 @@ include CONTRIBUTING.rst
 include HISTORY.md
 include LICENSE
 include README.md
+include mlprimitives/jsons/*.json
 
 recursive-include tests *
 recursive-exclude * __pycache__

diff --git a/mlprimitives/__init__.py b/mlprimitives/__init__.py
@@ -15,6 +15,7 @@
 
 from mlprimitives.evaluation import score_pipeline
 
+MLPRIMITIVES_JSONS_PATH = os.path.join(os.path.dirname(__file__), 'jsons')
 LOGGER = logging.getLogger(__name__)
 
 

diff --git a/...ves/community.CommunityBestPartition.json → ...ons/community.CommunityBestPartition.json b/...ves/community.CommunityBestPartition.json → ...ons/community.CommunityBestPartition.json
diff --git a/mlblocks_primitives/cv2.GaussianBlur.json → mlprimitives/jsons/cv2.GaussianBlur.json b/mlblocks_primitives/cv2.GaussianBlur.json → mlprimitives/jsons/cv2.GaussianBlur.json
diff --git a/mlblocks_primitives/featuretools.dfs.json → mlprimitives/jsons/featuretools.dfs.json b/mlblocks_primitives/featuretools.dfs.json → mlprimitives/jsons/featuretools.dfs.json
diff --git a/.../keras.Sequential.LSTMTextClassifier.json → .../keras.Sequential.LSTMTextClassifier.json b/.../keras.Sequential.LSTMTextClassifier.json → .../keras.Sequential.LSTMTextClassifier.json
diff --git a/...s/keras.Sequential.LSTMTextRegressor.json → ...s/keras.Sequential.LSTMTextRegressor.json b/...s/keras.Sequential.LSTMTextRegressor.json → ...s/keras.Sequential.LSTMTextRegressor.json
diff --git a/...s.Sequential.LSTMTimeSeriesRegressor.json → ...s.Sequential.LSTMTimeSeriesRegressor.json b/...s.Sequential.LSTMTimeSeriesRegressor.json → ...s.Sequential.LSTMTimeSeriesRegressor.json
diff --git a/...ential.SingleLayerCNNImageClassifier.json → ...ential.SingleLayerCNNImageClassifier.json b/...ential.SingleLayerCNNImageClassifier.json → ...ential.SingleLayerCNNImageClassifier.json
diff --git a/...uential.SingleLayerCNNImageRegressor.json → ...uential.SingleLayerCNNImageRegressor.json b/...uential.SingleLayerCNNImageRegressor.json → ...uential.SingleLayerCNNImageRegressor.json
diff --git a/...as.applications.densenet.DenseNet121.json → ...as.applications.densenet.DenseNet121.json b/...as.applications.densenet.DenseNet121.json → ...as.applications.densenet.DenseNet121.json
diff --git a/...as.applications.densenet.DenseNet169.json → ...as.applications.densenet.DenseNet169.json b/...as.applications.densenet.DenseNet169.json → ...as.applications.densenet.DenseNet169.json
diff --git a/...as.applications.densenet.DenseNet201.json → ...as.applications.densenet.DenseNet201.json b/...as.applications.densenet.DenseNet201.json → ...as.applications.densenet.DenseNet201.json
diff --git a/...plications.densenet.preprocess_input.json → ...plications.densenet.preprocess_input.json b/...plications.densenet.preprocess_input.json → ...plications.densenet.preprocess_input.json
diff --git a/...pplications.inception_v3.InceptionV3.json → ...pplications.inception_v3.InceptionV3.json b/...pplications.inception_v3.InceptionV3.json → ...pplications.inception_v3.InceptionV3.json
diff --git a/...ations.inception_v3.preprocess_input.json → ...ations.inception_v3.preprocess_input.json b/...ations.inception_v3.preprocess_input.json → ...ations.inception_v3.preprocess_input.json
diff --git a/...ras.applications.mobilenet.MobileNet.json → ...ras.applications.mobilenet.MobileNet.json b/...ras.applications.mobilenet.MobileNet.json → ...ras.applications.mobilenet.MobileNet.json
diff --git a/...lications.mobilenet.preprocess_input.json → ...lications.mobilenet.preprocess_input.json b/...lications.mobilenet.preprocess_input.json → ...lications.mobilenet.preprocess_input.json
diff --git a/...keras.applications.resnet50.ResNet50.json → ...keras.applications.resnet50.ResNet50.json b/...keras.applications.resnet50.ResNet50.json → ...keras.applications.resnet50.ResNet50.json
diff --git a/...plications.resnet50.preprocess_input.json → ...plications.resnet50.preprocess_input.json b/...plications.resnet50.preprocess_input.json → ...plications.resnet50.preprocess_input.json
diff --git a/...keras.applications.xception.Xception.json → ...keras.applications.xception.Xception.json b/...keras.applications.xception.Xception.json → ...keras.applications.xception.Xception.json
diff --git a/...plications.xception.preprocess_input.json → ...plications.xception.preprocess_input.json b/...plications.xception.preprocess_input.json → ...plications.xception.preprocess_input.json
diff --git a/...preprocessing.sequence.pad_sequences.json → ...preprocessing.sequence.pad_sequences.json b/...preprocessing.sequence.pad_sequences.json → ...preprocessing.sequence.pad_sequences.json
diff --git a/...s/keras.preprocessing.text.Tokenizer.json → ...s/keras.preprocessing.text.Tokenizer.json b/...s/keras.preprocessing.text.Tokenizer.json → ...s/keras.preprocessing.text.Tokenizer.json
diff --git a/mlblocks_primitives/lightfm.LightFM.json → mlprimitives/jsons/lightfm.LightFM.json b/mlblocks_primitives/lightfm.LightFM.json → mlprimitives/jsons/lightfm.LightFM.json
diff --git a/....audio_featurization.featurize_audio.json → ....audio_featurization.featurize_audio.json b/....audio_featurization.featurize_audio.json → ....audio_featurization.featurize_audio.json
diff --git a/...primitives.audio_padding.AudioPadder.json → ...primitives.audio_padding.AudioPadder.json b/...primitives.audio_padding.AudioPadder.json → ...primitives.audio_padding.AudioPadder.json
diff --git a/.../mlprimitives.counters.UniqueCounter.json → .../mlprimitives.counters.UniqueCounter.json b/.../mlprimitives.counters.UniqueCounter.json → .../mlprimitives.counters.UniqueCounter.json
diff --git a/...rimitives.counters.VocabularyCounter.json → ...rimitives.counters.VocabularyCounter.json b/...rimitives.counters.VocabularyCounter.json → ...rimitives.counters.VocabularyCounter.json
diff --git a/...eature_extraction.CategoricalEncoder.json → ...eature_extraction.CategoricalEncoder.json b/...eature_extraction.CategoricalEncoder.json → ...eature_extraction.CategoricalEncoder.json
diff --git a/...eature_extraction.DatetimeFeaturizer.json → ...eature_extraction.DatetimeFeaturizer.json b/...eature_extraction.DatetimeFeaturizer.json → ...eature_extraction.DatetimeFeaturizer.json
diff --git a/....feature_extraction.StringVectorizer.json → ....feature_extraction.StringVectorizer.json b/....feature_extraction.StringVectorizer.json → ....feature_extraction.StringVectorizer.json
diff --git a/....ExtraTreesClassifierFeatureSelector.json → ....ExtraTreesClassifierFeatureSelector.json b/....ExtraTreesClassifierFeatureSelector.json → ....ExtraTreesClassifierFeatureSelector.json
diff --git a/...n.ExtraTreesRegressorFeatureSelector.json → ...n.ExtraTreesRegressorFeatureSelector.json b/...n.ExtraTreesRegressorFeatureSelector.json → ...n.ExtraTreesRegressorFeatureSelector.json
diff --git a/...rimitives.preprocessing.ClassDecoder.json → ...rimitives.preprocessing.ClassDecoder.json b/...rimitives.preprocessing.ClassDecoder.json → ...rimitives.preprocessing.ClassDecoder.json
diff --git a/...rimitives.preprocessing.ClassEncoder.json → ...rimitives.preprocessing.ClassEncoder.json b/...rimitives.preprocessing.ClassEncoder.json → ...rimitives.preprocessing.ClassEncoder.json
diff --git a/...itives/mlprimitives.text.TextCleaner.json → .../jsons/mlprimitives.text.TextCleaner.json b/...itives/mlprimitives.text.TextCleaner.json → .../jsons/mlprimitives.text.TextCleaner.json
diff --git a/....timeseries.rolling_window_sequences.json → ....timeseries.rolling_window_sequences.json b/....timeseries.rolling_window_sequences.json → ....timeseries.rolling_window_sequences.json
diff --git a/...ves.timeseries.time_segments_average.json → ...ves.timeseries.time_segments_average.json b/...ves.timeseries.time_segments_average.json → ...ves.timeseries.time_segments_average.json
diff --git a/....timeseries_errors.extract_anomalies.json → ....timeseries_errors.extract_anomalies.json b/....timeseries_errors.extract_anomalies.json → ....timeseries_errors.extract_anomalies.json
diff --git a/...imeseries_errors.get_forecast_errors.json → ...imeseries_errors.get_forecast_errors.json b/...imeseries_errors.get_forecast_errors.json → ...imeseries_errors.get_forecast_errors.json
diff --git a/...lprimitives.trivial.TrivialPredictor.json → ...lprimitives.trivial.TrivialPredictor.json b/...lprimitives.trivial.TrivialPredictor.json → ...lprimitives.trivial.TrivialPredictor.json
diff --git a/...es/networkx.graph_feature_extraction.json → ...ns/networkx.graph_feature_extraction.json b/...es/networkx.graph_feature_extraction.json → ...ns/networkx.graph_feature_extraction.json
diff --git a/...x.link_prediction_feature_extraction.json → ...x.link_prediction_feature_extraction.json b/...x.link_prediction_feature_extraction.json → ...x.link_prediction_feature_extraction.json
diff --git a/mlblocks_primitives/numpy.argmax.json → mlprimitives/jsons/numpy.argmax.json b/mlblocks_primitives/numpy.argmax.json → mlprimitives/jsons/numpy.argmax.json
diff --git a/mlblocks_primitives/skimage.feature.hog.json → mlprimitives/jsons/skimage.feature.hog.json b/mlblocks_primitives/skimage.feature.hog.json → mlprimitives/jsons/skimage.feature.hog.json
diff --git a/...arn.decomposition.DictionaryLearning.json → ...arn.decomposition.DictionaryLearning.json b/...arn.decomposition.DictionaryLearning.json → ...arn.decomposition.DictionaryLearning.json
diff --git a/...sklearn.decomposition.FactorAnalysis.json → ...sklearn.decomposition.FactorAnalysis.json b/...sklearn.decomposition.FactorAnalysis.json → ...sklearn.decomposition.FactorAnalysis.json
diff --git a/...itives/sklearn.decomposition.FastICA.json → .../jsons/sklearn.decomposition.FastICA.json b/...itives/sklearn.decomposition.FastICA.json → .../jsons/sklearn.decomposition.FastICA.json
diff --git a/...ives/sklearn.decomposition.KernelPCA.json → ...sons/sklearn.decomposition.KernelPCA.json b/...ives/sklearn.decomposition.KernelPCA.json → ...sons/sklearn.decomposition.KernelPCA.json
diff --git a/...primitives/sklearn.decomposition.PCA.json → ...ives/jsons/sklearn.decomposition.PCA.json b/...primitives/sklearn.decomposition.PCA.json → ...ives/jsons/sklearn.decomposition.PCA.json
diff --git a/...s/sklearn.decomposition.TruncatedSVD.json → ...s/sklearn.decomposition.TruncatedSVD.json b/...s/sklearn.decomposition.TruncatedSVD.json → ...s/sklearn.decomposition.TruncatedSVD.json
diff --git a/.../sklearn.ensemble.AdaBoostClassifier.json → .../sklearn.ensemble.AdaBoostClassifier.json b/.../sklearn.ensemble.AdaBoostClassifier.json → .../sklearn.ensemble.AdaBoostClassifier.json
diff --git a/...s/sklearn.ensemble.AdaBoostRegressor.json → ...s/sklearn.ensemble.AdaBoostRegressor.json b/...s/sklearn.ensemble.AdaBoostRegressor.json → ...s/sklearn.ensemble.AdaBoostRegressor.json
diff --git a/...s/sklearn.ensemble.BaggingClassifier.json → ...s/sklearn.ensemble.BaggingClassifier.json b/...s/sklearn.ensemble.BaggingClassifier.json → ...s/sklearn.ensemble.BaggingClassifier.json
diff --git a/...es/sklearn.ensemble.BaggingRegressor.json → ...ns/sklearn.ensemble.BaggingRegressor.json b/...es/sklearn.ensemble.BaggingRegressor.json → ...ns/sklearn.ensemble.BaggingRegressor.json
diff --git a/...klearn.ensemble.ExtraTreesClassifier.json → ...klearn.ensemble.ExtraTreesClassifier.json b/...klearn.ensemble.ExtraTreesClassifier.json → ...klearn.ensemble.ExtraTreesClassifier.json
diff --git a/...sklearn.ensemble.ExtraTreesRegressor.json → ...sklearn.ensemble.ExtraTreesRegressor.json b/...sklearn.ensemble.ExtraTreesRegressor.json → ...sklearn.ensemble.ExtraTreesRegressor.json
diff --git a/....ensemble.GradientBoostingClassifier.json → ....ensemble.GradientBoostingClassifier.json b/....ensemble.GradientBoostingClassifier.json → ....ensemble.GradientBoostingClassifier.json
diff --git a/...n.ensemble.GradientBoostingRegressor.json → ...n.ensemble.GradientBoostingRegressor.json b/...n.ensemble.GradientBoostingRegressor.json → ...n.ensemble.GradientBoostingRegressor.json
diff --git a/...ves/sklearn.ensemble.IsolationForest.json → ...ons/sklearn.ensemble.IsolationForest.json b/...ves/sklearn.ensemble.IsolationForest.json → ...ons/sklearn.ensemble.IsolationForest.json
diff --git a/...earn.ensemble.RandomForestClassifier.json → ...earn.ensemble.RandomForestClassifier.json b/...earn.ensemble.RandomForestClassifier.json → ...earn.ensemble.RandomForestClassifier.json
diff --git a/...nsemble.RandomForestClassifier_proba.json → ...nsemble.RandomForestClassifier_proba.json b/...nsemble.RandomForestClassifier_proba.json → ...nsemble.RandomForestClassifier_proba.json
diff --git a/...learn.ensemble.RandomForestRegressor.json → ...learn.ensemble.RandomForestRegressor.json b/...learn.ensemble.RandomForestRegressor.json → ...learn.ensemble.RandomForestRegressor.json
diff --git a/...klearn.ensemble.RandomTreesEmbedding.json → ...klearn.ensemble.RandomTreesEmbedding.json b/...klearn.ensemble.RandomTreesEmbedding.json → ...klearn.ensemble.RandomTreesEmbedding.json
diff --git a/...ture_extraction.text.CountVectorizer.json → ...ture_extraction.text.CountVectorizer.json b/...ture_extraction.text.CountVectorizer.json → ...ture_extraction.text.CountVectorizer.json
diff --git a/...ure_extraction.text.TfidfTransformer.json → ...ure_extraction.text.TfidfTransformer.json b/...ure_extraction.text.TfidfTransformer.json → ...ure_extraction.text.TfidfTransformer.json
diff --git a/...es/sklearn.naive_bayes.MultinomialNB.json → ...ns/sklearn.naive_bayes.MultinomialNB.json b/...es/sklearn.naive_bayes.MultinomialNB.json → ...ns/sklearn.naive_bayes.MultinomialNB.json
diff --git a/...learn.neighbors.KNeighborsClassifier.json → ...learn.neighbors.KNeighborsClassifier.json b/...learn.neighbors.KNeighborsClassifier.json → ...learn.neighbors.KNeighborsClassifier.json
diff --git a/...neighbors.KNeighborsClassifier_proba.json → ...neighbors.KNeighborsClassifier_proba.json b/...neighbors.KNeighborsClassifier_proba.json → ...neighbors.KNeighborsClassifier_proba.json
diff --git a/...klearn.neighbors.KNeighborsRegressor.json → ...klearn.neighbors.KNeighborsRegressor.json b/...klearn.neighbors.KNeighborsRegressor.json → ...klearn.neighbors.KNeighborsRegressor.json
diff --git a/...itives/sklearn.preprocessing.Imputer.json → .../jsons/sklearn.preprocessing.Imputer.json b/...itives/sklearn.preprocessing.Imputer.json → .../jsons/sklearn.preprocessing.Imputer.json
diff --git a/.../sklearn.preprocessing.OneHotEncoder.json → .../sklearn.preprocessing.OneHotEncoder.json b/.../sklearn.preprocessing.OneHotEncoder.json → .../sklearn.preprocessing.OneHotEncoder.json
diff --git a/...sklearn.preprocessing.StandardScaler.json → ...sklearn.preprocessing.StandardScaler.json b/...sklearn.preprocessing.StandardScaler.json → ...sklearn.preprocessing.StandardScaler.json
diff --git a/...cks_primitives/xgboost.XGBClassifier.json → ...imitives/jsons/xgboost.XGBClassifier.json b/...cks_primitives/xgboost.XGBClassifier.json → ...imitives/jsons/xgboost.XGBClassifier.json
diff --git a/...ocks_primitives/xgboost.XGBRegressor.json → mlprimitives/jsons/xgboost.XGBRegressor.json b/...ocks_primitives/xgboost.XGBRegressor.json → mlprimitives/jsons/xgboost.XGBRegressor.json
diff --git a/...pelines/graph.graph_matching.default.json → pipelines/graph.graph_matching.default.json b/...pelines/graph.graph_matching.default.json → pipelines/graph.graph_matching.default.json
diff --git a/...elines/graph.link_prediction.default.json → pipelines/graph.link_prediction.default.json b/...elines/graph.link_prediction.default.json → pipelines/graph.link_prediction.default.json
diff --git a/...ntial.SingleLayerCNNImagelClassifier.json → ...ntial.SingleLayerCNNImagelClassifier.json b/...ntial.SingleLayerCNNImagelClassifier.json → ...ntial.SingleLayerCNNImagelClassifier.json
diff --git a/...s/multi_table.classification.default.json → ...s/multi_table.classification.default.json b/...s/multi_table.classification.default.json → ...s/multi_table.classification.default.json
diff --git a/.../single_table.classification.default.json → .../single_table.classification.default.json b/.../single_table.classification.default.json → .../single_table.classification.default.json
diff --git a/...arn.decomposition.DictionaryLearning.json → ...arn.decomposition.DictionaryLearning.json b/...arn.decomposition.DictionaryLearning.json → ...arn.decomposition.DictionaryLearning.json
diff --git a/...sklearn.decomposition.FactorAnalysis.json → ...sklearn.decomposition.FactorAnalysis.json b/...sklearn.decomposition.FactorAnalysis.json → ...sklearn.decomposition.FactorAnalysis.json
diff --git a/...elines/sklearn.decomposition.FastICA.json → pipelines/sklearn.decomposition.FastICA.json b/...elines/sklearn.decomposition.FastICA.json → pipelines/sklearn.decomposition.FastICA.json
diff --git a/...ines/sklearn.decomposition.KernelPCA.json → ...ines/sklearn.decomposition.KernelPCA.json b/...ines/sklearn.decomposition.KernelPCA.json → ...ines/sklearn.decomposition.KernelPCA.json
diff --git a/..._pipelines/sklearn.decomposition.PCA.json → pipelines/sklearn.decomposition.PCA.json b/..._pipelines/sklearn.decomposition.PCA.json → pipelines/sklearn.decomposition.PCA.json
diff --git a/...s/sklearn.decomposition.TruncatedSVD.json → ...s/sklearn.decomposition.TruncatedSVD.json b/...s/sklearn.decomposition.TruncatedSVD.json → ...s/sklearn.decomposition.TruncatedSVD.json
diff --git a/.../sklearn.ensemble.AdaBoostClassifier.json → .../sklearn.ensemble.AdaBoostClassifier.json b/.../sklearn.ensemble.AdaBoostClassifier.json → .../sklearn.ensemble.AdaBoostClassifier.json
diff --git a/...s/sklearn.ensemble.AdaBoostRegressor.json → ...s/sklearn.ensemble.AdaBoostRegressor.json b/...s/sklearn.ensemble.AdaBoostRegressor.json → ...s/sklearn.ensemble.AdaBoostRegressor.json
diff --git a/...s/sklearn.ensemble.BaggingClassifier.json → ...s/sklearn.ensemble.BaggingClassifier.json b/...s/sklearn.ensemble.BaggingClassifier.json → ...s/sklearn.ensemble.BaggingClassifier.json
diff --git a/...es/sklearn.ensemble.BaggingRegressor.json → ...es/sklearn.ensemble.BaggingRegressor.json b/...es/sklearn.ensemble.BaggingRegressor.json → ...es/sklearn.ensemble.BaggingRegressor.json
diff --git a/...klearn.ensemble.ExtraTreesClassifier.json → ...klearn.ensemble.ExtraTreesClassifier.json b/...klearn.ensemble.ExtraTreesClassifier.json → ...klearn.ensemble.ExtraTreesClassifier.json
diff --git a/...sklearn.ensemble.ExtraTreesRegressor.json → ...sklearn.ensemble.ExtraTreesRegressor.json b/...sklearn.ensemble.ExtraTreesRegressor.json → ...sklearn.ensemble.ExtraTreesRegressor.json
diff --git a/....ensemble.GradientBoostingClassifier.json → ....ensemble.GradientBoostingClassifier.json b/....ensemble.GradientBoostingClassifier.json → ....ensemble.GradientBoostingClassifier.json
diff --git a/...n.ensemble.GradientBoostingRegressor.json → ...n.ensemble.GradientBoostingRegressor.json b/...n.ensemble.GradientBoostingRegressor.json → ...n.ensemble.GradientBoostingRegressor.json
diff --git a/...nes/sklearn.ensemble.IsolationForest.json → ...nes/sklearn.ensemble.IsolationForest.json b/...nes/sklearn.ensemble.IsolationForest.json → ...nes/sklearn.ensemble.IsolationForest.json
diff --git a/...earn.ensemble.RandomForestClassifier.json → ...earn.ensemble.RandomForestClassifier.json b/...earn.ensemble.RandomForestClassifier.json → ...earn.ensemble.RandomForestClassifier.json
diff --git a/...learn.ensemble.RandomForestRegressor.json → ...learn.ensemble.RandomForestRegressor.json b/...learn.ensemble.RandomForestRegressor.json → ...learn.ensemble.RandomForestRegressor.json
diff --git a/...klearn.ensemble.RandomTreesEmbedding.json → ...klearn.ensemble.RandomTreesEmbedding.json b/...klearn.ensemble.RandomTreesEmbedding.json → ...klearn.ensemble.RandomTreesEmbedding.json
diff --git a/...ipelines/text.classification.default.json → pipelines/text.classification.default.json b/...ipelines/text.classification.default.json → pipelines/text.classification.default.json
diff --git a/setup.py b/setup.py
@@ -84,15 +84,6 @@
 }
 
 
-json_primitives = glob.glob('mlblocks_primitives/**/*.json', recursive=True)
-data_files = defaultdict(list)
-for primitive_path in json_primitives:
-    parts = primitive_path.split('/')
-    dir_path = parts[1:-1]
-    install_path = os.path.join('mlblocks_primitives', *dir_path)
-    data_files[install_path].append(primitive_path)
-
-
 setup(
     author="MIT Data To AI Lab",
     author_email='[email protected]',
@@ -105,12 +96,14 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
-    data_files = list(data_files.items()),
     description="MLBlocks Primitives",
     entry_points = {
         'console_scripts': [
             'mlprimitives=mlprimitives:_main'
         ],
+        'mlprimitives': [
+            'jsons_path=mlprimitives:MLPRIMITIVES_JSONS_PATH'
+        ]
     },
     extras_require=extras_require,
     install_requires=install_requires,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,7 @@

		from mlprimitives.evaluation import score_pipeline

		MLPRIMITIVES_JSONS_PATH = os.path.join(os.path.dirname(__file__), 'jsons')
		LOGGER = logging.getLogger(__name__)


Expand Down