Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/pyspark/mllib/classification.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def train(cls, data, lambda_=1.0):
@param lambda_: The smoothing parameter
"""
sc = data.context
dataBytes = _get_unmangled_labeled_point_rdd(data)
dataBytes = _get_unmangled_labeled_point_rdd(data, cache=False)
ans = sc._jvm.PythonMLLibAPI().trainNaiveBayes(dataBytes._jrdd, lambda_)
return NaiveBayesModel(
_deserialize_double_vector(ans[0]),
Expand Down
2 changes: 1 addition & 1 deletion python/pyspark/mllib/clustering.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
_get_unmangled_rdd, _get_unmangled_double_vector_rdd, _squared_distance, \
_serialize_double_matrix, _deserialize_double_matrix, \
_serialize_double_vector, _deserialize_double_vector, \
_get_initial_weights, _serialize_rating, _regression_train_wrapper
_get_initial_weights, _serialize_rating
from pyspark.mllib.linalg import SparseVector

__all__ = ['KMeansModel', 'KMeans']
Expand Down
8 changes: 4 additions & 4 deletions python/pyspark/mllib/recommendation.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
_get_unmangled_rdd, _get_unmangled_double_vector_rdd, \
_serialize_double_matrix, _deserialize_double_matrix, \
_serialize_double_vector, _deserialize_double_vector, \
_get_initial_weights, _serialize_rating, _regression_train_wrapper, \
_serialize_tuple, RatingDeserializer
_get_initial_weights, _serialize_rating, _serialize_tuple, \
RatingDeserializer
from pyspark.rdd import RDD

__all__ = ['MatrixFactorizationModel', 'ALS']
Expand Down Expand Up @@ -65,15 +65,15 @@ class ALS(object):
@classmethod
def train(cls, ratings, rank, iterations=5, lambda_=0.01, blocks=-1):
sc = ratings.context
ratingBytes = _get_unmangled_rdd(ratings, _serialize_rating)
ratingBytes = _get_unmangled_rdd(ratings, _serialize_rating, cache=False)
mod = sc._jvm.PythonMLLibAPI().trainALSModel(
ratingBytes._jrdd, rank, iterations, lambda_, blocks)
return MatrixFactorizationModel(sc, mod)

@classmethod
def trainImplicit(cls, ratings, rank, iterations=5, lambda_=0.01, blocks=-1, alpha=0.01):
sc = ratings.context
ratingBytes = _get_unmangled_rdd(ratings, _serialize_rating)
ratingBytes = _get_unmangled_rdd(ratings, _serialize_rating, cache=False)
mod = sc._jvm.PythonMLLibAPI().trainImplicitALSModel(
ratingBytes._jrdd, rank, iterations, lambda_, blocks, alpha)
return MatrixFactorizationModel(sc, mod)
Expand Down
6 changes: 2 additions & 4 deletions python/pyspark/mllib/tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,14 @@ def trainClassifier(data, numClasses, categoricalFeaturesInfo,
:return: DecisionTreeModel
"""
sc = data.context
dataBytes = _get_unmangled_labeled_point_rdd(data)
dataBytes = _get_unmangled_labeled_point_rdd(data, cache=False)
categoricalFeaturesInfoJMap = \
MapConverter().convert(categoricalFeaturesInfo,
sc._gateway._gateway_client)
model = sc._jvm.PythonMLLibAPI().trainDecisionTreeModel(
dataBytes._jrdd, "classification",
numClasses, categoricalFeaturesInfoJMap,
impurity, maxDepth, maxBins, minInstancesPerNode, minInfoGain)
dataBytes.unpersist()
return DecisionTreeModel(sc, model)

@staticmethod
Expand All @@ -196,15 +195,14 @@ def trainRegressor(data, categoricalFeaturesInfo,
:return: DecisionTreeModel
"""
sc = data.context
dataBytes = _get_unmangled_labeled_point_rdd(data)
dataBytes = _get_unmangled_labeled_point_rdd(data, cache=False)
categoricalFeaturesInfoJMap = \
MapConverter().convert(categoricalFeaturesInfo,
sc._gateway._gateway_client)
model = sc._jvm.PythonMLLibAPI().trainDecisionTreeModel(
dataBytes._jrdd, "regression",
0, categoricalFeaturesInfoJMap,
impurity, maxDepth, maxBins, minInstancesPerNode, minInfoGain)
dataBytes.unpersist()
return DecisionTreeModel(sc, model)


Expand Down