You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "WeichenXu123 (via GitHub)" <gi...@apache.org> on 2023/09/12 08:55:59 UTC
[GitHub] [spark] WeichenXu123 opened a new pull request, #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
WeichenXu123 opened a new pull request, #42887:
URL: https://github.com/apache/spark/pull/42887
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Currently, to avoid data copy, Spark connect ML model directly changes input pandas dataframe for appending prediction columns. But we can use `pandas_df.copy(deep=False)` to shallow copy it and then append prediction columns in copied dataframe. This is easier for user to use it.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
This makes `pyspark.ml.connect` model `transform` method has more similar behavior with `pyspark.ml` model, i.e., the input dataframe is intact after `transform` is called. Otherwise user might be surprise at the new behavior and have to change more code to migrate their workload to `pyspark.ml.connect`
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
Yes.
Previous behavior:
In `pyspark.ml.connect`, `model.transform` will append new columns into input pandas dataframe, and return input dataframe object.
Changed behavior:
In `pyspark.ml.connect`, `model.transform` will shallow copy input pandas dataframe and append new columns into shallow copied pandas dataframe, then return copied pandas dataframe.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Unit tests.
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1324374674
##########
python/pyspark/ml/tests/connect/test_legacy_mode_pipeline.py:
##########
@@ -19,6 +19,7 @@
import tempfile
import unittest
import numpy as np
+import pandas as pd
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zhengruifeng closed pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng closed pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
URL: https://github.com/apache/spark/pull/42887
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] WeichenXu123 commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "WeichenXu123 (via GitHub)" <gi...@apache.org>.
WeichenXu123 commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1324472720
##########
python/pyspark/ml/tests/connect/test_legacy_mode_classification.py:
##########
@@ -19,6 +19,7 @@
import tempfile
import unittest
import numpy as np
+import pandas as pd
Review Comment:
isn't pandas always installed in CI image ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] harupy commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "harupy (via GitHub)" <gi...@apache.org>.
harupy commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1322874168
##########
python/pyspark/ml/tests/connect/test_legacy_mode_feature.py:
##########
@@ -57,7 +57,10 @@ def test_max_abs_scaler(self):
local_df1 = df1.toPandas()
local_fit_model = scaler.fit(local_df1)
+ input_cols = local_df1.columns.tolist()
local_transform_result = local_fit_model.transform(local_df1)
+ assert local_df1.columns.tolist() == input_cols, \
+ "pandas dataframe input columns should be intact."
Review Comment:
Can we compare dataframes to ensure both columns and data remain unchanged?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] harupy commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "harupy (via GitHub)" <gi...@apache.org>.
harupy commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1323909735
##########
python/pyspark/ml/tests/connect/test_legacy_mode_feature.py:
##########
@@ -57,8 +58,10 @@ def test_max_abs_scaler(self):
local_df1 = df1.toPandas()
local_fit_model = scaler.fit(local_df1)
+ local_df1_copy = local_df1.copy()
local_transform_result = local_fit_model.transform(local_df1)
- assert id(local_transform_result) == id(local_df1)
+ # assert that pandas dataframe input columns should be intact.
Review Comment:
```suggestion
# assert that `transform` doesn't mutate the input dataframe.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] harupy commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "harupy (via GitHub)" <gi...@apache.org>.
harupy commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1322874168
##########
python/pyspark/ml/tests/connect/test_legacy_mode_feature.py:
##########
@@ -57,7 +57,10 @@ def test_max_abs_scaler(self):
local_df1 = df1.toPandas()
local_fit_model = scaler.fit(local_df1)
+ input_cols = local_df1.columns.tolist()
local_transform_result = local_fit_model.transform(local_df1)
+ assert local_df1.columns.tolist() == input_cols, \
+ "pandas dataframe input columns should be intact."
Review Comment:
Can we compare dataframes to ensure nothing has changed?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] harupy commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "harupy (via GitHub)" <gi...@apache.org>.
harupy commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1324276184
##########
python/pyspark/ml/connect/base.py:
##########
@@ -154,8 +154,9 @@ def transform(
The dataset can be either pandas dataframe or spark dataframe,
if it is a spark DataFrame, the result of transformation is a new spark DataFrame
that contains all existing columns and output columns with names.
- if it is a pandas DataFrame, the input pandas dataframe is appended with output
- columns in place.
+ if it is a pandas DataFrame, the input pandas dataframe is intact, and the output
+ dataframe shallow copies all existing columns from input dataframe and appends
+ output columns.
Review Comment:
```suggestion
If it is a pandas DataFrame, the result of transformation is a shallow copy
of the input pandas dataframe with output columns with names.
```
to be consistent?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] harupy commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "harupy (via GitHub)" <gi...@apache.org>.
harupy commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1323889419
##########
python/pyspark/ml/tests/connect/test_legacy_mode_feature.py:
##########
@@ -57,8 +58,10 @@ def test_max_abs_scaler(self):
local_df1 = df1.toPandas()
local_fit_model = scaler.fit(local_df1)
+ local_df1_copy = local_df1.copy()
local_transform_result = local_fit_model.transform(local_df1)
- assert id(local_transform_result) == id(local_df1)
+ # assert that pandas dataframe input columns should be intact.
+ pd.testing.assert_frame_equal(local_df1, local_df1_copy, check_type=False)
Review Comment:
why do we need `check_type`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] harupy commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "harupy (via GitHub)" <gi...@apache.org>.
harupy commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1322872817
##########
python/pyspark/ml/tests/connect/test_legacy_mode_feature.py:
##########
@@ -57,7 +57,10 @@ def test_max_abs_scaler(self):
local_df1 = df1.toPandas()
local_fit_model = scaler.fit(local_df1)
+ input_cols = local_df1.columns.tolist()
local_transform_result = local_fit_model.transform(local_df1)
+ assert local_df1.columns.tolist() == input_cols, \
+ "pandas dataframe input columns should be intact."
Review Comment:
```suggestion
input_cols = local_df1.columns.copy()
local_transform_result = local_fit_model.transform(local_df1)
assert local_df1.columns.equals(input_cols), \
"pandas dataframe input columns should be intact."
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] harupy commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "harupy (via GitHub)" <gi...@apache.org>.
harupy commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1323889419
##########
python/pyspark/ml/tests/connect/test_legacy_mode_feature.py:
##########
@@ -57,8 +58,10 @@ def test_max_abs_scaler(self):
local_df1 = df1.toPandas()
local_fit_model = scaler.fit(local_df1)
+ local_df1_copy = local_df1.copy()
local_transform_result = local_fit_model.transform(local_df1)
- assert id(local_transform_result) == id(local_df1)
+ # assert that pandas dataframe input columns should be intact.
+ pd.testing.assert_frame_equal(local_df1, local_df1_copy, check_type=False)
Review Comment:
why do we need `check_type`? `check_type=False` sounds like the data types can be changed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zhengruifeng commented on pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng commented on PR #42887:
URL: https://github.com/apache/spark/pull/42887#issuecomment-1722755173
merged to master
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #42887:
URL: https://github.com/apache/spark/pull/42887#discussion_r1324374381
##########
python/pyspark/ml/tests/connect/test_legacy_mode_classification.py:
##########
@@ -19,6 +19,7 @@
import tempfile
import unittest
import numpy as np
+import pandas as pd
Review Comment:
can you import this within `test_binary_classes_logistic_regression` or under `should_test_connect` so the tests can be skipped fine when `pandas` is not installed?
##########
python/pyspark/ml/tests/connect/test_legacy_mode_feature.py:
##########
@@ -19,6 +19,7 @@
import os
import pickle
import numpy as np
+import pandas as pd
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on pull request #42887: [SPARK-45130][CONNECT][ML][PYTHON] Avoid Spark connect ML model to change input pandas dataframe
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #42887:
URL: https://github.com/apache/spark/pull/42887#issuecomment-1716866742
https://github.com/WeichenXu123/spark/runs/16710260795
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org