Skip to content
Draft
Show file tree
Hide file tree
Changes from 7 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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ stackoverflow
common_voice
puffer
landmark
coqa
coqa
dump.rdb
*.pid
8 changes: 8 additions & 0 deletions docker/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

import yaml

from fedscale.core.storage import redis_utils


def flatten(d):
out = {}
Expand Down Expand Up @@ -143,6 +145,12 @@ def terminate(job_name):
print_help: bool = False
if len(sys.argv) > 1:
if sys.argv[1] == 'submit' or sys.argv[1] == 'start':
redis_exec = '/usr/bin/redis-server'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove the hardcoded path? Instead, use some like os.environ["REDIS_PATH"]

fedscale_home = os.environ['FEDSCALE_HOME']
if not redis_utils.is_redis_server_online():
redis_utils.start_redis_server(redis_exec, fedscale_home)
time.sleep(1) # wait for server to go online
redis_utils.clear_all_keys() # clear existing keys
process_cmd(sys.argv[2], False if sys.argv[1] == 'submit' else True)
elif sys.argv[1] == 'stop':
terminate(sys.argv[2])
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies:
- tensorboard
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember you mentioned that some tf version is not compatible. Can you please update tf version here too?

- numba=0.49.1
- pip=20.0.2
- redis-py=3.5.3
- pip:
- torch_optimizer
- torch
Expand Down
185 changes: 135 additions & 50 deletions fedscale/core/aggregation/aggregator.py

Large diffs are not rendered by default.

Loading