Skip to content

Commit

Permalink
rename from_ray to fron_ray_dataset
Browse files Browse the repository at this point in the history
  • Loading branch information
Retribution98 committed Feb 29, 2024
1 parent ed29b83 commit 959f94a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions modin/core/execution/dispatching/factories/dispatcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ def from_dataframe(cls, *args, **kwargs):
return cls.get_factory()._from_dataframe(*args, **kwargs)

@classmethod
@_inherit_docstrings(factories.BaseFactory._from_ray)
def from_ray(cls, ray_obj):
return cls.get_factory()._from_ray(ray_obj)
@_inherit_docstrings(factories.BaseFactory._from_ray_dataset)
def from_ray_dataset(cls, ray_obj):
return cls.get_factory()._from_ray_dataset(ray_obj)

Check warning on line 187 in modin/core/execution/dispatching/factories/dispatcher.py

View check run for this annotation

Codecov / codecov/patch

modin/core/execution/dispatching/factories/dispatcher.py#L187

Added line #L187 was not covered by tests

@classmethod
@_inherit_docstrings(factories.BaseFactory._read_parquet)
Expand Down
6 changes: 3 additions & 3 deletions modin/core/execution/dispatching/factories/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ def _from_dataframe(cls, *args, **kwargs):
_doc_io_method_template,
source="a Ray Dataset",
params="ray_obj : ray.data.Dataset",
method="modin.core.execution.ray.implementations.pandas_on_ray.io.PandasOnRayIO.from_ray",
method="modin.core.execution.ray.implementations.pandas_on_ray.io.PandasOnRayIO.from_ray_dataset",
)
def _from_ray(cls, ray_obj):
return cls.io_cls.from_ray(ray_obj)
def _from_ray_dataset(cls, ray_obj):
return cls.io_cls.from_ray_dataset(ray_obj)

Check warning on line 212 in modin/core/execution/dispatching/factories/factories.py

View check run for this annotation

Codecov / codecov/patch

modin/core/execution/dispatching/factories/factories.py#L212

Added line #L212 was not covered by tests

@classmethod
@doc(
Expand Down
2 changes: 1 addition & 1 deletion modin/core/execution/ray/generic/io/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class RayIO(BaseIO):
"""Base class for doing I/O operations over Ray."""

@classmethod
def from_ray(cls, ray_obj):
def from_ray_dataset(cls, ray_obj):

Check warning on line 23 in modin/core/execution/ray/generic/io/io.py

View check run for this annotation

Codecov / codecov/patch

modin/core/execution/ray/generic/io/io.py#L22-L23

Added lines #L22 - L23 were not covered by tests
"""
Create a Modin `query_compiler` from a Ray Dataset.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def func(df, **kw): # pragma: no cover
)

@classmethod
def from_ray(cls, ray_obj):
def from_ray_dataset(cls, ray_obj):

Check warning on line 267 in modin/core/execution/ray/implementations/pandas_on_ray/io/io.py

View check run for this annotation

Codecov / codecov/patch

modin/core/execution/ray/implementations/pandas_on_ray/io/io.py#L266-L267

Added lines #L266 - L267 were not covered by tests
"""
Create a Modin `query_compiler` from a Ray Dataset.
Expand Down
2 changes: 1 addition & 1 deletion modin/core/io/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def from_dataframe(cls, df):
return cls.query_compiler_cls.from_dataframe(df, cls.frame_cls)

@classmethod
def from_ray(cls, ray_obj):
def from_ray_dataset(cls, ray_obj):
"""
Create a Modin `query_compiler` from a Ray Dataset.
Expand Down
6 changes: 3 additions & 3 deletions modin/pandas/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ def from_dataframe(df):
return ModinObjects.DataFrame(query_compiler=FactoryDispatcher.from_dataframe(df))


def from_ray(ray_obj):
def from_ray_dataset(ray_obj):
"""
Convert a Ray Dataset into Modin DataFrame.
Expand All @@ -1054,7 +1054,7 @@ def from_ray(ray_obj):
"""
from modin.core.execution.dispatching.factories.dispatcher import FactoryDispatcher

Check warning on line 1055 in modin/pandas/io.py

View check run for this annotation

Codecov / codecov/patch

modin/pandas/io.py#L1055

Added line #L1055 was not covered by tests

return ModinObjects.DataFrame(query_compiler=FactoryDispatcher.from_ray(ray_obj))
return ModinObjects.DataFrame(query_compiler=FactoryDispatcher.from_ray_dataset(ray_obj))

Check warning on line 1057 in modin/pandas/io.py

View check run for this annotation

Codecov / codecov/patch

modin/pandas/io.py#L1057

Added line #L1057 was not covered by tests


def from_dask(ray_obj):
Expand All @@ -1077,7 +1077,7 @@ def from_dask(ray_obj):
"""
from modin.core.execution.dispatching.factories.dispatcher import FactoryDispatcher

Check warning on line 1078 in modin/pandas/io.py

View check run for this annotation

Codecov / codecov/patch

modin/pandas/io.py#L1078

Added line #L1078 was not covered by tests

return ModinObjects.DataFrame(query_compiler=FactoryDispatcher.from_ray(ray_obj))
return ModinObjects.DataFrame(query_compiler=FactoryDispatcher.from_ray_dataset(ray_obj))

Check warning on line 1080 in modin/pandas/io.py

View check run for this annotation

Codecov / codecov/patch

modin/pandas/io.py#L1080

Added line #L1080 was not covered by tests


def to_pandas(modin_obj: SupportsPublicToPandas) -> Any:
Expand Down
6 changes: 3 additions & 3 deletions modin/pandas/test/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
TestReadFromSqlServer,
)
from modin.db_conn import ModinDatabaseConnection, UnsupportedDatabaseException
from modin.pandas.io import from_arrow, from_ray, to_pandas
from modin.pandas.io import from_arrow, from_ray_dataset, to_pandas
from modin.test.test_utils import warns_that_defaulting_to_pandas

from .utils import (
Expand Down Expand Up @@ -3254,13 +3254,13 @@ def test_to_ray_dataset():
reason="Ray Dataset creation is only available for Ray engine",
)
@pytest.mark.filterwarnings(default_to_pandas_ignore_string)
def test_from_ray():
def test_from_ray_dataset():
index = pandas.DatetimeIndex(
pandas.date_range("2000", freq="h", periods=len(TEST_DATA["col1"]))
)
modin_df, pandas_df = create_test_dfs(TEST_DATA, index=index)

ray_df = ray.data.from_pandas(pandas_df)

result_df = from_ray(ray_df)
result_df = from_ray_dataset(ray_df)
df_equals(result_df, modin_df)

0 comments on commit 959f94a

Please sign in to comment.