Github user BryanCutler commented on a diff in the pull request:
https://github.com/apache/spark/pull/23200#discussion_r238454041
--- Diff: python/pyspark/mllib/tests/test_linalg.py ---
@@ -22,33 +22,18 @@
from numpy import array, array_equal, zeros, arange, tile, ones, inf
import pyspark.ml.linalg as newlinalg
+from pyspark.serializers import PickleSerializer
from pyspark.mllib.linalg import Vector, SparseVector, DenseVector,
VectorUDT, _convert_to_vector, \
DenseMatrix, SparseMatrix, Vectors, Matrices, MatrixUDT
from pyspark.mllib.regression import LabeledPoint
-from pyspark.testing.mllibutils import make_serializer, MLlibTestCase
-
-_have_scipy = False
-try:
- import scipy.sparse
- _have_scipy = True
-except:
- # No SciPy, but that's okay, we'll skip those tests
- pass
-
-
-ser = make_serializer()
-
-
-def _squared_distance(a, b):
- if isinstance(a, Vector):
- return a.squared_distance(b)
- else:
- return b.squared_distance(a)
+from pyspark.testing.mllibutils import MLlibTestCase
+from pyspark.testing.utils import have_scipy
--- End diff --
Oh that's good, didn't realize have_scipy was there
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
