diff --git a/Makefile b/Makefile index 0022e3c..985b489 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ HR_EDL_DIR =hr_edl EXE_DIR :=$(HR_EDL_DIR)/build.optimized/bin SIF := +PREFIX :=. ALG_GROUPS :=efr GAMES :=sheriff tiny_bridge leduc tiny_hanabi \ @@ -22,16 +23,16 @@ results: mkdir $@ data/%.gen.ssv: | data - python3 bin/run_experiment.py --exe_dir $(EXE_DIR) -a $* --sif $(SIF) > $@ + python3 $(PREFIX)/bin/run_experiment.py --exe_dir $(EXE_DIR) -a $* --sif $(SIF) > $@ runs_remaining.gen.sh: bin/list_runs_remaining.sh Makefile $< > $@ results/efr_data.npy: $(SSV_FILES) | results - python3 bin/save_data.py -x efr -o $@ + python3 $(PREFIX)/bin/save_data.py -x efr -o $@ results/cor_gap_data.npy: $(wildcard data/cor_gap.*.dat) | results - python3 bin/save_data.py -x cor_gap -o $@ + python3 $(PREFIX)/bin/save_data.py -x cor_gap -o $@ print-%: @echo $* = $($*) diff --git a/bin/sbatch_run_experiments.sh b/bin/sbatch_run_experiments.sh deleted file mode 100755 index 8009093..0000000 --- a/bin/sbatch_run_experiments.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -make runs_remaining.gen.sh -sbatch bin/sbatch_config.sh diff --git a/setup.py b/setup.py index 7e855d5..38b7e0d 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ 'matplotlib == 3.3.2', 'seaborn == 0.9.0', 'numpy == 1.20.2', - 'pandas == 1.1.1', + 'pandas == 1.1.5', 'jupyter == 1.0.0', ], )