This is an automated email from the ASF dual-hosted git repository. baunsgaard pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/systemds.git
commit a2da7905e38f2bd473a303ecba510440329b2745 Author: baunsgaard <[email protected]> AuthorDate: Mon Apr 12 10:09:08 2021 +0200 [MINOR] Fix regression algorithms python The commit yesterday made the builtin auto generated __init__ file incorrect for executing the python api without the install from pip, this commit fixes this such that it works both if installed and if run from the src/main/python folder. --- src/main/python/generator/generator.py | 2 +- .../python/systemds/operator/algorithm/__init__.py | 160 ++++++++++----------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/main/python/generator/generator.py b/src/main/python/generator/generator.py index 6965d46..2aeda04 100644 --- a/src/main/python/generator/generator.py +++ b/src/main/python/generator/generator.py @@ -42,7 +42,7 @@ class PythonAPIFileGenerator(object): init_path = os.path.join(os.path.dirname(os.path.dirname( __file__)), 'systemds', 'operator', 'algorithm', '__init__.py') - init_import = u"from .builtin import {function} \n" + init_import = u"from .builtin.{function} import {function} \n" init_all = u"__all__ = {functions} \n" def __init__(self, source_path: str, extension: str = 'py'): diff --git a/src/main/python/systemds/operator/algorithm/__init__.py b/src/main/python/systemds/operator/algorithm/__init__.py index 51d1f8e..b3bcd3d 100644 --- a/src/main/python/systemds/operator/algorithm/__init__.py +++ b/src/main/python/systemds/operator/algorithm/__init__.py @@ -21,85 +21,85 @@ # Autogenerated By : src/main/python/generator/generator.py -from .builtin import abstain -from .builtin import als -from .builtin import alsCG -from .builtin import alsDS -from .builtin import alsPredict -from .builtin import alsTopkPredict -from .builtin import arima -from .builtin import bandit -from .builtin import bivar -from .builtin import components -from .builtin import confusionMatrix -from .builtin import cor -from .builtin import cox -from .builtin import cspline -from .builtin import csplineDS -from .builtin import cvlm -from .builtin import dbscan -from .builtin import decisionTree -from .builtin import discoverFD -from .builtin import dist -from .builtin import gaussianClassifier -from .builtin import getAccuracy -from .builtin import glm -from .builtin import gmm -from .builtin import gmmPredict -from .builtin import gnmf -from .builtin import gridSearch -from .builtin import hyperband -from .builtin import img_brightness -from .builtin import img_crop -from .builtin import img_mirror -from .builtin import imputeByFD -from .builtin import imputeByMean -from .builtin import imputeByMedian -from .builtin import imputeByMode -from .builtin import intersect -from .builtin import km -from .builtin import kmeans -from .builtin import kmeansPredict -from .builtin import knnbf -from .builtin import l2svm -from .builtin import l2svmPredict -from .builtin import lasso -from .builtin import lm -from .builtin import lmCG -from .builtin import lmDS -from .builtin import logSumExp -from .builtin import msvm -from .builtin import msvmPredict -from .builtin import multiLogReg -from .builtin import multiLogRegPredict -from .builtin import na_locf -from .builtin import naivebayes -from .builtin import normalize -from .builtin import outlier -from .builtin import outlierByArima -from .builtin import outlierByIQR -from .builtin import outlierBySd -from .builtin import pca -from .builtin import pnmf -from .builtin import ppca -from .builtin import randomForest -from .builtin import scale -from .builtin import scaleApply -from .builtin import sherlock -from .builtin import sherlockPredict -from .builtin import sigmoid -from .builtin import slicefinder -from .builtin import smote -from .builtin import split -from .builtin import splitBalanced -from .builtin import statsNA -from .builtin import steplm -from .builtin import toOneHot -from .builtin import tomeklink -from .builtin import univar -from .builtin import vectorToCsv -from .builtin import winsorize -from .builtin import xdummy1 -from .builtin import xdummy2 +from .builtin.abstain import abstain +from .builtin.als import als +from .builtin.alsCG import alsCG +from .builtin.alsDS import alsDS +from .builtin.alsPredict import alsPredict +from .builtin.alsTopkPredict import alsTopkPredict +from .builtin.arima import arima +from .builtin.bandit import bandit +from .builtin.bivar import bivar +from .builtin.components import components +from .builtin.confusionMatrix import confusionMatrix +from .builtin.cor import cor +from .builtin.cox import cox +from .builtin.cspline import cspline +from .builtin.csplineDS import csplineDS +from .builtin.cvlm import cvlm +from .builtin.dbscan import dbscan +from .builtin.decisionTree import decisionTree +from .builtin.discoverFD import discoverFD +from .builtin.dist import dist +from .builtin.gaussianClassifier import gaussianClassifier +from .builtin.getAccuracy import getAccuracy +from .builtin.glm import glm +from .builtin.gmm import gmm +from .builtin.gmmPredict import gmmPredict +from .builtin.gnmf import gnmf +from .builtin.gridSearch import gridSearch +from .builtin.hyperband import hyperband +from .builtin.img_brightness import img_brightness +from .builtin.img_crop import img_crop +from .builtin.img_mirror import img_mirror +from .builtin.imputeByFD import imputeByFD +from .builtin.imputeByMean import imputeByMean +from .builtin.imputeByMedian import imputeByMedian +from .builtin.imputeByMode import imputeByMode +from .builtin.intersect import intersect +from .builtin.km import km +from .builtin.kmeans import kmeans +from .builtin.kmeansPredict import kmeansPredict +from .builtin.knnbf import knnbf +from .builtin.l2svm import l2svm +from .builtin.l2svmPredict import l2svmPredict +from .builtin.lasso import lasso +from .builtin.lm import lm +from .builtin.lmCG import lmCG +from .builtin.lmDS import lmDS +from .builtin.logSumExp import logSumExp +from .builtin.msvm import msvm +from .builtin.msvmPredict import msvmPredict +from .builtin.multiLogReg import multiLogReg +from .builtin.multiLogRegPredict import multiLogRegPredict +from .builtin.na_locf import na_locf +from .builtin.naivebayes import naivebayes +from .builtin.normalize import normalize +from .builtin.outlier import outlier +from .builtin.outlierByArima import outlierByArima +from .builtin.outlierByIQR import outlierByIQR +from .builtin.outlierBySd import outlierBySd +from .builtin.pca import pca +from .builtin.pnmf import pnmf +from .builtin.ppca import ppca +from .builtin.randomForest import randomForest +from .builtin.scale import scale +from .builtin.scaleApply import scaleApply +from .builtin.sherlock import sherlock +from .builtin.sherlockPredict import sherlockPredict +from .builtin.sigmoid import sigmoid +from .builtin.slicefinder import slicefinder +from .builtin.smote import smote +from .builtin.split import split +from .builtin.splitBalanced import splitBalanced +from .builtin.statsNA import statsNA +from .builtin.steplm import steplm +from .builtin.toOneHot import toOneHot +from .builtin.tomeklink import tomeklink +from .builtin.univar import univar +from .builtin.vectorToCsv import vectorToCsv +from .builtin.winsorize import winsorize +from .builtin.xdummy1 import xdummy1 +from .builtin.xdummy2 import xdummy2 __all__ = [abstain, als, alsCG, alsDS, alsPredict, alsTopkPredict, arima, bandit, bivar, components, confusionMatrix, cor, cox, cspline, csplineDS, cvlm, dbscan, decisionTree, discoverFD, dist, gaussianClassifier, getAccuracy, glm, gmm, gmmPredict, gnmf, gridSearch, hyperband, img_brightness, img_crop, img_mirror, imputeByFD, imputeByMean, imputeByMedian, imputeByMode, intersect, km, kmeans, kmeansPredict, knnbf, l2svm, l2svmPredict, lasso, lm, lmCG, lmDS, logSumExp, msvm, msvmPredict, m [...]
