Skip to content

[WIP] Use async interface #120

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

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

[WIP] Use async interface #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b28c818
use async interface
wangxicoding Jun 15, 2020
f79c464
update distill worker
wangxicoding Jun 15, 2020
dc1f8fe
fix hang
wangxicoding Jun 16, 2020
2b5fefc
limit serving client concurrent
wangxicoding Jun 18, 2020
5652bd5
clear code
wangxicoding Jun 19, 2020
b3b2df4
manager remove server
wangxicoding Jun 19, 2020
c310bff
clean code
wangxicoding Jun 19, 2020
3acc5fd
exit
wangxicoding Jun 19, 2020
039bb8d
update
wangxicoding Jun 23, 2020
93d2c55
update, multi client
wangxicoding Jun 23, 2020
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
71 changes: 26 additions & 45 deletions python/paddle_edl/distill/distill_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,12 @@ def __init__(self, ins, predicts):
self._task_semaphore = None

# predict worker args
self._predict_worker = None
self._predict_server_queue = None
self._predict_server_result_queue = None
self._working_predict_count = None
self._predict_out_queue = None
self._predict_stop_events = None
self._predict_lock = None
self._predict_finished_task = None
self._predict_cond = None
self._predict_stop_event = None
# predict worker pool
self._predict_manage_thread = None
self._predict_manage_stop_event = None
Expand Down Expand Up @@ -154,53 +152,37 @@ def _start_reader_worker(self):
with self._reader_cond:
self._reader_cond.notify()

def _start_predict_worker(self):
process = []
for i in range(self._require_num):
worker = mps.Process(
target=distill_worker.predict_worker,
args=(
self._predict_server_queue,
self._predict_server_result_queue,
self._working_predict_count,
self._reader_out_queue,
self._predict_out_queue,
self._feeds,
self._fetchs,
self._serving_conf_file,
self._predict_stop_events,
self._predict_lock,
self._predict_finished_task,
self._predict_cond, ))
worker.daemon = True
worker.start()
process.append(worker)
return process

def _start_predict_worker_pool(self):
def _start_predict_process(self):
if not self._is_predict_start:
# start predict worker pool
process = self._start_predict_worker()
self._predict_stop_event = mps.Event()
predict_process = mps.Process(
target=distill_worker.predict_process,
args=(self._predict_server_queue,
self._predict_server_result_queue,
self._reader_out_queue, self._predict_out_queue,
self._feeds, self._fetchs, self._serving_conf_file,
self._predict_stop_event, self._predict_cond))
predict_process.daemon = True
predict_process.start()
self._predict_worker = predict_process

self._predict_manage_stop_event = threading.Event()
self._predict_manage_thread = threading.Thread(
target=distill_worker.predict_manage_worker,
args=(
process,
self._predict_server_queue,
self._predict_server_result_queue,
self._require_num,
self._predict_stop_events,
self._get_servers,
self._predict_manage_stop_event,
self._predict_cond, ))
self._predict_manage_stop_event, ))
self._predict_manage_thread.daemon = True
self._predict_manage_thread.start()

self._is_predict_start = True
else:
# wake up predict worker pool
# wake up predict process
with self._predict_cond:
self._predict_cond.notify_all()
self._predict_cond.notify()

def _init_args(self):
if not self._is_args_init:
Expand All @@ -211,18 +193,12 @@ def _init_args(self):
self._reader_out_queue = mps.Queue()
self._reader_stop_event = mps.Event()
self._reader_cond = mps.Condition()
self._task_semaphore = mps.Semaphore(2 * self._require_num + 2)
self._task_semaphore = mps.Semaphore(4 * self._require_num)

# predict
self._predict_server_queue = mps.Queue(self._require_num)
self._predict_server_result_queue = mps.Queue(self._require_num)
self._working_predict_count = mps.Value('i', 0, lock=False)
self._predict_out_queue = mps.Queue()
self._predict_stop_events = [
mps.Event() for i in range(self._require_num)
]
self._predict_lock = mps.Lock()
self._predict_finished_task = mps.Value('i', 0, lock=False)
self._predict_cond = mps.Condition()

# fetch
Expand Down Expand Up @@ -343,7 +319,7 @@ def print_config(self):
'teacher_service_name': self._service_name,
'reader_type': self._reader_type,
}
for config, value in print_config.iteritems():
for config, value in print_config.items():
print("%s: %s" % (config, value))
print("------------------------------------------------")

Expand All @@ -365,7 +341,8 @@ def __call__(self):
# >>> there will only be thread 2 and the lock will be held forever.
# So need to move start_predict_worker_pool to the end if we use logging in predict
# manager thread, or for the sake of safety, don't use logging?
self._start_predict_worker_pool()
# self._start_predict_worker_pool()
self._start_predict_process()

for data in distill_worker.fetch_out(
self._reader_type, self._predict_out_queue,
Expand All @@ -383,6 +360,10 @@ def __del__(self):

self._predict_manage_stop_event.set()

self._predict_stop_event.set()
with self._predict_cond:
self._predict_cond.notify()

for i in range(20):
if self._reader_worker.is_alive() or \
self._predict_manage_thread.is_alive():
Expand Down
Loading