Merge remote-tracking branch 'origin/master'

# Conflicts: # baby-a3c.py
greydanus · May 2, 2018 · f7a632d · f7a632d
2 parents bbb1821 + c4b7b4a
commit f7a632d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/baby-a3c.py b/baby-a3c.py
@@ -184,4 +184,4 @@ def train(shared_model, shared_optimizer, rank, args, info):
     for rank in range(args.processes):
         p = mp.Process(target=train, args=(shared_model, shared_optimizer, rank, args, info))
         p.start() ; processes.append(p)
-    for p in processes: p.join()
+    for p in processes: p.join()
diff --git a/test.txt b/test.txt
@@ -0,0 +1 @@
+another test1