update sbatch for new directory and default output filename.

[ml_measurement_error_public.git] / simulations / Makefile

diff --git a/simulations/Makefile b/simulations/Makefile
index 264b4082c1aee42bea6e716714f761a40a6be78e..97b589418fa8362ea6987d74ea7b7858b7c5b139 100644 (file)
--- a/simulations/Makefile
+++ b/simulations/Makefile
@@ -1,20 +1,20 @@
 
 SHELL=bash
 
 
 SHELL=bash
 

-Ns=[1000,10000,25000]
+Ns=[500,1000,10000,25000]

 ms=[50, 100, 250, 500]
 seeds=[$(shell seq -s, 1 250)]
 all:remembr.RDS
 
 srun=srun -A comdata -p compute-bigmem --time=10:00:00 --mem 4G -c 1
 
 ms=[50, 100, 250, 500]
 seeds=[$(shell seq -s, 1 250)]
 all:remembr.RDS
 
 srun=srun -A comdata -p compute-bigmem --time=10:00:00 --mem 4G -c 1
 

-example_1_jobs: example_1.R
-       grid_sweep.py --command "Rscript example_1.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_1.feather"]}' --outfile example_1_jobs
+example_1_jobs: 01_two_covariates.R simulation_base.R grid_sweep.py
+       grid_sweep.py --command "Rscript 01_two_covariates.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_1.feather"]}' --outfile example_1_jobs

 
 example_1.feather: example_1_jobs
        rm -f example_1.feather
        sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 example_1_jobs
 
 example_1.feather: example_1_jobs
        rm -f example_1.feather
        sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 example_1_jobs

-#      sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_1_jobs
+       sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_1_jobs

 
 example_2_jobs: example_2.R
        grid_sweep.py --command "Rscript example_2.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_2.feather"]}' --outfile example_2_jobs
 
 example_2_jobs: example_2.R
        grid_sweep.py --command "Rscript example_2.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_2.feather"]}' --outfile example_2_jobs