Revert "[RLLib] Execution-Folder Type Annotations (#12760)" (#12886)

This reverts commit becca1424d.
This commit is contained in:
Edward Oakes
2020-12-15 11:03:02 -08:00
committed by GitHub
parent ba12fb1451
commit cde711aaf1
11 changed files with 98 additions and 126 deletions
+15 -16
View File
@@ -12,7 +12,6 @@ from ray.rllib.execution.multi_gpu_impl import LocalSyncParallelOptimizer
from ray.rllib.utils.annotations import override
from ray.rllib.utils.framework import try_import_tf
from ray.rllib.utils.timer import TimerStat
from ray.rllib.evaluation.rollout_worker import RolloutWorker
tf1, tf, tfv = try_import_tf()
@@ -26,17 +25,17 @@ class TFMultiGPULearner(LearnerThread):
"""
def __init__(self,
local_worker: RolloutWorker,
num_gpus: int = 1,
lr: float = 0.0005,
train_batch_size: int = 500,
num_data_loader_buffers: int = 1,
minibatch_buffer_size: int = 1,
num_sgd_iter: int = 1,
learner_queue_size: int = 16,
learner_queue_timeout: int = 300,
num_data_load_threads: int = 16,
_fake_gpus: bool = False):
local_worker,
num_gpus=1,
lr=0.0005,
train_batch_size=500,
num_data_loader_buffers=1,
minibatch_buffer_size=1,
num_sgd_iter=1,
learner_queue_size=16,
learner_queue_timeout=300,
num_data_load_threads=16,
_fake_gpus=False):
"""Initialize a multi-gpu learner thread.
Args:
@@ -122,7 +121,7 @@ class TFMultiGPULearner(LearnerThread):
learner_queue_timeout, num_sgd_iter)
@override(LearnerThread)
def step(self) -> None:
def step(self):
assert self.loader_thread.is_alive()
with self.load_wait_timer:
opt, released = self.minibatch_buffer.get()
@@ -140,7 +139,7 @@ class TFMultiGPULearner(LearnerThread):
class _LoaderThread(threading.Thread):
def __init__(self, learner: LearnerThread, share_stats: bool):
def __init__(self, learner, share_stats):
threading.Thread.__init__(self)
self.learner = learner
self.daemon = True
@@ -151,11 +150,11 @@ class _LoaderThread(threading.Thread):
self.queue_timer = TimerStat()
self.load_timer = TimerStat()
def run(self) -> None:
def run(self):
while True:
self._step()
def _step(self) -> None:
def _step(self):
s = self.learner
with self.queue_timer:
batch = s.inqueue.get()