This is an automated email from the ASF dual-hosted git repository. mboehm7 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/systemds.git
commit 51597685f6f16e35f2fd3ff2cb84a334ec2df1f1 Author: Matthias Boehm <[email protected]> AuthorDate: Wed Apr 17 20:55:49 2024 +0200 [MINOR] Fix all frame builtin functions (correct internal names) --- scripts/builtin/apply_pipeline.dml | 2 +- scripts/builtin/correctTypos.dml | 2 +- scripts/builtin/correctTyposApply.dml | 2 +- scripts/builtin/denialConstraints.dml | 2 +- scripts/builtin/dmv.dml | 2 +- scripts/builtin/ema.dml | 2 +- scripts/builtin/executePipeline.dml | 2 +- scripts/builtin/fit_pipeline.dml | 2 +- scripts/builtin/fixInvalidLengths.dml | 2 +- scripts/builtin/fixInvalidLengthsApply.dml | 2 +- scripts/builtin/frameSort.dml | 2 +- scripts/builtin/mdedup.dml | 2 +- scripts/builtin/topk_cleaning.dml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/builtin/apply_pipeline.dml b/scripts/builtin/apply_pipeline.dml index b9f660a30d..59fcc0a26c 100644 --- a/scripts/builtin/apply_pipeline.dml +++ b/scripts/builtin/apply_pipeline.dml @@ -44,7 +44,7 @@ source("scripts/builtin/topk_cleaning.dml") as topk; -s_apply_pipeline = function(Frame[Unknown] testData, Frame[Unknown] metaData = as.frame("NULL"), Frame[Unknown] pip, +f_apply_pipeline = function(Frame[Unknown] testData, Frame[Unknown] metaData = as.frame("NULL"), Frame[Unknown] pip, Frame[Unknown] applyFunc, Matrix[Double] hp, Boolean isLastLabel = TRUE,List[Unknown] exState, List[Unknown] iState, Boolean correctTypos=FALSE) return (Matrix[Double] eXtest) { diff --git a/scripts/builtin/correctTypos.dml b/scripts/builtin/correctTypos.dml index daf1452d95..f772d8ecf0 100644 --- a/scripts/builtin/correctTypos.dml +++ b/scripts/builtin/correctTypos.dml @@ -47,7 +47,7 @@ # TODO: future: add parameter for list of words that are sure to be correct -s_correctTypos = function(Frame[String] strings, Double frequency_threshold=0.05, Integer distance_threshold=2, Boolean is_verbose=FALSE) +f_correctTypos = function(Frame[String] strings, Double frequency_threshold=0.05, Integer distance_threshold=2, Boolean is_verbose=FALSE) return (Frame[String] Y, Double frequency_threshold, Integer distance_threshold, Matrix[Double] distance_matrix, Frame[Unknown] dict) { if(is_verbose) diff --git a/scripts/builtin/correctTyposApply.dml b/scripts/builtin/correctTyposApply.dml index addc75940e..8d5870caef 100644 --- a/scripts/builtin/correctTyposApply.dml +++ b/scripts/builtin/correctTyposApply.dml @@ -50,7 +50,7 @@ # --------------------------------------------------------------------------------------------- -s_correctTyposApply = function(Frame[String] strings, Double frequency_threshold = 0.05, Integer distance_threshold = 2, Matrix[Double] distance_matrix, Frame[Unknown] dict) +f_correctTyposApply = function(Frame[String] strings, Double frequency_threshold = 0.05, Integer distance_threshold = 2, Matrix[Double] distance_matrix, Frame[Unknown] dict) return (Frame[String] Y) { strings = map(strings, "s -> s.toLowerCase()"); diff --git a/scripts/builtin/denialConstraints.dml b/scripts/builtin/denialConstraints.dml index 6b8434271b..ad557d2c40 100644 --- a/scripts/builtin/denialConstraints.dml +++ b/scripts/builtin/denialConstraints.dml @@ -82,7 +82,7 @@ # If there are no wrong instances to show (0 constrains fulfilled) --> WrongInstances=matrix(0,1,2) # ---------------------------------------------------------------------------------------------- -s_denialConstraints = function(Frame[Unknown] dataFrame, Frame[Unknown] constraintsFrame) +f_denialConstraints = function(Frame[Unknown] dataFrame, Frame[Unknown] constraintsFrame) return(Matrix[double] WrongInstances) { print("DENIAL CONSTRAINTS"); diff --git a/scripts/builtin/dmv.dml b/scripts/builtin/dmv.dml index 271147834b..4e0cd4f595 100644 --- a/scripts/builtin/dmv.dml +++ b/scripts/builtin/dmv.dml @@ -34,7 +34,7 @@ # Y Frame X including detected disguised missing values # ------------------------------------------------------------------------------------------------- -s_dmv = function(Frame[String] X, Double threshold=0.8, String replace="NA") return (Frame[String] Y) { +f_dmv = function(Frame[String] X, Double threshold=0.8, String replace="NA") return (Frame[String] Y) { if( threshold < 0 | threshold > 1 ) stop("Stopping due to invalid input, threshold required in interval [0, 1] found " + threshold) diff --git a/scripts/builtin/ema.dml b/scripts/builtin/ema.dml index 4f9c2ec7f2..a1811f6448 100644 --- a/scripts/builtin/ema.dml +++ b/scripts/builtin/ema.dml @@ -40,7 +40,7 @@ # TODO: convert to DML builtin using cumsumprod(data, alpha) -s_ema = function(Frame[Double] X, Integer search_iterations, String mode, Integer freq, +f_ema = function(Frame[Double] X, Integer search_iterations, String mode, Integer freq, Double alpha, Double beta, Double gamma) return (Frame[Double] Y) { M = map(X, "UtilFunctions.exponentialMovingAverageImputation(" + search_iterations + ";" + mode + ";" + freq + ";" + alpha + ";" + beta + ";" + gamma + ")") diff --git a/scripts/builtin/executePipeline.dml b/scripts/builtin/executePipeline.dml index b42a49bd0e..4b098e7a30 100644 --- a/scripts/builtin/executePipeline.dml +++ b/scripts/builtin/executePipeline.dml @@ -49,7 +49,7 @@ # changesByOp --- # -------------------------------------------------------------------------------------- -s_executePipeline = function(Frame[String] pipeline, Matrix[Double] Xtrain, Matrix[Double] Ytrain, +f_executePipeline = function(Frame[String] pipeline, Matrix[Double] Xtrain, Matrix[Double] Ytrain, Matrix[Double] Xtest, Matrix[Double] Ytest, List[Unknown] metaList, Matrix[Double] hyperParameters, Matrix[Double] hpForPruning = as.matrix(0), Matrix[Double] changesByOp = as.matrix(0), Integer flagsCount, Boolean test = FALSE, Boolean verbose) return (Matrix[Double] Xtrain, Matrix[Double] Ytrain, Matrix[Double] Xtest, Matrix[Double] Ytest, diff --git a/scripts/builtin/fit_pipeline.dml b/scripts/builtin/fit_pipeline.dml index e31bf65676..3c81b6bc96 100644 --- a/scripts/builtin/fit_pipeline.dml +++ b/scripts/builtin/fit_pipeline.dml @@ -46,7 +46,7 @@ source("scripts/pipelines/scripts/utils.dml") as utils; source("scripts/builtin/topk_cleaning.dml") as topk; source("scripts/builtin/bandit.dml") as bandit; -s_fit_pipeline = function(Frame[Unknown] trainData, Frame[Unknown] testData, Frame[Unknown] metaData = as.frame("NULL"), +f_fit_pipeline = function(Frame[Unknown] trainData, Frame[Unknown] testData, Frame[Unknown] metaData = as.frame("NULL"), Frame[Unknown] pip, Frame[Unknown] applyFunc, Matrix[Double] hp, Integer cvk=3, String evaluationFunc, Matrix[Double] evalFunHp, Boolean isLastLabel = TRUE, Boolean correctTypos=FALSE) return (Matrix[Double] scores, Matrix[Double] cleanTrain, Matrix[Double] cleanTest, List[Unknown] externalState, List[Unknown] iState) diff --git a/scripts/builtin/fixInvalidLengths.dml b/scripts/builtin/fixInvalidLengths.dml index 0e9ec8ba14..84a604c807 100644 --- a/scripts/builtin/fixInvalidLengths.dml +++ b/scripts/builtin/fixInvalidLengths.dml @@ -35,7 +35,7 @@ # M --- # ------------------- -s_fixInvalidLengths = function(Frame[Unknown] F1, Matrix[Double] mask, Double ql = 0.05, Double qu = 0.99) +f_fixInvalidLengths = function(Frame[Unknown] F1, Matrix[Double] mask, Double ql = 0.05, Double qu = 0.99) return (Frame[Unknown] X, Matrix[Double] mask, Matrix[Double] qLow, Matrix[Double] qUp) { length = map(F1, "x -> x.length()") diff --git a/scripts/builtin/fixInvalidLengthsApply.dml b/scripts/builtin/fixInvalidLengthsApply.dml index e566bcbc68..c6b3027906 100644 --- a/scripts/builtin/fixInvalidLengthsApply.dml +++ b/scripts/builtin/fixInvalidLengthsApply.dml @@ -35,7 +35,7 @@ # M --- # ------------------------ -s_fixInvalidLengthsApply = function(Frame[Unknown] X, Matrix[Double] mask, Matrix[Double] qLow, Matrix[Double] qUp) +f_fixInvalidLengthsApply = function(Frame[Unknown] X, Matrix[Double] mask, Matrix[Double] qLow, Matrix[Double] qUp) return (Frame[Unknown] X) { diff --git a/scripts/builtin/frameSort.dml b/scripts/builtin/frameSort.dml index fa85a28946..19a9d6060a 100644 --- a/scripts/builtin/frameSort.dml +++ b/scripts/builtin/frameSort.dml @@ -33,7 +33,7 @@ # f_ordered sorted dataset by column 1 in decreasing order # ----------------------------------------------------------------------------------------- -s_frameSort = function(Frame[String] F, Matrix[Double] mask, Boolean orderDesc = TRUE) +f_frameSort = function(Frame[String] F, Matrix[Double] mask, Boolean orderDesc = TRUE) return (Frame[String] f_ordered) { index = vectorToCsv(mask) diff --git a/scripts/builtin/mdedup.dml b/scripts/builtin/mdedup.dml index 5c40c12ce5..60af35991d 100644 --- a/scripts/builtin/mdedup.dml +++ b/scripts/builtin/mdedup.dml @@ -38,7 +38,7 @@ # MD Matrix nx1 of duplicates # ------------------------------------------------------------------------------- -s_mdedup = function(Frame[String] X, Matrix[Double] LHSfeatures, Matrix[Double] LHSthreshold, +f_mdedup = function(Frame[String] X, Matrix[Double] LHSfeatures, Matrix[Double] LHSthreshold, Matrix[Double] RHSfeatures, Matrix[Double] RHSthreshold, Boolean verbose) return(Matrix[Double] MD) { diff --git a/scripts/builtin/topk_cleaning.dml b/scripts/builtin/topk_cleaning.dml index ed5a00572e..7ec4278319 100644 --- a/scripts/builtin/topk_cleaning.dml +++ b/scripts/builtin/topk_cleaning.dml @@ -26,7 +26,7 @@ source("scripts/pipelines/scripts/utils.dml") as utils; source("scripts/pipelines/scripts/enumerateLogical.dml") as lg; source("scripts/builtin/bandit.dml") as bandit; -s_topk_cleaning = function(Frame[Unknown] dataTrain, Frame[Unknown] dataTest = as.frame("NULL"), Frame[Unknown] metaData = as.frame("NULL"), Frame[Unknown] primitives, +f_topk_cleaning = function(Frame[Unknown] dataTrain, Frame[Unknown] dataTest = as.frame("NULL"), Frame[Unknown] metaData = as.frame("NULL"), Frame[Unknown] primitives, Frame[Unknown] parameters, Frame[String] refSol = as.frame("NaN"), String evaluationFunc, Matrix[Double] evalFunHp, Integer topK = 5, Integer resource_val = 20, Integer max_iter = 10, Double lq = 0.1, Double uq=0.7, Double sample = 1.0, Double expectedIncrease=1.0, Integer seed = -1, Boolean cv=TRUE, Integer cvk = 2, Boolean isLastLabel = TRUE, Integer rowCount = 3700,
