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

Jump to bottom

(To Be Discussed) feature: remove prepare_env() #248

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

(To Be Discussed) feature: remove prepare_env() #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7fe18d
feature: remove prepare_env()
YuriCat Jan 25, 2022
991e07e
Merge branch 'develop' into feature/no_prepare_env
YuriCat Feb 11, 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
11 changes: 0 additions & 11 deletions handyrl/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@
}


def prepare_env(env_args):
env_name = env_args['env']
env_source = ENVS.get(env_name, env_name)
env_module = importlib.import_module(env_source)

if env_module is None:
print("No environment %s" % env_name)
elif hasattr(env_module, 'prepare'):
env_module.prepare()


def make_env(env_args):
env_name = env_args['env']
env_source = ENVS.get(env_name, env_name)
Expand Down
4 changes: 1 addition & 3 deletions handyrl/evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import time
import multiprocessing as mp

from .environment import prepare_env, make_env
from .environment import make_env
from .connection import send_recv, accept_socket_connections, connect_socket_connection
from .agent import RandomAgent, RuleBasedAgent, Agent, EnsembleAgent, SoftAgent

Expand Down Expand Up @@ -367,7 +367,6 @@ def client_mp_child(env_args, model_path, conn):

def eval_main(args, argv):
env_args = args['env_args']
prepare_env(env_args)
env = make_env(env_args)

model_path = argv[0] if len(argv) >= 1 else 'models/latest.pth'
Expand All @@ -393,7 +392,6 @@ def eval_main(args, argv):
def eval_server_main(args, argv):
print('network match server mode')
env_args = args['env_args']
prepare_env(env_args)
env = make_env(env_args)

num_games = int(argv[0]) if len(argv) >= 1 else 100
Expand Down
3 changes: 1 addition & 2 deletions handyrl/train.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import torch.optim as optim
import psutil

from .environment import prepare_env, make_env
from .environment import make_env
from .util import map_r, bimap_r, trimap_r, rotate
from .model import to_torch, to_gpu, ModelWrapper
from .losses import compute_target
Expand Down Expand Up @@ -648,7 +648,6 @@ def run(self):


def train_main(args):
prepare_env(args['env_args']) # preparing environment is needed in stand-alone mode
learner = Learner(args=args)
learner.run()

Expand Down
3 changes: 1 addition & 2 deletions handyrl/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import pickle
import copy

from .environment import prepare_env, make_env
from .environment import make_env
from .connection import QueueCommunicator
from .connection import send_recv, open_multiprocessing_connections
from .connection import connect_socket_connection, accept_socket_connections
Expand Down Expand Up @@ -245,7 +245,6 @@ def __init__(self, args):
def run(self):
args = entry(self.args)
print(args)
prepare_env(args['env'])

# open worker
process = []
Expand Down