increase TF version compatibility from 0.8.0 to 0.12.0

Author: carpedm20

README.md

@@ -18,8 +18,8 @@ This implementation contains:
 - Python 2.7 or Python 3.3+
 - [gym](https://github.com/openai/gym)
 - [tqdm](https://github.com/tqdm/tqdm)
-- [OpenCV2](http://opencv.org/)
-- [TensorFlow 0.8.0](https://github.com/tensorflow/tensorflow/tree/r0.8)
+- [SciPy](http://www.scipy.org/install.html) or [OpenCV2](http://opencv.org/)
+- [TensorFlow 0.12.0](https://github.com/tensorflow/tensorflow/tree/r0.12)
 
 
 ## Usage

dqn/agent.py

@@ -224,8 +224,8 @@ def build_dqn(self):
       q_summary = []
       avg_q = tf.reduce_mean(self.q, 0)
       for idx in xrange(self.env.action_size):
-        q_summary.append(tf.histogram_summary('q/%s' % idx, avg_q[idx]))
-      self.q_summary = tf.merge_summary(q_summary, 'q_summary')
+        q_summary.append(tf.summary.histogram('q/%s' % idx, avg_q[idx]))
+      self.q_summary = tf.summary.merge(q_summary, 'q_summary')
 
     # target network
     with tf.variable_scope('target'):
@@ -312,15 +312,15 @@ def build_dqn(self):
 
       for tag in scalar_summary_tags:
         self.summary_placeholders[tag] = tf.placeholder('float32', None, name=tag.replace(' ', '_'))
-        self.summary_ops[tag]  = tf.scalar_summary("%s-%s/%s" % (self.env_name, self.env_type, tag), self.summary_placeholders[tag])
+        self.summary_ops[tag]  = tf.summary.scalar("%s-%s/%s" % (self.env_name, self.env_type, tag), self.summary_placeholders[tag])
 
       histogram_summary_tags = ['episode.rewards', 'episode.actions']
 
       for tag in histogram_summary_tags:
         self.summary_placeholders[tag] = tf.placeholder('float32', None, name=tag.replace(' ', '_'))
-        self.summary_ops[tag]  = tf.histogram_summary(tag, self.summary_placeholders[tag])
+        self.summary_ops[tag]  = tf.summary.histogram(tag, self.summary_placeholders[tag])
 
-      self.writer = tf.train.SummaryWriter('./logs/%s' % self.model_dir, self.sess.graph)
+      self.writer = tf.summary.FileWriter('./logs/%s' % self.model_dir, self.sess.graph)
 
     tf.initialize_all_variables().run()
 

dqn/environment.py

@@ -1,7 +1,7 @@
-import cv2
 import gym
 import random
 import numpy as np
+from utils import rgb2gray, imresize
 
 class Environment(object):
   def __init__(self, config):
@@ -40,7 +40,7 @@ def _random_step(self):
 
   @ property
   def screen(self):
-    return cv2.resize(cv2.cvtColor(self._screen, cv2.COLOR_RGB2GRAY)/255., self.dims)
+    return imresize(rgb2gray(self._screen)/255., self.dims)
     #return cv2.resize(cv2.cvtColor(self._screen, cv2.COLOR_BGR2YCR_CB)/255., self.dims)[:,:,0]
 
   @property

dqn/utils.py

@@ -1,7 +1,17 @@
 import time
 import cPickle
+import numpy as np
 import tensorflow as tf
 
+try:
+  from scipy.misc import imresize
+except:
+  import cv2
+  imresize = cv2.resize
+
+def rgb2gray(image):
+  return np.dot(image[...,:3], [0.299, 0.587, 0.114])
+
 def timeit(f):
   def timed(*args, **kwargs):
     start_time = time.time()