Skip to content

[SPARK-32092][ML][PySpark][3.0] Removed foldCol related code #29524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-32092][ML][PySpark][3.0] Removed foldCol related code #29524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17f99d4
Removed foldCol related code
Aug 23, 2020
989650d
Fixed copy() to copy models instead of list
Aug 23, 2020
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
11 changes: 4 additions & 7 deletions python/pyspark/ml/tests/test_tuning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ def test_copy(self):
lambda x: x.getEstimator().uid,
# SPARK-32092: CrossValidator.copy() needs to copy all existing params
lambda x: x.getNumFolds(),
lambda x: x.getFoldCol(),
lambda x: x.getCollectSubModels(),
lambda x: x.getParallelism(),
lambda x: x.getSeed()
Expand All @@ -116,7 +115,6 @@ def test_copy(self):
# SPARK-32092: CrossValidatorModel.copy() needs to copy all existing params
for param in [
lambda x: x.getNumFolds(),
lambda x: x.getFoldCol(),
lambda x: x.getSeed()
]:
self.assertEqual(param(cvModel), param(cvModelCopied))
Expand All @@ -127,9 +125,9 @@ def test_copy(self):
'foo',
"Changing the original avgMetrics should not affect the copied model"
)
cvModel.subModels[0] = 'foo'
cvModel.subModels[0][0].getInducedError = lambda: 'foo'
self.assertNotEqual(
cvModelCopied.subModels[0],
cvModelCopied.subModels[0][0].getInducedError(),
'foo',
"Changing the original subModels should not affect the copied model"
)
Expand Down Expand Up @@ -224,7 +222,6 @@ def test_save_load_trained_model(self):
loadedCvModel = CrossValidatorModel.load(cvModelPath)
for param in [
lambda x: x.getNumFolds(),
lambda x: x.getFoldCol(),
lambda x: x.getSeed(),
lambda x: len(x.subModels)
]:
Expand Down Expand Up @@ -780,9 +777,9 @@ def test_copy(self):
'foo',
"Changing the original validationMetrics should not affect the copied model"
)
tvsModel.subModels[0] = 'foo'
tvsModel.subModels[0].getInducedError = lambda: 'foo'
self.assertNotEqual(
tvsModelCopied.subModels[0],
tvsModelCopied.subModels[0].getInducedError(),
'foo',
"Changing the original subModels should not affect the copied model"
)
Expand Down
7 changes: 4 additions & 3 deletions python/pyspark/ml/tuning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,10 @@ def copy(self, extra=None):
extra = dict()
bestModel = self.bestModel.copy(extra)
avgMetrics = list(self.avgMetrics)
subModels = [model.copy() for model in self.subModels]
subModels = [
[sub_model.copy() for sub_model in fold_sub_models]
for fold_sub_models in self.subModels
]
return self._copyValues(CrossValidatorModel(bestModel, avgMetrics, subModels), extra=extra)

@since("2.3.0")
Expand Down Expand Up @@ -511,7 +514,6 @@ def _from_java(cls, java_stage):
"estimator": estimator,
"estimatorParamMaps": epms,
"numFolds": java_stage.getNumFolds(),
"foldCol": java_stage.getFoldCol(),
"seed": java_stage.getSeed(),
}
for param_name, param_val in params.items():
Expand Down Expand Up @@ -544,7 +546,6 @@ def _to_java(self):
"estimator": estimator,
"estimatorParamMaps": epms,
"numFolds": self.getNumFolds(),
"foldCol": self.getFoldCol(),
"seed": self.getSeed(),
}
for param_name, param_val in params.items():
Expand Down