Repository: systemml Updated Branches: refs/heads/master 11b689d49 -> 1a3d85f91
http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/applications/validation/CV_MultiClassSVM.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/validation/CV_MultiClassSVM.dml b/src/test/scripts/applications/validation/CV_MultiClassSVM.dml index 83e45de..796b821 100644 --- a/src/test/scripts/applications/validation/CV_MultiClassSVM.dml +++ b/src/test/scripts/applications/validation/CV_MultiClassSVM.dml @@ -55,9 +55,9 @@ stats = matrix(0, rows=k, cols=1); #k-folds x 1-stats parfor( i in 1:k ) { #prepare train/test fold projections - vPxi = ppred( P, i, "==" ); # Select 1/k fraction of the rows + vPxi = (P == i); # Select 1/k fraction of the rows mPxi = (vPxi %*% ones); # for the i-th fold TEST set - #nvPxi = ppred( P, i, "!=" ); + #nvPxi = (P != i); #nmPxi = (nvPxi %*% ones); #note: inefficient for sparse data #create train/test folds @@ -120,7 +120,7 @@ scoreMultiClassSVM = function( Matrix[double] X, Matrix[double] y, Matrix[double predicted_y = rowIndexMax( scores); - correct_percentage = sum( ppred( predicted_y - y, 0, "==")) / Nt * 100; + correct_percentage = sum((predicted_y - y) == 0) / Nt * 100; out_correct_pct = correct_percentage; @@ -149,7 +149,7 @@ multiClassSVM = function (Matrix[double] X, Matrix[double] Y, Integer intercept, iter_class = 1 - Y_local = 2 * ppred( Y, iter_class, "==") - 1 + Y_local = 2 * (Y == iter_class) - 1 w_class = Rand( rows=num_features, cols=1, min=0, max=0, pdf="uniform") if (intercept == 1) { @@ -172,7 +172,7 @@ multiClassSVM = function (Matrix[double] X, Matrix[double] Y, Integer intercept, while(continue1 == 1){ tmp_w = w_class + step_sz*s out = 1 - Y_local * (X %*% tmp_w) - sv = ppred(out, 0, ">") + sv = (out > 0) out = out * sv g = wd + step_sz*dd - sum(out * Y_local * Xd) h = dd + sum(Xd * sv * Xd) @@ -186,14 +186,14 @@ multiClassSVM = function (Matrix[double] X, Matrix[double] Y, Integer intercept, w_class = w_class + step_sz*s out = 1 - Y_local * (X %*% w_class) - sv = ppred(out, 0, ">") + sv = (out > 0) out = sv * out obj = 0.5 * sum(out * out) + lambda/2 * sum(w_class * w_class) g_new = t(X) %*% (out * Y_local) - lambda * w_class tmp = sum(s * g_old) - train_acc = sum(ppred(Y_local*(X%*%w_class), 0, ">="))/num_samples*100 + train_acc = sum((Y_local*(X%*%w_class)) >= 0)/num_samples*100 print("For class " + iter_class + " iteration " + iter + " training accuracy: " + train_acc) if((step_sz*tmp < epsilon*obj) | (iter >= max_iterations-1)){ @@ -213,7 +213,7 @@ multiClassSVM = function (Matrix[double] X, Matrix[double] Y, Integer intercept, iter_class = iter_class + 1 while(iter_class <= num_classes){ - Y_local = 2 * ppred(Y, iter_class, "==") - 1 + Y_local = 2 * (Y == iter_class) - 1 # w_class = Rand(rows=num_features, cols=1, min=0, max=0, pdf="uniform") w_class = Rand(rows=ncol(X), cols=1, min=0, max=0, pdf="uniform") if (intercept == 1) { @@ -236,7 +236,7 @@ multiClassSVM = function (Matrix[double] X, Matrix[double] Y, Integer intercept, while(continue1 == 1){ tmp_w = w_class + step_sz*s out = 1 - Y_local * (X %*% tmp_w) - sv = ppred(out, 0, ">") + sv = (out > 0) out = out * sv g = wd + step_sz*dd - sum(out * Y_local * Xd) h = dd + sum(Xd * sv * Xd) @@ -250,14 +250,14 @@ multiClassSVM = function (Matrix[double] X, Matrix[double] Y, Integer intercept, w_class = w_class + step_sz*s out = 1 - Y_local * (X %*% w_class) - sv = ppred(out, 0, ">") + sv = (out > 0) out = sv * out obj = 0.5 * sum(out * out) + lambda/2 * sum(w_class * w_class) g_new = t(X) %*% (out * Y_local) - lambda * w_class tmp = sum(s * g_old) - train_acc = sum(ppred(Y_local*(X%*%w_class), 0, ">="))/num_samples*100 + train_acc = sum((Y_local*(X%*%w_class)) >= 0)/num_samples*100 print("For class " + iter_class + " iteration " + iter + " training accuracy: " + train_acc) if((step_sz*tmp < epsilon*obj) | (iter >= max_iterations-1)){ http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/applications/validation/CV_MultiClassSVM.sasha.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/validation/CV_MultiClassSVM.sasha.dml b/src/test/scripts/applications/validation/CV_MultiClassSVM.sasha.dml index e62d411..0943f1a 100644 --- a/src/test/scripts/applications/validation/CV_MultiClassSVM.sasha.dml +++ b/src/test/scripts/applications/validation/CV_MultiClassSVM.sasha.dml @@ -50,9 +50,9 @@ stats = matrix(0, rows=k, cols=40); #k-folds x 40-stats parfor( i in 1:k ) { #prepare train/test fold projections - vPxi = ppred( P, i, "==" ); + vPxi = (P == i); mPxi = (vPxi %*% ones); - #nvPxi = ppred( P, i, "!=" ); + #nvPxi = (P != i); #nmPxi = (nvPxi %*% ones); #note: inefficient for sparse data #create train/test folds @@ -105,7 +105,7 @@ if (intercept == 1) { iter_class = 1 -Y_local = 2 * ppred(Y, iter_class, "==") - 1 +Y_local = 2 * (Y == iter_class) - 1 w_class = Rand(rows=num_features, cols=1, min=0, max=0, pdf="uniform") if (intercept == 1) { zero_matrix = Rand(rows=1, cols=1, min=0.0, max=0.0); @@ -126,7 +126,7 @@ while(continue == 1) { while(continue1 == 1){ tmp_w = w_class + step_sz*s out = 1 - Y_local * (X %*% tmp_w) - sv = ppred(out, 0, ">") + sv = (out > 0) out = out * sv g = wd + step_sz*dd - sum(out * Y_local * Xd) h = dd + sum(Xd * sv * Xd) @@ -140,14 +140,14 @@ while(continue == 1) { w_class = w_class + step_sz*s out = 1 - Y_local * (X %*% w_class) - sv = ppred(out, 0, ">") + sv = (out > 0) out = sv * out obj = 0.5 * sum(out * out) + lambda/2 * sum(w_class * w_class) g_new = t(X) %*% (out * Y_local) - lambda * w_class tmp = sum(s * g_old) - train_acc = sum(ppred(Y_local*(X%*%w_class), 0, ">="))/num_samples*100 + train_acc = sum((Y_local*(X%*%w_class)) >= 0)/num_samples*100 print("For class " + iter_class + " iteration " + iter + " training accuracy: " + train_acc) if((step_sz*tmp < epsilon*obj) | (iter >= max_iterations-1)){ @@ -167,7 +167,7 @@ w = w_class iter_class = iter_class + 1 while(iter_class <= num_classes){ - Y_local = 2 * ppred(Y, iter_class, "==") - 1 + Y_local = 2 * (Y == iter_class) - 1 # w_class = Rand(rows=num_features, cols=1, min=0, max=0, pdf="uniform") w_class = Rand(rows=ncol(X), cols=1, min=0, max=0, pdf="uniform") if (intercept == 1) { @@ -190,7 +190,7 @@ while(iter_class <= num_classes){ while(continue1 == 1){ tmp_w = w_class + step_sz*s out = 1 - Y_local * (X %*% tmp_w) - sv = ppred(out, 0, ">") + sv = (out > 0) out = out * sv g = wd + step_sz*dd - sum(out * Y_local * Xd) h = dd + sum(Xd * sv * Xd) @@ -204,14 +204,14 @@ while(iter_class <= num_classes){ w_class = w_class + step_sz*s out = 1 - Y_local * (X %*% w_class) - sv = ppred(out, 0, ">") + sv = (out > 0) out = sv * out obj = 0.5 * sum(out * out) + lambda/2 * sum(w_class * w_class) g_new = t(X) %*% (out * Y_local) - lambda * w_class tmp = sum(s * g_old) - train_acc = sum(ppred(Y_local*(X%*%w_class), 0, ">="))/num_samples*100 + train_acc = sum(Y_local*(X%*%w_class) >= 0)/num_samples*100 print("For class " + iter_class + " iteration " + iter + " training accuracy: " + train_acc) if((step_sz*tmp < epsilon*obj) | (iter >= max_iterations-1)){ @@ -267,8 +267,8 @@ scoreMultiClassSVM = function (Matrix[double] X_train, Matrix[double] y_train, scores_test = X_test %*% W + ones_test %*% b; y_train_pred = rowIndexMax (scores_train); y_test_pred = rowIndexMax (scores_test); - correct_train= ppred (y_train_pred, y_train, "=="); - correct_test = ppred (y_test_pred, y_test, "=="); + correct_train= (y_train_pred == y_train); + correct_test = (y_test_pred == y_test); # TRAINING DATA - COMPARE WITH ACTUAL LABELS: # Compute the actual number of true/false predictions http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/applications/validation/LinearLogisticRegression.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/validation/LinearLogisticRegression.dml b/src/test/scripts/applications/validation/LinearLogisticRegression.dml index a158ba5..b6523ff 100644 --- a/src/test/scripts/applications/validation/LinearLogisticRegression.dml +++ b/src/test/scripts/applications/validation/LinearLogisticRegression.dml @@ -230,7 +230,7 @@ while(!converge) { } o2 = y * o - correct = sum(ppred(o2, 0, ">")) + correct = sum(o2 > 0) accuracy = correct*100.0/N iter = iter + 1 #converge = (norm_grad < (tol * norm_grad_initial)) | (iter > maxiter) http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/applications/validation/MultiClassSVM.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/validation/MultiClassSVM.dml b/src/test/scripts/applications/validation/MultiClassSVM.dml index 3c76177..e46e198 100644 --- a/src/test/scripts/applications/validation/MultiClassSVM.dml +++ b/src/test/scripts/applications/validation/MultiClassSVM.dml @@ -55,7 +55,7 @@ if (intercept == 1) { iter_class = 1 -Y_local = 2 * ppred(Y, iter_class, "==") - 1 +Y_local = 2 * (Y == iter_class) - 1 w_class = Rand(rows=num_features, cols=1, min=0, max=0, pdf="uniform") if (intercept == 1) { zero_matrix = Rand(rows=1, cols=1, min=0.0, max=0.0); @@ -76,7 +76,7 @@ while(continue == 1) { while(continue1 == 1){ tmp_w = w_class + step_sz*s out = 1 - Y_local * (X %*% tmp_w) - sv = ppred(out, 0, ">") + sv = (out > 0) out = out * sv g = wd + step_sz*dd - sum(out * Y_local * Xd) h = dd + sum(Xd * sv * Xd) @@ -90,14 +90,14 @@ while(continue == 1) { w_class = w_class + step_sz*s out = 1 - Y_local * (X %*% w_class) - sv = ppred(out, 0, ">") + sv = (out > 0) out = sv * out obj = 0.5 * sum(out * out) + lambda/2 * sum(w_class * w_class) g_new = t(X) %*% (out * Y_local) - lambda * w_class tmp = sum(s * g_old) - train_acc = sum(ppred(Y_local*(X%*%w_class), 0, ">="))/num_samples*100 + train_acc = sum((Y_local*(X%*%w_class)) >= 0)/num_samples*100 print("For class " + iter_class + " iteration " + iter + " training accuracy: " + train_acc) if((step_sz*tmp < epsilon*obj) | (iter >= max_iterations-1)){ @@ -117,7 +117,7 @@ w = w_class iter_class = iter_class + 1 while(iter_class <= num_classes){ - Y_local = 2 * ppred(Y, iter_class, "==") - 1 + Y_local = 2 * (Y == iter_class) - 1 # w_class = Rand(rows=num_features, cols=1, min=0, max=0, pdf="uniform") w_class = Rand(rows=ncol(X), cols=1, min=0, max=0, pdf="uniform") if (intercept == 1) { @@ -140,7 +140,7 @@ while(iter_class <= num_classes){ while(continue1 == 1){ tmp_w = w_class + step_sz*s out = 1 - Y_local * (X %*% tmp_w) - sv = ppred(out, 0, ">") + sv = (out > 0) out = out * sv g = wd + step_sz*dd - sum(out * Y_local * Xd) h = dd + sum(Xd * sv * Xd) @@ -154,14 +154,14 @@ while(iter_class <= num_classes){ w_class = w_class + step_sz*s out = 1 - Y_local * (X %*% w_class) - sv = ppred(out, 0, ">") + sv = (out > 0) out = sv * out obj = 0.5 * sum(out * out) + lambda/2 * sum(w_class * w_class) g_new = t(X) %*% (out * Y_local) - lambda * w_class tmp = sum(s * g_old) - train_acc = sum(ppred(Y_local*(X%*%w_class), 0, ">="))/num_samples*100 + train_acc = sum(Y_local*(X%*%w_class) >= 0)/num_samples*100 print("For class " + iter_class + " iteration " + iter + " training accuracy: " + train_acc) if((step_sz*tmp < epsilon*obj) | (iter >= max_iterations-1)){ http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/applications/validation/MultiClassSVMScore.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/validation/MultiClassSVMScore.dml b/src/test/scripts/applications/validation/MultiClassSVMScore.dml index c6e9760..0e2c4ac 100644 --- a/src/test/scripts/applications/validation/MultiClassSVMScore.dml +++ b/src/test/scripts/applications/validation/MultiClassSVMScore.dml @@ -48,6 +48,6 @@ write(predicted_y, $7, format="text"); if ($2 == 1) { y = read($3); - correct_percentage = sum(ppred(predicted_y - y, 0, "==")) / Nt * 100; + correct_percentage = sum((predicted_y - y) == 0) / Nt * 100; write(correct_percentage, $8); } http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/applications/validation/genRandData4LogisticRegression.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/validation/genRandData4LogisticRegression.dml b/src/test/scripts/applications/validation/genRandData4LogisticRegression.dml index 7550a25..63dd402 100644 --- a/src/test/scripts/applications/validation/genRandData4LogisticRegression.dml +++ b/src/test/scripts/applications/validation/genRandData4LogisticRegression.dml @@ -82,7 +82,7 @@ if(addNoise == 1){ print ("nrow(prob) = " + nrow(prob) + ", ncol(prob) = " + ncol(prob) + "; nrow(r) = " + nrow(r) + ", ncol(r) = " + ncol(r)); -Y = 1 - 2*ppred(prob, r, "<") +Y = 1 - 2*(prob < r) write (w, $5, format="text"); write (X, $6, format="binary"); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/applications/validation/genRandData4MultiClassSVM.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/validation/genRandData4MultiClassSVM.dml b/src/test/scripts/applications/validation/genRandData4MultiClassSVM.dml index d9fe043..5af1c65 100644 --- a/src/test/scripts/applications/validation/genRandData4MultiClassSVM.dml +++ b/src/test/scripts/applications/validation/genRandData4MultiClassSVM.dml @@ -66,7 +66,7 @@ if(addNoise == 1){ r = Rand(rows=numSamples, cols=1, min=0, max=1, pdf="uniform", seed=0) #r = Rand(rows=numSamples, cols=1, min=0.5, max=0.5, pdf="uniform") } -Y = 1 - 2*ppred(prob, r, "<") +Y = 1 - 2*(prob < r) Y = (Y+3)/2 write(w, $5, format="binary") http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml index 7662968..e16a597 100644 --- a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml +++ b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml @@ -24,7 +24,7 @@ A = read($1, rows=$2, cols=$3, format="text"); B = read($4, rows=$2, cols=1, format="text"); -tmp = diag(ppred(B,2,"==")); +tmp = diag(B == 2); P = removeEmpty(target=tmp, margin="rows"); C = P %*% A; http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml index 6300010..55aeebd 100644 --- a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml +++ b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml @@ -24,7 +24,7 @@ A = read($1, rows=$2, cols=$3, format="text"); B = read($4, rows=$2, cols=1, format="text"); -tmp = diag(ppred(B,2,"==")); +tmp = diag(B == 2); P = removeEmpty(target=tmp, margin="cols"); C = t(P) %*% A; http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.R b/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.R new file mode 100644 index 0000000..6f57134 --- /dev/null +++ b/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.R @@ -0,0 +1,59 @@ +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + + +args <- commandArgs(TRUE) +options(digits=22) + +library("Matrix") + +A <- readMM(paste(args[1], "A.mtx", sep="")) +B <- readMM(paste(args[1], "B.mtx", sep="")) + +type = as.integer(args[2]) + +if( type == 0 ) +{ + C = (A > B) +} +if( type == 1 ) +{ + C = (A < B) +} +if( type == 2 ) +{ + C = (A == B) +} +if( type == 3 ) +{ + C = (A != B) +} +if( type == 4 ) +{ + C = (A >= B) +} +if( type == 5 ) +{ + C = (A <= B) +} + + +writeMM(as(C, "CsparseMatrix"), paste(args[3], "C", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.dml b/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.dml new file mode 100644 index 0000000..65dc35d --- /dev/null +++ b/src/test/scripts/functions/binary/matrix_full_other/LogicalMatrixTest.dml @@ -0,0 +1,50 @@ +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + +A = read( $1 ); +B = read( $2 ); + +if( $3 == 0 ) +{ + C = (A > B) +} +else if( $3 == 1 ) +{ + C = (A < B) +} +else if( $3 == 2 ) +{ + C = (A == B) +} +else if( $3 == 3 ) +{ + C = (A != B) +} +else if( $3 == 4 ) +{ + C = (A >= B) +} +else if( $3 == 5 ) +{ + C = (A <= B) +} + +write(C, $4, format="text"); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.R b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.R new file mode 100644 index 0000000..c54b185 --- /dev/null +++ b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.R @@ -0,0 +1,60 @@ +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + + +args <- commandArgs(TRUE) +options(digits=22) + +library("Matrix") + +A1 <- readMM(paste(args[1], "A.mtx", sep="")) +A <- as.matrix(A1); + +type = as.integer(args[2]) +constant = as.double(args[3]); + +if( type == 0 ) +{ + B = (constant > A) +} +if( type == 1 ) +{ + B = (constant < A) +} +if( type == 2 ) +{ + B = (constant == A) +} +if( type == 3 ) +{ + B = (constant != A) +} +if( type == 4 ) +{ + B = (constant >= A) +} +if( type == 5 ) +{ + B = (constant <= A) +} + + +writeMM(as(B, "CsparseMatrix"), paste(args[4], "B", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.dml b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.dml new file mode 100644 index 0000000..8097f40 --- /dev/null +++ b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarLeftTest.dml @@ -0,0 +1,49 @@ +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + +A = read( $1 ); + +if( $2 == 0 ) +{ + B = ($3 > A) +} +else if( $2 == 1 ) +{ + B = ($3 < A) +} +else if( $2 == 2 ) +{ + B = ($3 == A) +} +else if( $2 == 3 ) +{ + B = ($3 != A) +} +else if( $2 == 4 ) +{ + B = ($3 >= A) +} +else if( $2 == 5 ) +{ + B = ($3 <= A) +} + +write(B, $4, format="text"); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.R b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.R new file mode 100644 index 0000000..cd39071 --- /dev/null +++ b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.R @@ -0,0 +1,60 @@ +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + + +args <- commandArgs(TRUE) +options(digits=22) + +library("Matrix") + +A1 <- readMM(paste(args[1], "A.mtx", sep="")) +A <- as.matrix(A1); + +type = as.integer(args[2]) +constant = as.double(args[3]); + +if( type == 0 ) +{ + B = (A > constant) +} +if( type == 1 ) +{ + B = (A < constant) +} +if( type == 2 ) +{ + B = (A == constant) +} +if( type == 3 ) +{ + B = (A != constant) +} +if( type == 4 ) +{ + B = (A >= constant) +} +if( type == 5 ) +{ + B = (A <= constant) +} + + +writeMM(as(B, "CsparseMatrix"), paste(args[4], "B", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.dml b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.dml new file mode 100644 index 0000000..c23acea --- /dev/null +++ b/src/test/scripts/functions/binary/matrix_full_other/LogicalScalarRightTest.dml @@ -0,0 +1,49 @@ +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + +A = read( $1 ); + +if( $2 == 0 ) +{ + B = (A > $3) +} +else if( $2 == 1 ) +{ + B = (A < $3) +} +else if( $2 == 2 ) +{ + B = (A == $3) +} +else if( $2 == 3 ) +{ + B = (A != $3) +} +else if( $2 == 4 ) +{ + B = (A >= $3) +} +else if( $2 == 5 ) +{ + B = (A <= $3) +} + +write(B, $4, format="text"); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.R b/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.R deleted file mode 100644 index 6f57134..0000000 --- a/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.R +++ /dev/null @@ -1,59 +0,0 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - - -args <- commandArgs(TRUE) -options(digits=22) - -library("Matrix") - -A <- readMM(paste(args[1], "A.mtx", sep="")) -B <- readMM(paste(args[1], "B.mtx", sep="")) - -type = as.integer(args[2]) - -if( type == 0 ) -{ - C = (A > B) -} -if( type == 1 ) -{ - C = (A < B) -} -if( type == 2 ) -{ - C = (A == B) -} -if( type == 3 ) -{ - C = (A != B) -} -if( type == 4 ) -{ - C = (A >= B) -} -if( type == 5 ) -{ - C = (A <= B) -} - - -writeMM(as(C, "CsparseMatrix"), paste(args[3], "C", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.dml b/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.dml deleted file mode 100644 index 13fd854..0000000 --- a/src/test/scripts/functions/binary/matrix_full_other/PPredMatrixTest.dml +++ /dev/null @@ -1,50 +0,0 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - -A = read( $1 ); -B = read( $2 ); - -if( $3 == 0 ) -{ - C = ppred(A, B, ">") -} -else if( $3 == 1 ) -{ - C = ppred(A, B, "<") -} -else if( $3 == 2 ) -{ - C = ppred(A, B, "==") -} -else if( $3 == 3 ) -{ - C = ppred(A, B, "!=") -} -else if( $3 == 4 ) -{ - C = ppred(A, B, ">=") -} -else if( $3 == 5 ) -{ - C = ppred(A, B, "<=") -} - -write(C, $4, format="text"); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.R b/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.R deleted file mode 100644 index c54b185..0000000 --- a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.R +++ /dev/null @@ -1,60 +0,0 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - - -args <- commandArgs(TRUE) -options(digits=22) - -library("Matrix") - -A1 <- readMM(paste(args[1], "A.mtx", sep="")) -A <- as.matrix(A1); - -type = as.integer(args[2]) -constant = as.double(args[3]); - -if( type == 0 ) -{ - B = (constant > A) -} -if( type == 1 ) -{ - B = (constant < A) -} -if( type == 2 ) -{ - B = (constant == A) -} -if( type == 3 ) -{ - B = (constant != A) -} -if( type == 4 ) -{ - B = (constant >= A) -} -if( type == 5 ) -{ - B = (constant <= A) -} - - -writeMM(as(B, "CsparseMatrix"), paste(args[4], "B", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.dml b/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.dml deleted file mode 100644 index 2567e9b..0000000 --- a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarLeftTest.dml +++ /dev/null @@ -1,49 +0,0 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - -A = read( $1 ); - -if( $2 == 0 ) -{ - B = ppred($3, A, ">") -} -else if( $2 == 1 ) -{ - B = ppred($3, A, "<") -} -else if( $2 == 2 ) -{ - B = ppred($3, A, "==") -} -else if( $2 == 3 ) -{ - B = ppred($3, A, "!=") -} -else if( $2 == 4 ) -{ - B = ppred($3, A, ">=") -} -else if( $2 == 5 ) -{ - B = ppred($3, A, "<=") -} - -write(B, $4, format="text"); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.R b/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.R deleted file mode 100644 index cd39071..0000000 --- a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.R +++ /dev/null @@ -1,60 +0,0 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - - -args <- commandArgs(TRUE) -options(digits=22) - -library("Matrix") - -A1 <- readMM(paste(args[1], "A.mtx", sep="")) -A <- as.matrix(A1); - -type = as.integer(args[2]) -constant = as.double(args[3]); - -if( type == 0 ) -{ - B = (A > constant) -} -if( type == 1 ) -{ - B = (A < constant) -} -if( type == 2 ) -{ - B = (A == constant) -} -if( type == 3 ) -{ - B = (A != constant) -} -if( type == 4 ) -{ - B = (A >= constant) -} -if( type == 5 ) -{ - B = (A <= constant) -} - - -writeMM(as(B, "CsparseMatrix"), paste(args[4], "B", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.dml b/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.dml deleted file mode 100644 index e9c0579..0000000 --- a/src/test/scripts/functions/binary/matrix_full_other/PPredScalarRightTest.dml +++ /dev/null @@ -1,49 +0,0 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - -A = read( $1 ); - -if( $2 == 0 ) -{ - B = ppred(A, $3, ">") -} -else if( $2 == 1 ) -{ - B = ppred(A, $3, "<") -} -else if( $2 == 2 ) -{ - B = ppred(A, $3, "==") -} -else if( $2 == 3 ) -{ - B = ppred(A, $3, "!=") -} -else if( $2 == 4 ) -{ - B = ppred(A, $3, ">=") -} -else if( $2 == 5 ) -{ - B = ppred(A, $3, "<=") -} - -write(B, $4, format="text"); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/misc/ValueTypePredLeftScalar.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/misc/ValueTypePredLeftScalar.dml b/src/test/scripts/functions/misc/ValueTypePredLeftScalar.dml index cc09f42..106d2db 100644 --- a/src/test/scripts/functions/misc/ValueTypePredLeftScalar.dml +++ b/src/test/scripts/functions/misc/ValueTypePredLeftScalar.dml @@ -21,5 +21,5 @@ X = rand(rows=10, cols=10); -Y = ppred($1, X, ">"); +Y = ($1 > X); write(Y, $2); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/misc/ValueTypePredRightScalar.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/misc/ValueTypePredRightScalar.dml b/src/test/scripts/functions/misc/ValueTypePredRightScalar.dml index 19deb5e..27c6b29 100644 --- a/src/test/scripts/functions/misc/ValueTypePredRightScalar.dml +++ b/src/test/scripts/functions/misc/ValueTypePredRightScalar.dml @@ -21,5 +21,5 @@ X = rand(rows=10, cols=10); -Y = ppred(X, $1, "<"); +Y = (X < $1); write(Y, $2); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusLeft.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusLeft.dml b/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusLeft.dml index 6c7b61e..50a1cf1 100644 --- a/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusLeft.dml +++ b/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusLeft.dml @@ -25,6 +25,6 @@ W = read($1); U = read($2); V = read($3); -R = t(t(U) %*% (ppred(W,0,"!=")*(U%*%t(V)-W))); +R = t(t(U) %*% ((W != 0)*(U%*%t(V)-W))); write(R, $4); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusRight.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusRight.dml b/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusRight.dml index b9b86fc..2fe105c 100644 --- a/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusRight.dml +++ b/src/test/scripts/functions/quaternary/WeightedDivMMMultMinusRight.dml @@ -25,6 +25,6 @@ W = read($1); U = read($2); V = read($3); -R = (ppred(W,0,"!=")*(U%*%t(V)-W)) %*% V; +R = ((W != 0)*(U%*%t(V)-W)) %*% V; write(R, $4); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/quaternary/WeightedSquaredLossPostNz.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/quaternary/WeightedSquaredLossPostNz.dml b/src/test/scripts/functions/quaternary/WeightedSquaredLossPostNz.dml index 5aa9c1c..b6c1f1a 100644 --- a/src/test/scripts/functions/quaternary/WeightedSquaredLossPostNz.dml +++ b/src/test/scripts/functions/quaternary/WeightedSquaredLossPostNz.dml @@ -25,7 +25,7 @@ X = read($1); U = read($2); V = read($3); -sl = sum( ppred(X,0,"!=") * (X - U %*% t(V)) ^ 2 ); +sl = sum( (X != 0) * (X - U %*% t(V)) ^ 2 ); R = as.matrix(sl); write(R, $5); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/ternary/CTableRowHist.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/ternary/CTableRowHist.dml b/src/test/scripts/functions/ternary/CTableRowHist.dml index ed34eef..e12fbef 100644 --- a/src/test/scripts/functions/ternary/CTableRowHist.dml +++ b/src/test/scripts/functions/ternary/CTableRowHist.dml @@ -22,7 +22,7 @@ A = read($1, format="text"); -IA = ppred (A, 0, "!=") * seq (1, nrow (A), 1); +IA = (A != 0) * seq (1, nrow (A), 1); IA = matrix (IA, rows = (nrow (A) * ncol(A)), cols = 1, byrow = FALSE); VA = matrix ( A, rows = (nrow (A) * ncol(A)), cols = 1, byrow = FALSE); IA = removeEmpty (target = IA, margin = "rows"); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/unary/matrix/SelPos.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/unary/matrix/SelPos.dml b/src/test/scripts/functions/unary/matrix/SelPos.dml index 655b685..8e14b47 100644 --- a/src/test/scripts/functions/unary/matrix/SelPos.dml +++ b/src/test/scripts/functions/unary/matrix/SelPos.dml @@ -22,5 +22,5 @@ A = read($1); -B = A*ppred(A,0,">"); +B = A*(A > 0); write(B, $2); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test/scripts/functions/unary/matrix/Sign2.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/unary/matrix/Sign2.dml b/src/test/scripts/functions/unary/matrix/Sign2.dml index 40ed84c..43ccdbd 100644 --- a/src/test/scripts/functions/unary/matrix/Sign2.dml +++ b/src/test/scripts/functions/unary/matrix/Sign2.dml @@ -22,5 +22,5 @@ A = read($1); -B = ppred(A, 0, ">") - ppred(A, 0, "<"); +B = (A > 0) - (A < 0); write(B, $2); http://git-wip-us.apache.org/repos/asf/systemml/blob/d30e1888/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java index 516dc7b..558c77a 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java @@ -34,9 +34,9 @@ import org.junit.runners.Suite; FullMatrixMultiplicationUltraSparseTest.class, FullMinMaxComparisonTest.class, FullPowerTest.class, - FullPPredMatrixTest.class, - FullPPredScalarLeftTest.class, - FullPPredScalarRightTest.class, + FullLogicalMatrixTest.class, + FullLogicalScalarLeftTest.class, + FullLogicalScalarRightTest.class, MatrixMultShortLhsTest.class, })
