From 60c80c156970898460bf97c963d15615dd690696 Mon Sep 17 00:00:00 2001 From: Tommy YU Date: Wed, 3 Feb 2016 10:56:24 +0800 Subject: [PATCH 1/3] fix spark-13153 --- python/pyspark/ml/wrapper.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/pyspark/ml/wrapper.py b/python/pyspark/ml/wrapper.py index d4d48eb2150e..f8feaa1dfa2b 100644 --- a/python/pyspark/ml/wrapper.py +++ b/python/pyspark/ml/wrapper.py @@ -79,8 +79,9 @@ def _transfer_params_from_java(self): for param in self.params: if self._java_obj.hasParam(param.name): java_param = self._java_obj.getParam(param.name) - value = _java2py(sc, self._java_obj.getOrDefault(java_param)) - self._paramMap[param] = value + if self._java_obj.isDefined(java_param): + value = _java2py(sc, self._java_obj.getOrDefault(java_param)) + self._paramMap[param] = value @staticmethod def _empty_java_param_map(): From 1af96375906f46dc847f2ae4887c2c6462b51596 Mon Sep 17 00:00:00 2001 From: Tommy YU Date: Wed, 3 Feb 2016 11:08:03 +0800 Subject: [PATCH 2/3] replace isDefined with hasDefault --- python/pyspark/ml/wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyspark/ml/wrapper.py b/python/pyspark/ml/wrapper.py index f8feaa1dfa2b..6e80cfa704df 100644 --- a/python/pyspark/ml/wrapper.py +++ b/python/pyspark/ml/wrapper.py @@ -79,7 +79,7 @@ def _transfer_params_from_java(self): for param in self.params: if self._java_obj.hasParam(param.name): java_param = self._java_obj.getParam(param.name) - if self._java_obj.isDefined(java_param): + if self._java_obj.hasDefault(java_param): value = _java2py(sc, self._java_obj.getOrDefault(java_param)) self._paramMap[param] = value From 06e06f701886916f4710079962e6deae081dc872 Mon Sep 17 00:00:00 2001 From: Tommy YU Date: Wed, 3 Feb 2016 12:51:08 +0800 Subject: [PATCH 3/3] reserve to isDefined --- python/pyspark/ml/wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyspark/ml/wrapper.py b/python/pyspark/ml/wrapper.py index 6e80cfa704df..f8feaa1dfa2b 100644 --- a/python/pyspark/ml/wrapper.py +++ b/python/pyspark/ml/wrapper.py @@ -79,7 +79,7 @@ def _transfer_params_from_java(self): for param in self.params: if self._java_obj.hasParam(param.name): java_param = self._java_obj.getParam(param.name) - if self._java_obj.hasDefault(java_param): + if self._java_obj.isDefined(java_param): value = _java2py(sc, self._java_obj.getOrDefault(java_param)) self._paramMap[param] = value