Upgrade to PyTorch v0.2.0

This commit is contained in:
Shangtong Zhang
2017-10-28 11:06:20 -06:00
parent a59f2d2911
commit 9615195f5e
9 changed files with 27 additions and 254 deletions
-99
View File
@@ -1,99 +0,0 @@
#######################################################################
# Copyright (C) 2017 Shangtong Zhang(zhangshangtong.cpp@gmail.com) #
# Permission given to modify the code as long as you keep this #
# declaration at the top #
#######################################################################
from network import *
from component import *
from utils import *
import numpy as np
import time
import os
import pickle
import torch
class A2CAgent:
def __init__(self, config):
self.config = config
self.learning_network = config.network_fn()
self.optimizer = config.optimizer_fn(self.learning_network.parameters())
self.task = config.task_fn()
self.replay = config.replay_fn()
self.policy = config.policy_fn()
self.total_steps = 0
def episode(self, deterministic=False):
state = self.task.reset()
total_reward = 0.0
steps = 0
while True:
prob = self.learning_network.predict(np.stack([state]), True)
action = self.policy.sample(prob, deterministic=deterministic)
next_state, reward, done, info = self.task.step(action)
done = (done or (self.config.max_episode_length and steps > self.config.max_episode_length))
if not deterministic:
self.replay.feed([state, action, reward, next_state, int(done)])
self.total_steps += 1
total_reward += np.sum(reward * self.config.reward_weight)
steps += 1
state = next_state
if done:
break
if not deterministic and self.total_steps > self.config.min_memory_size:
experiences = self.replay.sample()
states, actions, rewards, next_states, terminals = experiences
prob, log_prob, value = self.learning_network.predict(states, False)
_, _, v_next = self.learning_network.predict(next_states, False)
terminals = self.learning_network.to_torch_variable(terminals).unsqueeze(1)
rewards = self.learning_network.to_torch_variable(rewards).unsqueeze(1)
actions = self.learning_network.to_torch_variable(actions, 'int64').unsqueeze(1)
target = rewards + self.config.discount * v_next * (1 - terminals)
target = target.detach()
advantage = target - value
value_loss = 0.5 * advantage.pow(2).mean()
policy_loss = -(log_prob.gather(1, actions) * Variable(advantage.data)).mean()
kl_loss = (prob * log_prob).sum(1).mean()
self.optimizer.zero_grad()
(value_loss + policy_loss + self.config.entropy_weight * kl_loss).backward()
torch.nn.utils.clip_grad_norm(self.learning_network.parameters(), self.config.gradient_clip)
self.optimizer.step()
return total_reward, steps
def run(self):
window_size = 100
ep = 0
rewards = []
steps = []
avg_test_rewards = []
while True:
ep += 1
reward, step = self.episode()
rewards.append(reward)
steps.append(step)
avg_reward = np.mean(rewards[-window_size:])
self.config.logger.info('episode %d, reward %f, avg reward %f, total steps %d, episode step %d' % (
ep, reward, avg_reward, self.total_steps, step))
if self.config.episode_limit and ep > self.config.episode_limit:
return rewards, steps, avg_test_rewards
if self.config.test_interval and ep % self.config.test_interval == 0:
self.config.logger.info('Testing...')
with open('data/%s-dqn-model-%s.bin' % (self.config.tag, self.task.name), 'wb') as f:
pickle.dump(self.learning_network.state_dict(), f)
test_rewards = []
for _ in range(self.config.test_repetitions):
reward, step = self.episode(True)
test_rewards.append(reward)
avg_reward = np.mean(test_rewards)
avg_test_rewards.append(avg_reward)
self.config.logger.info('Avg reward %f(%f)' % (
avg_reward, np.std(test_rewards) / np.sqrt(self.config.test_repetitions)))
with open('data/%sdqn-statistics-%s.bin' % (self.config.tag, self.task.name), 'wb') as f:
pickle.dump({'rewards': rewards,
'test_rewards': avg_test_rewards}, f)
if avg_reward > self.task.success_threshold:
break
+6 -6
View File
@@ -71,10 +71,10 @@ class DQNAgent:
target.append(q_next_.detach().max(1)[0])
elif self.config.target_type == self.config.expected_sarsa_target:
target.append(q_next_.detach().mean(1))
target = torch.cat(target, dim=1).detach()
target = torch.stack(target, dim=1).detach()
terminals = self.learning_network.to_torch_variable(terminals).unsqueeze(1)
rewards = self.learning_network.to_torch_variable(rewards)
target = self.config.discount * target * (1 - terminals.expand_as(target))
target = self.config.discount * target * (1 - terminals)
target.add_(rewards)
q = self.learning_network.predict(states, True)
q_action = []
@@ -87,16 +87,16 @@ class DQNAgent:
q_next = self.target_network.predict(next_states, False).detach()
if self.config.double_q:
_, best_actions = self.learning_network.predict(next_states).detach().max(1)
q_next = q_next.gather(1, best_actions)
q_next = q_next.gather(1, best_actions.unsqueeze(1)).squeeze(1)
else:
q_next, _ = q_next.max(1)
terminals = self.learning_network.to_torch_variable(terminals).unsqueeze(1)
rewards = self.learning_network.to_torch_variable(rewards).unsqueeze(1)
terminals = self.learning_network.to_torch_variable(terminals)
rewards = self.learning_network.to_torch_variable(rewards)
q_next = self.config.discount * q_next * (1 - terminals)
q_next.add_(rewards)
actions = self.learning_network.to_torch_variable(actions, 'int64').unsqueeze(1)
q = self.learning_network.predict(states, False)
q = q.gather(1, actions)
q = q.gather(1, actions).squeeze(1)
loss = self.learning_network.criterion(q, q_next)
self.learning_network.zero_grad()
loss.backward()
-101
View File
@@ -1,101 +0,0 @@
#######################################################################
# Copyright (C) 2017 Shangtong Zhang(zhangshangtong.cpp@gmail.com) #
# Permission given to modify the code as long as you keep this #
# declaration at the top #
#######################################################################
from network import *
from component import *
from utils import *
import numpy as np
import time
import os
import pickle
import torch
# This HRA DQN with removing irrelevant features
class MSDQNAgent:
def __init__(self, config):
self.config = config
self.learning_network = config.network_fn(config.optimizer_fn)
self.target_network = config.network_fn(config.optimizer_fn)
self.target_network.load_state_dict(self.learning_network.state_dict())
self.task = config.task_fn()
self.replay = config.replay_fn()
self.policy = config.policy_fn()
self.total_steps = 0
def episode(self, deterministic=False):
episode_start_time = time.time()
state = self.task.reset()
total_reward = 0.0
steps = 0
while True:
value = self.learning_network.predict(np.stack([state]), True)
value = value.cpu().data.numpy().flatten()
if deterministic:
action = np.argmax(value)
elif self.total_steps < self.config.exploration_steps:
action = np.random.randint(0, len(value))
else:
action = self.policy.sample(value)
next_state, reward, done, info = self.task.step(action)
done = (done or (self.config.max_episode_length and steps > self.config.max_episode_length))
if not deterministic:
self.replay.feed([state, action, reward, next_state, int(done)])
self.total_steps += 1
total_reward += np.sum(reward * self.config.reward_weight)
steps += 1
state = next_state
if done:
break
if not deterministic and self.total_steps > self.config.exploration_steps:
experiences = self.replay.sample()
states, actions, rewards, next_states, terminals = experiences
if self.config.hybrid_reward:
q_next = self.target_network.predict(next_states, False)
target = []
for q_next_ in q_next:
if self.config.target_type == self.config.q_target:
target.append(q_next_.detach().max(1)[0])
elif self.config.target_type == self.config.expected_sarsa_target:
target.append(q_next_.detach().mean(1))
target = torch.cat(target, dim=1).detach()
terminals = self.learning_network.to_torch_variable(terminals).unsqueeze(1)
rewards = self.learning_network.to_torch_variable(rewards)
target = self.config.discount * target * (1 - terminals.expand_as(target))
target.add_(rewards)
q = self.learning_network.predict(states, False)
q_action = []
actions = self.learning_network.to_torch_variable(actions, 'int64').unsqueeze(1)
for q_ in q:
q_action.append(q_.gather(1, actions))
q_action = torch.cat(q_action, dim=1)
loss = self.learning_network.criterion(q_action, target)
else:
q_next = self.target_network.predict(next_states, True).detach()
if self.config.double_q:
_, best_actions = self.learning_network.predict(next_states).detach().max(1)
q_next = q_next.gather(1, best_actions)
else:
q_next, _ = q_next.max(1)
terminals = self.learning_network.to_torch_variable(terminals).unsqueeze(1)
rewards = np.sum(rewards * self.config.reward_weight, axis=1)
rewards = self.learning_network.to_torch_variable(rewards).unsqueeze(1)
q_next = self.config.discount * q_next * (1 - terminals)
q_next.add_(rewards)
actions = self.learning_network.to_torch_variable(actions, 'int64').unsqueeze(1)
q = self.learning_network.predict(states, True)
q = q.gather(1, actions)
loss = self.learning_network.criterion(q, q_next)
self.learning_network.zero_grad()
loss.backward()
self.learning_network.optimizer.step()
if not deterministic and self.total_steps % self.config.target_network_update_freq == 0:
self.target_network.load_state_dict(self.learning_network.state_dict())
if not deterministic and self.total_steps > self.config.exploration_steps:
self.policy.update_epsilon()
episode_time = time.time() - episode_start_time
self.config.logger.debug('episode steps %d, episode time %f, time per step %f' %
(steps, episode_time, episode_time / float(steps)))
return total_reward, steps
-2
View File
@@ -1,5 +1,3 @@
from .async_agent import *
from .DDPG_agent import *
from .DQN_agent import *
from .A2C_agent import *
from .MSDQN_agent import *