Repository: systemml Updated Branches: refs/heads/master 2e6b577c5 -> 60d20c2b7
[SYSTEMML-1896] Update python tests to use getOrCreate Closes #657. Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/60d20c2b Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/60d20c2b Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/60d20c2b Branch: refs/heads/master Commit: 60d20c2b7720feba05009f1f2ca5169e50059b98 Parents: 2e6b577 Author: Glenn Weidner <[email protected]> Authored: Sat Sep 16 15:05:24 2017 -0700 Committer: Glenn Weidner <[email protected]> Committed: Sat Sep 16 15:05:24 2017 -0700 ---------------------------------------------------------------------- src/main/python/tests/test_matrix_agg_fn.py | 2 +- src/main/python/tests/test_matrix_binary_op.py | 2 +- src/main/python/tests/test_mlcontext.py | 2 +- src/main/python/tests/test_mllearn_df.py | 2 -- src/main/python/tests/test_mllearn_numpy.py | 3 --- 5 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/60d20c2b/src/main/python/tests/test_matrix_agg_fn.py ---------------------------------------------------------------------- diff --git a/src/main/python/tests/test_matrix_agg_fn.py b/src/main/python/tests/test_matrix_agg_fn.py index be3df14..8ff026d 100644 --- a/src/main/python/tests/test_matrix_agg_fn.py +++ b/src/main/python/tests/test_matrix_agg_fn.py @@ -34,7 +34,7 @@ import systemml as sml import numpy as np from scipy.stats import kurtosis, skew, moment from pyspark.context import SparkContext -sc = SparkContext() +sc = SparkContext.getOrCreate() dim = 5 m1 = np.array(np.random.randint(100, size=dim*dim) + 1.01, dtype=np.double) http://git-wip-us.apache.org/repos/asf/systemml/blob/60d20c2b/src/main/python/tests/test_matrix_binary_op.py ---------------------------------------------------------------------- diff --git a/src/main/python/tests/test_matrix_binary_op.py b/src/main/python/tests/test_matrix_binary_op.py index 6bba3e9..db5f736 100644 --- a/src/main/python/tests/test_matrix_binary_op.py +++ b/src/main/python/tests/test_matrix_binary_op.py @@ -33,7 +33,7 @@ import unittest import systemml as sml import numpy as np from pyspark.context import SparkContext -sc = SparkContext() +sc = SparkContext.getOrCreate() dim = 5 m1 = np.array(np.random.randint(100, size=dim*dim) + 1.01, dtype=np.double) http://git-wip-us.apache.org/repos/asf/systemml/blob/60d20c2b/src/main/python/tests/test_mlcontext.py ---------------------------------------------------------------------- diff --git a/src/main/python/tests/test_mlcontext.py b/src/main/python/tests/test_mlcontext.py index 9ba3790..e0db346 100644 --- a/src/main/python/tests/test_mlcontext.py +++ b/src/main/python/tests/test_mlcontext.py @@ -36,7 +36,7 @@ from pyspark.context import SparkContext from systemml import MLContext, dml, pydml -sc = SparkContext() +sc = SparkContext.getOrCreate() ml = MLContext(sc) class TestAPI(unittest.TestCase): http://git-wip-us.apache.org/repos/asf/systemml/blob/60d20c2b/src/main/python/tests/test_mllearn_df.py ---------------------------------------------------------------------- diff --git a/src/main/python/tests/test_mllearn_df.py b/src/main/python/tests/test_mllearn_df.py index d949f4e..c2f8a3e 100644 --- a/src/main/python/tests/test_mllearn_df.py +++ b/src/main/python/tests/test_mllearn_df.py @@ -33,7 +33,6 @@ sys.path.insert(0, path) import unittest import numpy as np -from pyspark.context import SparkContext from pyspark.ml import Pipeline from pyspark.ml.feature import HashingTF, Tokenizer from pyspark.sql import SparkSession @@ -44,7 +43,6 @@ from sklearn import linear_model from sklearn.metrics import accuracy_score, r2_score from systemml.mllearn import LinearRegression, LogisticRegression, NaiveBayes, SVM -sc = SparkContext() sparkSession = SparkSession.builder.getOrCreate() # Currently not integrated with JUnit test http://git-wip-us.apache.org/repos/asf/systemml/blob/60d20c2b/src/main/python/tests/test_mllearn_numpy.py ---------------------------------------------------------------------- diff --git a/src/main/python/tests/test_mllearn_numpy.py b/src/main/python/tests/test_mllearn_numpy.py index 2a1bc3c..884dd36 100644 --- a/src/main/python/tests/test_mllearn_numpy.py +++ b/src/main/python/tests/test_mllearn_numpy.py @@ -33,7 +33,6 @@ sys.path.insert(0, path) import unittest import numpy as np -from pyspark.context import SparkContext from pyspark.ml import Pipeline from pyspark.ml.feature import HashingTF, Tokenizer from pyspark.sql import SparkSession @@ -44,9 +43,7 @@ from sklearn.metrics import accuracy_score, r2_score from systemml.mllearn import LinearRegression, LogisticRegression, NaiveBayes, SVM from sklearn import linear_model -sc = SparkContext() sparkSession = SparkSession.builder.getOrCreate() -import os def writeColVector(X, fileName): fileName = os.path.join(os.getcwd(), fileName)
