merged with refactoring

hill-a · Aug 20, 2018 · 9fd2123 · 9fd2123
2 parents 07e2393 + 282e2ec
commit 9fd2123
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,3 @@
+[metadata]
+# This includes the license file in the wheel.
+license_file = LICENSE
diff --git a/setup.py b/setup.py
@@ -33,4 +33,9 @@
       author='Ashley Hill',
       url='https://github.com/openai/stable_baselines',
       author_email='[email protected]',
-      version='1.0.0')
+      version='1.0.1')
+
+# python setup.py sdist
+# python setup.py bdist_wheel
+# twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+# twine upload dist/*
diff --git a/stable_baselines/acer/acer_simple.py b/stable_baselines/acer/acer_simple.py
@@ -155,6 +155,11 @@ def setup_model(self):
             else:
                 raise ValueError("Error: ACER does not work with {} actions space.".format(self.action_space))
 
+<<<<<<< HEAD:stable_baselines/acer/acer_simple.py
+=======
+            self.n_batch = self.n_envs * self.n_steps
+
+>>>>>>> refactoring:baselines/acer/acer_simple.py
             self.graph = tf.Graph()
             with self.graph.as_default():
                 self.sess = tf_util.make_session(num_cpu=self.num_procs, graph=self.graph)