Skip to content
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

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot] #541

Merged
merged 1 commit into from
Jan 2, 2024
+21 −8
Merged

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot] #541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 21 additions & 8 deletions python/tests/test_logistic_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,13 +1132,17 @@ def test_compat_one_label(
)

if label < 0:
msg = f"Labels MUST be in [0, 2147483647), but got {label}"
spark_v34_msg = f"Labels MUST be in [0, 2147483647), but got {label}"
spark_v33_msg = (
f"Classification labels should be in [0 to -1]. Found 4 invalid labels."
)

try:
blor_model = blor.fit(bdf)
assert False, "There should be a java exception"
except Py4JJavaError as e:
assert msg in e.java_exception.getMessage()
java_msg = e.java_exception.getMessage()
assert spark_v34_msg in java_msg or spark_v33_msg in java_msg

return

Expand Down Expand Up @@ -1225,7 +1229,9 @@ def test_compat_wrong_label(
feature_cols = ["c0", "c1"]
schema = ["c0 float, c1 float, label float"]

def test_functor(y: np.ndarray, err_msg: str) -> None:
def test_functor(
y: np.ndarray, err_msg_spark_v34: str, err_msg_spark_v33: str
) -> None:
with CleanSparkSession() as spark:
np_array = np.concatenate((X, y.reshape(num_rows, 1)), axis=1)

Expand All @@ -1244,16 +1250,23 @@ def test_functor(y: np.ndarray, err_msg: str) -> None:
lr.fit(df)
assert False, "There should be a java exception"
except Py4JJavaError as e:
assert err_msg in e.java_exception.getMessage()
java_msg = e.java_exception.getMessage()
assert err_msg_spark_v34 in java_msg or err_msg_spark_v33 in java_msg

# negative label
wrong_label = -1.1
y = np.array([1.0, 0.0, wrong_label, 2.0])
msg = f"Labels MUST be in [0, 2147483647), but got {wrong_label}"
test_functor(y, msg)
spark_v34_msg = f"Labels MUST be in [0, 2147483647), but got {wrong_label}"
spark_v33_msg = (
f"Classification labels should be in [0 to 2]. Found 1 invalid labels."
)
test_functor(y, spark_v34_msg, spark_v33_msg)

# non-integer label
wrong_label = 0.4
y = np.array([1.0, 0.0, wrong_label, 2.0])
msg = f"Labels MUST be Integers, but got {wrong_label}"
test_functor(y, msg)
spark_v34_msg = f"Labels MUST be Integers, but got {wrong_label}"
spark_v33_msg = (
f"Classification labels should be in [0 to 2]. Found 1 invalid labels."
)
test_functor(y, spark_v34_msg, spark_v33_msg)
Loading