diff --git a/project2/Makefile b/project2/Makefile index 585bebc..e4ba969 100644 --- a/project2/Makefile +++ b/project2/Makefile @@ -28,4 +28,7 @@ status: output: bpeek -f -.PHONY: requirements train check test job status output +run_all: + ./run_all.sh + +.PHONY: requirements train check test job status output run_all diff --git a/project2/README.md b/project2/README.md index 9ad2306..4093a88 100644 --- a/project2/README.md +++ b/project2/README.md @@ -54,12 +54,12 @@ The story cloze test 2016 accuracy is printed at the end of standard output, and ## Other make commands ``` -make clean # format source code -make check # check formatting and types -make job # train on Leonhard with sct/flags.py as flags (must be logged in) -make output # watch job output on Leonhard -make status # watch job status on Leonhard -make test # run unit tests (not used extensively) -make train # train locally with sct/flags.py as flags -make runall # run all experiments in sct/experiments one after each other (currently only roemmele*) +make clean # format source code +make check # check formatting and types +make job # train on Leonhard with sct/flags.py as flags (must be logged in) +make output # watch job output on Leonhard +make status # watch job status on Leonhard +make test # run unit tests (not used extensively) +make train # train locally with sct/flags.py as flags +make run_all # run all experiments in sct/experiments one after each other (currently only roemmele*) ``` diff --git a/project2/run_all.sh b/project2/run_all.sh index 78a9772..aae61a5 100755 --- a/project2/run_all.sh +++ b/project2/run_all.sh @@ -13,9 +13,9 @@ for file in `ls sct/experiments/`; do expname="`basename $flags`" echo "Running experiment $expname..." if [[ -z $last_name ]]; then - bsub -J "$expname" -W 04:00 -n 4 -R "rusage[mem=8192,ngpus_excl_p=1]" cp "$flags" "$new_flags" && python -m sct.train $@ + bsub -J "$expname" -W 04:00 -n 4 -R "rusage[mem=8192,ngpus_excl_p=1]" "cp "$flags" "$new_flags" && python -m sct.train $@" else - bsub -J "$expname" -w ended("$last_name") -W 04:00 -n 4 -R "rusage[mem=8192,ngpus_excl_p=1]" cp "$flags" "$new_flags" && python -m sct.train $@ + bsub -J "$expname" -w 'ended('"$last_name"')' -W 04:00 -n 4 -R "rusage[mem=8192,ngpus_excl_p=1]" "cp "$flags" "$new_flags" && python -m sct.train $@" fi last_name="$expname" echo "Submitted experiment $expname."