diff --git a/.gitignore b/.gitignore index 7e3dd5b..ce90026 100644 --- a/.gitignore +++ b/.gitignore @@ -50,4 +50,4 @@ manifest.db *.out runs_remaining.gen.sh sbatch_config.sh - +results/ diff --git a/Makefile b/Makefile index cf1a681..8e02a75 100644 --- a/Makefile +++ b/Makefile @@ -20,19 +20,16 @@ data: results: mkdir $@ -$(EXE): - cd $(EXPERIMENT_RUNNER_DIRECTORY) && $(MAKE) - data/%.gen.ssv: | data python3 bin/run_experiment.py --exe_dir $(EXE_DIR) -a $* > $@ runs_remaining.gen.sh: bin/list_runs_remaining.sh Makefile $< > $@ -results/efr_data.npy: $(SSV_FILES) +results/efr_data.npy: $(SSV_FILES) | results python3 bin/save_data.py -x efr -o $@ -results/cor_gap_data.npy: $(wildcard data/cor_gap.*.dat) +results/cor_gap_data.npy: $(wildcard data/cor_gap.*.dat) | results python3 bin/save_data.py -x cor_gap -o $@ print-%: diff --git a/results/.gitignore b/results/.gitignore deleted file mode 100644 index 6961fb6..0000000 --- a/results/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Thanks to https://www.oncrashreboot.com/how-to-add-an-empty-directory-to-a-git-repository for this. -# Disregard this entire folder -* -# Except this .gitignore file -!.gitignore