lingering changes on gypsum; prepping to run on swarm2

toybox-rs · Jan 9, 2019 · e00c798 · e00c798
1 parent 749f40e
commit e00c798
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/ctoybox/baselines/baselines/run.py b/ctoybox/baselines/baselines/run.py
@@ -108,12 +108,12 @@ def build_env(args, extra_args):
         if alg == 'acer':
             env = make_vec_env(env_id, env_type, nenv, seed)
         elif alg == 'deepq':
-            env = atari_wrappers.make_atari(env_id)
+            env = atari_wrappers.make_atari(env_id, None)
             env.seed(seed)
             env = bench.Monitor(env, logger.get_dir())
             env = atari_wrappers.wrap_deepmind(env, frame_stack=True, scale=True)
         elif alg == 'trpo_mpi':
-            env = atari_wrappers.make_atari(env_id)
+            env = atari_wrappers.make_atari(env_id, None)
             env.seed(seed)
             env = bench.Monitor(env, logger.get_dir() and osp.join(logger.get_dir(), str(rank)))
             env = atari_wrappers.wrap_deepmind(env)

diff --git a/ctoybox/run.sh b/ctoybox/run.sh
@@ -1,4 +1,4 @@
-algs="acer acktr a2c ppo2 deepq"
+algs="deepq acer acktr a2c ppo2"
 work1=/mnt/nfs/work1/jensen/etosch/issta
 logs=$work1/logs
 
@@ -7,7 +7,7 @@ mkdir -p $logs
 partition="titanx-long"
 
 
-envs="BreakoutNoFrameskip-v4 AmidarNoFrameskip-v4 SpaceInvadersNoFrameskip-v4"
+envs="AmidarToyboxNoFrameskip-v4 SpaceInvadersToyboxNoFrameskip-v4"
 timesteps="1e7 5e7"
 weights=0
 seeds=`cat training_seeds`
@@ -55,7 +55,6 @@ for env in $envs; do
 OPENAI_LOGDIR=$logdir OPENAI_FORMAT=csv ./start_python -m baselines.run --alg=$alg --seed=$seed --env=$env --num_timesteps=$steps --save_path=$model $wflg" 
 		    echo "$cmd"
 		    echo "$cmd" > $dest
-
 		    sbatch -p $partition --gres=gpu:1 $dest
 	        done;
 	    done;

diff --git a/ctoybox/start_python b/ctoybox/start_python
@@ -1,6 +1,6 @@
 #!/bin/bash
 #pip3 install -q -r REQUIREMENTS.txt --user
-export PYTHONPATH=${PWD}/baselines:${PWD}/toybox:${PYTHONPATH}
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PWD}/../target/release
-export LIBCTOYBOX=${PWD}/..
+export PYTHONPATH=${PWD}/baselines:${PWD}/toybox:${PYTHONPATH}:${HOME}/toybox/ctoybox/baselines:${HOME}/toybox/ctoybox/toybox
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PWD}/../target/release:${HOME}/toybox/target/release
+export LIBCTOYBOX=${PWD}/..:${HOME}/toybox
 python3 "$@"