rename vecinteractor as worker

johnjim0816 · Nov 30, 2023 · 88287bb · 88287bb
1 parent 8b961f1
commit 88287bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/framework/interactor.py b/framework/interactor.py
@@ -63,15 +63,13 @@ def _sample_data(self,*args, **kwargs):
                 run_step = 0
                 break
 
-    def close_env(self):
-        self.env.close()
 
-class BaseVecInteractor:
+class BaseWorker:
     def __init__(self, cfg: MergedConfig, policy = None, *args, **kwargs) -> None:
         self.cfg = cfg
         self.n_envs = cfg.n_workers
 
-class DummyVecInteractor(BaseVecInteractor):
+class DummyWorker(BaseWorker):
     def __init__(self, cfg: MergedConfig, env = None, policy = None, *args, **kwargs) -> None:
         super().__init__(cfg, env = env, policy = policy, *args, **kwargs)
         self.interactors = [BaseInteractor(cfg, id = i, env = copy.deepcopy(env), policy = copy.deepcopy(policy), *args, **kwargs) for i in range(self.n_envs)]
@@ -80,7 +78,7 @@ def run(self, *args, **kwargs):
         for i in range(self.n_envs):
             self.interactors[i].run(*args, **kwargs)
 
-class RayVecInteractor(BaseVecInteractor):
+class RayWorker(BaseWorker):
     def __init__(self, cfg) -> None:
         super().__init__(cfg)
         if not ray.is_initialized(): ray.init()
@@ -120,7 +118,7 @@ def get_action(self,obs):
             return random.randint(0,1)
     cfg = Config()
     policy = Policy()
-    env = DummyVecInteractor(cfg)
+    env = DummyWorker(cfg)
     # env = RayVecEnv(cfg)
     s_t = time.time()
     env.step(policy)

diff --git a/framework/trainer.py b/framework/trainer.py
@@ -4,7 +4,7 @@ class BaseTrainer:
     def __init__(self, cfg, *args,**kwargs) -> None:
         self.cfg = cfg
         self.model_mgr = kwargs['model_mgr']
-        self.vec_interactor = kwargs['vec_interactor']
+        self.worker = kwargs['worker']
         self.learner = kwargs['learner']
         self.collector = kwargs['collector']
         self.online_tester = kwargs['online_tester']
@@ -36,7 +36,7 @@ def run(self):
         s_t = time.time() # start time
         while True:
             # interact with env and sample data
-            self.vec_interactor.run(
+            self.worker.run(
                 model_mgr = self.model_mgr,
                 dataserver = self.dataserver,
                 collector = self.collector,

diff --git a/main.py b/main.py
@@ -11,7 +11,7 @@
 from config.general_config import GeneralConfig, MergedConfig, DefaultConfig
 from framework.collector import SimpleCollector
 from framework.dataserver import SimpleDataServer, RayDataServer
-from framework.interactor import DummyVecInteractor
+from framework.interactor import DummyWorker
 from framework.learner import SimpleLearner
 from framework.recorder import SimpleRecorder, RayStatsRecorder, SimpleLogger, RayLogger, SimpleTrajCollector
 from framework.tester import SimpleTester, RayTester
@@ -185,7 +185,7 @@ def run(self) -> None:
         dataserver = SimpleDataServer(self.cfg)
         logger = SimpleLogger(self.cfg.log_dir)
         collector = SimpleCollector(self.cfg, data_handler = data_handler)
-        vec_interactor = DummyVecInteractor(self.cfg, 
+        worker = DummyWorker(self.cfg, 
                                             env = env,
                                             policy = policy,
                                             )
@@ -209,7 +209,7 @@ def run(self) -> None:
         trainer = SimpleTrainer(self.cfg, 
                                 dataserver = dataserver,
                                 model_mgr = model_mgr,
-                                vec_interactor = vec_interactor, 
+                                worker = worker, 
                                 learner = learner, 
                                 collector = collector, 
                                 online_tester = online_tester,