You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2020/04/21 20:30:47 UTC
[systemml] 01/02: [MINOR] Removal of remaining pydml test files and
tests
This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemml.git
commit 0426099b80fb451239e7d9a39bdacf752c79c80e
Author: Matthias Boehm <mb...@gmail.com>
AuthorDate: Tue Apr 21 21:43:08 2020 +0200
[MINOR] Removal of remaining pydml test files and tests
---
.../test/functions/mlcontext/MLContextTest.java | 59 ----------------------
.../scripts/functions/misc/PackageFunCall1.pydml | 25 ---------
.../scripts/functions/misc/PackageFunCall2.pydml | 26 ----------
.../scripts/functions/misc/PackageFunLib.pydml | 25 ---------
4 files changed, 135 deletions(-)
diff --git a/src/test/java/org/apache/sysds/test/functions/mlcontext/MLContextTest.java b/src/test/java/org/apache/sysds/test/functions/mlcontext/MLContextTest.java
index ce7df49..ac7b3e7 100644
--- a/src/test/java/org/apache/sysds/test/functions/mlcontext/MLContextTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/mlcontext/MLContextTest.java
@@ -1063,22 +1063,6 @@ public class MLContextTest extends MLContextTestBase {
ml.execute(script);
}
- @Test(expected = MLContextException.class)
- public void testJavaRDDBadMetadataPYDML() {
- System.out.println("MLContextTest - JavaRDD<String> bad metadata PYML");
-
- List<String> list = new ArrayList<>();
- list.add("1,2,3");
- list.add("4,5,6");
- list.add("7,8,9");
- JavaRDD<String> javaRDD = sc.parallelize(list);
-
- MatrixMetadata mm = new MatrixMetadata(1, 1, 9);
-
- Script script = dml("print('sum: ' + sum(M))").in("M", javaRDD, mm);
- ml.execute(script);
- }
-
@Test
public void testRDDGoodMetadataDML() {
System.out.println("MLContextTest - RDD<String> good metadata DML");
@@ -1274,28 +1258,6 @@ public class MLContextTest extends MLContextTestBase {
}
@Test
- public void testDataFrameSumPYDMLVectorWithIDColumnNoFormatSpecified() {
- System.out.println("MLContextTest - DataFrame sum PYDML, vector with ID column, no format specified");
-
- List<Tuple2<Double, Vector>> list = new ArrayList<>();
- list.add(new Tuple2<>(1.0, Vectors.dense(1.0, 2.0, 3.0)));
- list.add(new Tuple2<>(2.0, Vectors.dense(4.0, 5.0, 6.0)));
- list.add(new Tuple2<>(3.0, Vectors.dense(7.0, 8.0, 9.0)));
- JavaRDD<Tuple2<Double, Vector>> javaRddTuple = sc.parallelize(list);
-
- JavaRDD<Row> javaRddRow = javaRddTuple.map(new DoubleVectorRow());
- List<StructField> fields = new ArrayList<>();
- fields.add(DataTypes.createStructField(RDDConverterUtils.DF_ID_COLUMN, DataTypes.DoubleType, true));
- fields.add(DataTypes.createStructField("C1", new VectorUDT(), true));
- StructType schema = DataTypes.createStructType(fields);
- Dataset<Row> dataFrame = spark.createDataFrame(javaRddRow, schema);
-
- Script script = dml("print('sum: ' + sum(M))").in("M", dataFrame);
- setExpectedStdOut("sum: 45.0");
- ml.execute(script);
- }
-
- @Test
public void testDataFrameSumDMLVectorWithNoIDColumnNoFormatSpecified() {
System.out.println("MLContextTest - DataFrame sum DML, vector with no ID column, no format specified");
@@ -1317,27 +1279,6 @@ public class MLContextTest extends MLContextTestBase {
}
@Test
- public void testDataFrameSumPYDMLVectorWithNoIDColumnNoFormatSpecified() {
- System.out.println("MLContextTest - DataFrame sum PYDML, vector with no ID column, no format specified");
-
- List<Vector> list = new ArrayList<>();
- list.add(Vectors.dense(1.0, 2.0, 3.0));
- list.add(Vectors.dense(4.0, 5.0, 6.0));
- list.add(Vectors.dense(7.0, 8.0, 9.0));
- JavaRDD<Vector> javaRddVector = sc.parallelize(list);
-
- JavaRDD<Row> javaRddRow = javaRddVector.map(new VectorRow());
- List<StructField> fields = new ArrayList<>();
- fields.add(DataTypes.createStructField("C1", new VectorUDT(), true));
- StructType schema = DataTypes.createStructType(fields);
- Dataset<Row> dataFrame = spark.createDataFrame(javaRddRow, schema);
-
- Script script = dml("print('sum: ' + sum(M))").in("M", dataFrame);
- setExpectedStdOut("sum: 45.0");
- ml.execute(script);
- }
-
- @Test
public void testDisplayBooleanDML() {
System.out.println("MLContextTest - display boolean DML");
String s = "print(b);";
diff --git a/src/test/scripts/functions/misc/PackageFunCall1.pydml b/src/test/scripts/functions/misc/PackageFunCall1.pydml
deleted file mode 100644
index 14707b5..0000000
--- a/src/test/scripts/functions/misc/PackageFunCall1.pydml
+++ /dev/null
@@ -1,25 +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.
-#
-#-------------------------------------------------------------
-
-
-source("PackageFunLib.pydml") as Other
-dummy = Other.hello()
-
diff --git a/src/test/scripts/functions/misc/PackageFunCall2.pydml b/src/test/scripts/functions/misc/PackageFunCall2.pydml
deleted file mode 100644
index f5586a7..0000000
--- a/src/test/scripts/functions/misc/PackageFunCall2.pydml
+++ /dev/null
@@ -1,26 +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.
-#
-#-------------------------------------------------------------
-
-
-setwd(".")
-source("PackageFunLib.pydml") as Other
-dummy = Other.hello()
-
diff --git a/src/test/scripts/functions/misc/PackageFunLib.pydml b/src/test/scripts/functions/misc/PackageFunLib.pydml
deleted file mode 100644
index ad6e9e6..0000000
--- a/src/test/scripts/functions/misc/PackageFunLib.pydml
+++ /dev/null
@@ -1,25 +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.
-#
-#-------------------------------------------------------------
-
-
-def hello():
- print("Hi!")
-