Skip to content

feature: remove ModelWrapper from train.py #332

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
YuriCat wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feature: remove ModelWrapper from train.py #332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 5 deletions handyrl/train.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

from .environment import prepare_env, make_env
from .util import map_r, bimap_r, trimap_r, rotate
from .model import to_torch, to_gpu, ModelWrapper
from .model import to_torch, to_gpu
from .losses import compute_target
from .connection import MultiProcessJobExecutor
from .worker import WorkerCluster, WorkerServer
Expand Down Expand Up @@ -330,10 +330,9 @@ def __init__(self, args, model):
self.update_flag = False
self.update_queue = queue.Queue(maxsize=1)

self.wrapped_model = ModelWrapper(self.model)
self.trained_model = self.wrapped_model
self.trained_model = self.model
if self.gpu > 1:
self.trained_model = nn.DataParallel(self.wrapped_model)
self.trained_model = nn.DataParallel(self.model)

def update(self):
self.update_flag = True
Expand All @@ -354,7 +353,9 @@ def train(self):
batch = self.batcher.batch()
batch_size = batch['value'].size(0)
player_count = batch['value'].size(2)
hidden = self.wrapped_model.init_hidden([batch_size, player_count])
hidden = None
if hasattr(self.model, 'init_hidden'):
hidden = self.model.init_hidden([batch_size, player_count])
if self.gpu > 0:
batch = to_gpu(batch)
hidden = to_gpu(hidden)
Expand Down