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

Change runtime.py to choose tasks with lowest (instead of highest) priority #505

Merged
merged 6 commits into from
Sep 7, 2022
Merged

Change runtime.py to choose tasks with lowest (instead of highest) priority #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8b40d0
Update runtime.py
justheuristic Sep 6, 2022
1efea30
Update task_pool.py
justheuristic Sep 7, 2022
194f100
Update task_pool.py
justheuristic Sep 7, 2022
6ec8d60
Update task_pool.py
justheuristic Sep 7, 2022
1431240
Merge branch 'master' into pool-priority-reverse
justheuristic Sep 7, 2022
c241505
Update task_pool.py
justheuristic Sep 7, 2022
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: 2 additions & 2 deletions hivemind/moe/server/runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ def iterate_minibatches_from_pools(self, timeout=None):
if self.SHUTDOWN_TRIGGER in ready_objects:
break # someone asked us to shutdown, break from the loop

logger.debug("Choosing the pool with highest priority")
pool = max(ready_objects, key=lambda pool: pool.priority)
logger.debug("Choosing the pool with first priority")
pool = min(ready_objects, key=lambda pool: pool.priority)

logger.debug(f"Loading batch from {pool.name}")
batch_index, batch_tensors = pool.load_batch_to_runtime(timeout, self.device)
Expand Down
4 changes: 2 additions & 2 deletions hivemind/moe/server/task_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class TaskPoolBase(mp.context.ForkProcess, metaclass=ABCMeta):
def __init__(self, process_func: callable, daemon=True, **kwargs):
super().__init__(daemon=daemon, **kwargs)
self.process_func = process_func
self._priority = mp.Value(ctypes.c_double, 1.0) # higher priority = the more urgent to process this pool
self._priority = mp.Value(ctypes.c_double, 1.0) # lower priority = the more urgent to process this pool

@abstractmethod
def run(self):
Expand Down Expand Up @@ -170,7 +170,7 @@ def _pool_input_loop(self, pending_batches: Dict[Any, List[Task]], *args, **kwar
for skip_i in range(prev_num_tasks):
finished_task_timestamp = (
self.undispatched_task_timestamps.get()
) # earlier timestamp = higher priority
) # earlier timestamp = smaller (better) priority, earlier processing
if skip_i == prev_num_tasks - 1:
self.priority = finished_task_timestamp

Expand Down