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.

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

FIX-#2052: fix spawning of remote cluster #2053

Merged
merged 5 commits into from
Sep 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ci/teamcity/Dockerfile.teamcity-ci
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ADD git-rev /modin/git-rev

WORKDIR /modin

RUN conda env create -f environment.yml
RUN conda env create -f ${ENVIRONMENT}

# Make RUN commands use the new environment:
SHELL ["conda", "run", "-n", "modin", "/bin/bash", "-c"]
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- pathlib
- scipy
- pip
- s3fs
- s3fs>=0.4.2
- feather-format
- lxml
- openpyxl
Expand All @@ -30,4 +30,4 @@ dependencies:
- pygithub==1.53
- pip:
- ray==0.8.7
- rpyc
- rpyc==4.1.5
3 changes: 3 additions & 0 deletions modin/experimental/cloud/ray-autoscaler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ setup_commands:
conda install python==3.7.6

pip install modin "ray==0.8.7" cloudpickle
# ray now executes "ray stop" which expects "ray" to be in $PATH
# so place a symlink to current "ray" binary to /usr/local/bin
sudo ln -s `which ray` /usr/local/bin/ray
echo 'export MODIN_RAY_CLUSTER=True' >> ~/.bashrc

# Consider uncommenting these if you also want to run apt-get commands during setup
Expand Down
7 changes: 7 additions & 0 deletions modin/experimental/cloud/rayscale.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ def __do_spawn(self):
restart_only=False,
yes=True,
override_cluster_name=None,
no_config_cache=False,
log_old_style=False,
log_color="auto",
verbose=1,
)
# need to re-load the config, as create_or_update_cluster() modifies it
with open(self.config_file) as inp:
Expand All @@ -176,6 +180,9 @@ def __do_destroy(self):
workers_only=False,
override_cluster_name=None,
keep_min_workers=0,
log_old_style=False,
log_color="auto",
verbose=1,
)
self.ready = False
self.config = None
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Jinja2
pathlib
tables
scipy
s3fs
s3fs>=0.4.2
pytest
coverage<5.0
pytest-cov
Expand All @@ -24,4 +24,4 @@ sqlalchemy
msgpack
pandas_gbq
cloudpickle
rpyc
rpyc==4.1.5
2 changes: 1 addition & 1 deletion requirements/env_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
- pathlib
- tables
- scipy
- s3fs
- s3fs>=0.4.2
- pytest
- coverage<5.0
- pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion requirements/windows_test_requires.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Jinja2
pathlib
tables
scipy
s3fs
s3fs>=0.4.2
pytest
coverage<5.0
pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def is_pure(self):

dask_deps = ["dask>=2.12.0", "distributed>=2.12.0"]
ray_deps = ["ray==0.8.7", "pyarrow<0.17"]
remote_deps = ["rpyc", "cloudpickle", "boto3"]
remote_deps = ["rpyc==4.1.5", "cloudpickle", "boto3==1.4.8"]

all_deps = dask_deps + ray_deps + remote_deps

Expand Down