aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorTor Myklebust <tmyklebu@gmail.com>2013-12-19 01:29:51 -0500
committerTor Myklebust <tmyklebu@gmail.com>2013-12-19 01:29:51 -0500
commitbf491bb3c0a9008caa4ac112672a4760b3d1c7b8 (patch)
treede0b56f6ab37714d35548af0229de143a3970618 /python
parent95915f8b3b6d07a9dddb09a637aa23c8622bff9b (diff)
downloadspark-bf491bb3c0a9008caa4ac112672a4760b3d1c7b8.tar.gz
spark-bf491bb3c0a9008caa4ac112672a4760b3d1c7b8.tar.bz2
spark-bf491bb3c0a9008caa4ac112672a4760b3d1c7b8.zip
The rest of the Python side of those bindings.
Diffstat (limited to 'python')
-rw-r--r--python/pyspark/__init__.py3
-rw-r--r--python/pyspark/java_gateway.py1
-rw-r--r--python/pyspark/serializers.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/python/pyspark/__init__.py b/python/pyspark/__init__.py
index 1f35f6f939..949406c57b 100644
--- a/python/pyspark/__init__.py
+++ b/python/pyspark/__init__.py
@@ -42,6 +42,7 @@ from pyspark.context import SparkContext
from pyspark.rdd import RDD
from pyspark.files import SparkFiles
from pyspark.storagelevel import StorageLevel
+from pyspark.mllib import train_linear_regression_model
-__all__ = ["SparkContext", "RDD", "SparkFiles", "StorageLevel"]
+__all__ = ["SparkContext", "RDD", "SparkFiles", "StorageLevel", "train_linear_regression_model"]
diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py
index e615c1e9b6..2941984e19 100644
--- a/python/pyspark/java_gateway.py
+++ b/python/pyspark/java_gateway.py
@@ -62,5 +62,6 @@ def launch_gateway():
# Import the classes used by PySpark
java_import(gateway.jvm, "org.apache.spark.api.java.*")
java_import(gateway.jvm, "org.apache.spark.api.python.*")
+ java_import(gateway.jvm, "org.apache.spark.mllib.api.*")
java_import(gateway.jvm, "scala.Tuple2")
return gateway
diff --git a/python/pyspark/serializers.py b/python/pyspark/serializers.py
index 811fa6f018..2a500ab919 100644
--- a/python/pyspark/serializers.py
+++ b/python/pyspark/serializers.py
@@ -308,4 +308,4 @@ def write_int(value, stream):
def write_with_length(obj, stream):
write_int(len(obj), stream)
- stream.write(obj) \ No newline at end of file
+ stream.write(obj)