Skip to content

Commit

Permalink
Update ray and make changes to be compatible with API changes (#284)
Browse files Browse the repository at this point in the history
  • Loading branch information
devin-petersohn authored Dec 2, 2018
1 parent 201d2e5 commit 8e2c936
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def apply(self, func, num_splits=None, other_axis_partition=None, **kwargs):
if other_axis_partition is not None:
return [
PandasOnRayRemotePartition(obj)
for obj in deploy_ray_func_between_two_axis_partitions._submit(
for obj in deploy_ray_func_between_two_axis_partitions._remote(
args=(self.axis, func, num_splits, len(self.list_of_blocks), kwargs)
+ tuple(self.list_of_blocks + other_axis_partition.list_of_blocks),
num_return_vals=num_splits,
Expand All @@ -46,7 +46,7 @@ def apply(self, func, num_splits=None, other_axis_partition=None, **kwargs):
args.extend(self.list_of_blocks)
return [
PandasOnRayRemotePartition(obj)
for obj in deploy_ray_axis_func._submit(args, num_return_vals=num_splits)
for obj in deploy_ray_axis_func._remote(args, num_return_vals=num_splits)
]

def shuffle(self, func, num_splits=None, **kwargs):
Expand All @@ -66,7 +66,7 @@ def shuffle(self, func, num_splits=None, **kwargs):
args.extend(self.list_of_blocks)
return [
PandasOnRayRemotePartition(obj)
for obj in deploy_ray_axis_func._submit(args, num_return_vals=num_splits)
for obj in deploy_ray_axis_func._remote(args, num_return_vals=num_splits)
]


Expand Down
1 change: 0 additions & 1 deletion modin/pandas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
redirect_output=True,
include_webui=False,
redirect_worker_output=True,
use_raylet=True,
ignore_reinit_error=True,
)
except AssertionError:
Expand Down
6 changes: 3 additions & 3 deletions modin/pandas/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def _read_parquet_pandas_on_ray(path, engine, columns, **kwargs):
# We need to transpose the oids array to fit our schema.
blk_partitions = np.array(
[
_read_parquet_columns._submit(
_read_parquet_columns._remote(
args=(path, cols, num_splits, kwargs), num_return_vals=num_splits + 1
)
for cols in col_partitions
Expand Down Expand Up @@ -178,7 +178,7 @@ def _read_csv_from_file_pandas_on_ray(filepath, kwargs={}):
start = f.tell()
f.seek(chunk_size, os.SEEK_CUR)
f.readline() # Read a whole number of lines
partition_id = _read_csv_with_offset_pandas_on_ray._submit(
partition_id = _read_csv_with_offset_pandas_on_ray._remote(
args=(
filepath,
num_splits,
Expand Down Expand Up @@ -552,7 +552,7 @@ def read_hdf(path_or_buf, key=None, mode="r", columns=None):
]
blk_partitions = np.array(
[
_read_hdf_columns._submit(
_read_hdf_columns._remote(
args=(path_or_buf, cols, num_splits, key, mode),
num_return_vals=num_splits + 1,
)
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pandas==0.23.4
redis==2.10.6
ray==0.5.3
ray==0.6.0
strip_hints
typing
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
setup(
name="modin",
version="0.2.4",
description="Modin: Pandas on Ray - Make your pandas code run faster with "
"a single line of code change.",
description="Modin: Make your pandas code run faster by changing one line of code.",
packages=find_packages(),
url="https://github.com/modin-project/modin",
long_description=long_description,
long_description_content_type="text/markdown",
install_requires=["pandas==0.23.4", "redis==2.10.6", "ray==0.5.3"])
install_requires=["pandas==0.23.4", "ray==0.6.0"])

0 comments on commit 8e2c936

Please sign in to comment.