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

[SPARK-50064][PYTHON][TESTS] Make pysaprk-ml-connect tests passing without optional dependencies #48587

Closed
wants to merge 1 commit into from
Closed

[SPARK-50064][PYTHON][TESTS] Make pysaprk-ml-connect tests passing without optional dependencies #48587

Show file tree
Hide file tree
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
25 changes: 12 additions & 13 deletions python/pyspark/ml/tests/connect/test_connect_evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,18 @@
if should_test_connect:
from pyspark.ml.tests.connect.test_legacy_mode_evaluation import EvaluationTestsMixin


@unittest.skipIf(
not should_test_connect or not have_torcheval,
connect_requirement_message or "torcheval is required",
)
class EvaluationTestsOnConnect(EvaluationTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
).getOrCreate()

def tearDown(self) -> None:
self.spark.stop()
@unittest.skipIf(
not should_test_connect or not have_torcheval,
connect_requirement_message or "torcheval is required",
)
class EvaluationTestsOnConnect(EvaluationTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
).getOrCreate()

def tearDown(self) -> None:
self.spark.stop()


if __name__ == "__main__":
Expand Down
25 changes: 12 additions & 13 deletions python/pyspark/ml/tests/connect/test_connect_feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,18 @@
if should_test_connect:
from pyspark.ml.tests.connect.test_legacy_mode_feature import FeatureTestsMixin


@unittest.skipIf(
not should_test_connect or not have_sklearn,
connect_requirement_message or sklearn_requirement_message,
)
class FeatureTestsOnConnect(FeatureTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
).getOrCreate()

def tearDown(self) -> None:
self.spark.stop()
@unittest.skipIf(
not should_test_connect or not have_sklearn,
connect_requirement_message or sklearn_requirement_message,
)
class FeatureTestsOnConnect(FeatureTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
).getOrCreate()

def tearDown(self) -> None:
self.spark.stop()


if __name__ == "__main__":
Expand Down
37 changes: 19 additions & 18 deletions python/pyspark/ml/tests/connect/test_connect_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
from pyspark.sql import SparkSession
from pyspark.testing.connectutils import should_test_connect, connect_requirement_message

if should_test_connect:
from pyspark.ml.tests.connect.test_legacy_mode_pipeline import PipelineTestsMixin

torch_requirement_message = None
have_torch = True
try:
Expand All @@ -33,23 +30,27 @@
have_torch = False
torch_requirement_message = "torch is required"

if should_test_connect:
from pyspark.ml.tests.connect.test_legacy_mode_pipeline import PipelineTestsMixin

@unittest.skipIf(
not should_test_connect or not have_torch or is_remote_only(),
connect_requirement_message
or torch_requirement_message
or "Requires PySpark core library in Spark Connect server",
)
class PipelineTestsOnConnect(PipelineTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = (
SparkSession.builder.remote(os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]"))
.config("spark.sql.artifact.copyFromLocalToFs.allowDestLocal", "true")
.getOrCreate()
)
@unittest.skipIf(
not should_test_connect or not have_torch or is_remote_only(),
connect_requirement_message
or torch_requirement_message
or "Requires PySpark core library in Spark Connect server",
)
class PipelineTestsOnConnect(PipelineTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = (
SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
)
.config("spark.sql.artifact.copyFromLocalToFs.allowDestLocal", "true")
.getOrCreate()
)

def tearDown(self) -> None:
self.spark.stop()
def tearDown(self) -> None:
self.spark.stop()


if __name__ == "__main__":
Expand Down
19 changes: 9 additions & 10 deletions python/pyspark/ml/tests/connect/test_connect_summarizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,15 @@
if should_test_connect:
from pyspark.ml.tests.connect.test_legacy_mode_summarizer import SummarizerTestsMixin


@unittest.skipIf(not should_test_connect, connect_requirement_message)
class SummarizerTestsOnConnect(SummarizerTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
).getOrCreate()

def tearDown(self) -> None:
self.spark.stop()
@unittest.skipIf(not should_test_connect, connect_requirement_message)
class SummarizerTestsOnConnect(SummarizerTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
).getOrCreate()

def tearDown(self) -> None:
self.spark.stop()


if __name__ == "__main__":
Expand Down
31 changes: 16 additions & 15 deletions python/pyspark/ml/tests/connect/test_connect_tuning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,22 @@
if should_test_connect:
from pyspark.ml.tests.connect.test_legacy_mode_tuning import CrossValidatorTestsMixin


@unittest.skipIf(
not should_test_connect or is_remote_only(),
connect_requirement_message or "Requires PySpark core library in Spark Connect server",
)
class CrossValidatorTestsOnConnect(CrossValidatorTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = (
SparkSession.builder.remote(os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]"))
.config("spark.sql.artifact.copyFromLocalToFs.allowDestLocal", "true")
.getOrCreate()
)

def tearDown(self) -> None:
self.spark.stop()
@unittest.skipIf(
not should_test_connect or is_remote_only(),
connect_requirement_message or "Requires PySpark core library in Spark Connect server",
)
class CrossValidatorTestsOnConnect(CrossValidatorTestsMixin, unittest.TestCase):
def setUp(self) -> None:
self.spark = (
SparkSession.builder.remote(
os.environ.get("SPARK_CONNECT_TESTING_REMOTE", "local[2]")
)
.config("spark.sql.artifact.copyFromLocalToFs.allowDestLocal", "true")
.getOrCreate()
)

def tearDown(self) -> None:
self.spark.stop()


if __name__ == "__main__":
Expand Down