diff --git a/syncscript.sh b/syncscript.sh index ca83742..6d7c505 100755 --- a/syncscript.sh +++ b/syncscript.sh @@ -6,8 +6,6 @@ commit_message="$(git log -1 --pretty=format:"%s_%h" | sed 's/\s/_/g')" git diff --quiet || commit_message="${commit_message}_dirty" datetime="$(date +%Y%-m-%dT%H:%M:%S)" -exp_name="${commit_message}-${datetime}" -experiment_log_dir="${2}/${exp_name}" #cpu=nehalem192g0 cpu=epyc512g0 @@ -25,7 +23,11 @@ prob_next=$8 prob_direct=$9 prob_forward="${10}" shield_comparision="${11}" -NUM_GPUS="0" +NUM_GPUS="1" + +exp_name="${commit_message}-${datetime}-env:${env}-sh:${shielding}-value:${shield_value}-comp:${shield_comparision}-prob:${prob_forward}" +experiment_log_dir="${2}/${exp_name}" + MINIGRID_BINARY="" if [ "$(whoami)" = "spranger" ]; then diff --git a/testall.py b/testall.py index e7eb591..259494d 100644 --- a/testall.py +++ b/testall.py @@ -1,8 +1,10 @@ #!/usr/bin/python3 - -abs_path = "TODO" +import os import subprocess + +abs_path = os.getcwd() + slippery_configs=[f"{abs_path}/slippery_prob_075.yaml", f"{abs_path}/slippery_prob_08.yaml", f"{abs_path}/slippery_prob_085.yaml", @@ -39,12 +41,12 @@ for shield_value in shield_values: for sh_comp in comparison_type: for probs, config in prob_confs: command = f"echo \"Running experiment with sh:{sh}, sh_value:{probs[2]}, sh_comp:{sh_comp}, probvalues:{probs}, config{config}\"" - execute_command = f'./syncscript_local.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} full {sh_comp} {config} {probs[0]} {probs[1]} {probs[2]} {shield_value}' + execute_command = f'./syncscript.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} full {sh_comp} {config} {probs[0]} {probs[1]} {probs[2]} {shield_value}' subprocess.call(execute_command, shell=True)#.decode("utf-8").split('\n') # loop for unshielded runs for probs, config in prob_confs: command = f"echo \"Running experiment with sh:{sh}, sh_value:{probs[2]}, sh_comp:{sh_comp}, probvalues:{probs}, config{config}\"" - execute_command = f'./syncscript_local.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} none {sh_comp} {config} {probs[0]} {probs[1]} {probs[2]} {shield_value}' + execute_command = f'./syncscript.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} none {sh_comp} {config} {probs[0]} {probs[1]} {probs[2]} {shield_value}' subprocess.call(execute_command, shell=True)#.decode("utf-8").split('\n')