diff options
| author | Xiangrui Meng <meng@databricks.com> | 2015-07-30 16:57:38 -0700 |
|---|---|---|
| committer | Xiangrui Meng <meng@databricks.com> | 2015-07-30 16:57:38 -0700 |
| commit | ca71cc8c8b2d64b7756ae697c06876cd18b536dc (patch) | |
| tree | 8ba20cf207e0ac38f4b4a0f6a1596c6d401663e4 | |
| parent | 1afdeb7b458f86e2641f062fb9ddc00e9c5c7531 (diff) | |
| download | spark-ca71cc8c8b2d64b7756ae697c06876cd18b536dc.tar.gz spark-ca71cc8c8b2d64b7756ae697c06876cd18b536dc.tar.bz2 spark-ca71cc8c8b2d64b7756ae697c06876cd18b536dc.zip | |
[SPARK-9408] [PYSPARK] [MLLIB] Refactor linalg.py to /linalg
This is based on MechCoder 's PR https://github.com/apache/spark/pull/7731. Hopefully it could pass tests. MechCoder I tried to make minimal changes. If this passes Jenkins, we can merge this one first and then try to move `__init__.py` to `local.py` in a separate PR.
Closes #7731
Author: Xiangrui Meng <meng@databricks.com>
Closes #7746 from mengxr/SPARK-9408 and squashes the following commits:
0e05a3b [Xiangrui Meng] merge master
1135551 [Xiangrui Meng] add a comment for str(...)
c48cae0 [Xiangrui Meng] update tests
173a805 [Xiangrui Meng] move linalg.py to linalg/__init__.py
| -rw-r--r-- | dev/sparktestsupport/modules.py | 2 | ||||
| -rw-r--r-- | python/pyspark/mllib/linalg/__init__.py (renamed from python/pyspark/mllib/linalg.py) | 0 | ||||
| -rw-r--r-- | python/pyspark/sql/types.py | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py index 030d982e99..44600cb952 100644 --- a/dev/sparktestsupport/modules.py +++ b/dev/sparktestsupport/modules.py @@ -323,7 +323,7 @@ pyspark_mllib = Module( "pyspark.mllib.evaluation", "pyspark.mllib.feature", "pyspark.mllib.fpm", - "pyspark.mllib.linalg", + "pyspark.mllib.linalg.__init__", "pyspark.mllib.random", "pyspark.mllib.recommendation", "pyspark.mllib.regression", diff --git a/python/pyspark/mllib/linalg.py b/python/pyspark/mllib/linalg/__init__.py index 334dc8e38b..334dc8e38b 100644 --- a/python/pyspark/mllib/linalg.py +++ b/python/pyspark/mllib/linalg/__init__.py diff --git a/python/pyspark/sql/types.py b/python/pyspark/sql/types.py index 0976aea72c..6f74b7162f 100644 --- a/python/pyspark/sql/types.py +++ b/python/pyspark/sql/types.py @@ -648,7 +648,7 @@ class UserDefinedType(DataType): @classmethod def fromJson(cls, json): - pyUDT = str(json["pyClass"]) + pyUDT = str(json["pyClass"]) # convert unicode to str split = pyUDT.rfind(".") pyModule = pyUDT[:split] pyClass = pyUDT[split+1:] |