diff --git a/experiments/california_housing/stage4/none_with_params.json b/experiments/california_housing/stage4/none_with_params.json index 0f7a4a8f0048cf54ee69c0591d7475b2464afe0c..83eb6dd0c9df8827550488e2e9f11ed7a6052a48 100644 --- a/experiments/california_housing/stage4/none_with_params.json +++ b/experiments/california_housing/stage4/none_with_params.json @@ -17,9 +17,7 @@ 2, 3, 4, - 5, - 6, - 7 + 5 ], "subsets_used": "train+dev,train+dev", "normalize_weights": false, @@ -31,7 +29,7 @@ ], "job_number": -1, "extraction_strategy": "none", - "overwrite": false, + "overwrite": true, "extracted_forest_size": [ 33, 67, diff --git a/experiments/california_housing/stage4/omp_with_params.json b/experiments/california_housing/stage4/omp_with_params.json index 6397f82756b49bfad272c172d879d4d82555e41a..5ae422948af9317be83afb75a85a6e0ba70220d9 100644 --- a/experiments/california_housing/stage4/omp_with_params.json +++ b/experiments/california_housing/stage4/omp_with_params.json @@ -17,9 +17,7 @@ 2, 3, 4, - 5, - 6, - 7 + 5 ], "subsets_used": "train+dev,train+dev", "normalize_weights": false, @@ -31,7 +29,7 @@ ], "job_number": -1, "extraction_strategy": "omp", - "overwrite": false, + "overwrite": true, "extracted_forest_size": [ 33, 67, diff --git a/experiments/california_housing/stage4/random_with_params.json b/experiments/california_housing/stage4/random_with_params.json index 7859fc51e40eee7f0cb0d091c46240c839cf77d5..ae6b06b65a0f6dedb9197c6ede2bccc52bc40d93 100644 --- a/experiments/california_housing/stage4/random_with_params.json +++ b/experiments/california_housing/stage4/random_with_params.json @@ -17,9 +17,7 @@ 2, 3, 4, - 5, - 6, - 7 + 5 ], "subsets_used": "train+dev,train+dev", "normalize_weights": false, @@ -31,7 +29,7 @@ ], "job_number": -1, "extraction_strategy": "random", - "overwrite": false, + "overwrite": true, "extracted_forest_size": [ 33, 67, diff --git a/results/california_housing/stage4_fix/losses.png b/results/california_housing/stage4_fix/losses.png index dccb6d4883f3f3f56ecab982cdd61451ee0d3f70..7f7d7d89864bb61384dc18c9ff97d9ebd433146c 100644 Binary files a/results/california_housing/stage4_fix/losses.png and b/results/california_housing/stage4_fix/losses.png differ diff --git a/scripts/run_stage4_experiments.sh b/scripts/run_stage4_experiments.sh index cc414f9d4f5b4b65fbaf06826effc9d6e7c4a0b3..4ea2420ab8e91f4ed14154b4d6168580fdf0d6e8 100644 --- a/scripts/run_stage4_experiments.sh +++ b/scripts/run_stage4_experiments.sh @@ -1,14 +1,14 @@ #!/bin/bash -core_number=14 +core_number=5 walltime=1:00 -seeds='1 2 3 4 5 6 7' +seeds='1 2 3 4 5' for dataset in california_housing #for dataset in kin8nm #for dataset in gamma #for dataset in breast_cancer diabetes diamonds california_housing boston linnerud steel-plates kr-vs-kp digits iris kin8nm lfw_pairs linnerud olivetti_faces wine spambase gamma do - oarsub -p "(gpu is null)" -n "$dataset base" -l /core=$core_number,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=none --save_experiment_configuration 4 none_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=1 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev" - oarsub -p "(gpu is null)" -n "$dataset random" -l /core=$core_number,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=random --save_experiment_configuration 4 random_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=2 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev" - oarsub -p "(gpu is null)" -n "$dataset omp" -l /core=$core_number,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=omp --save_experiment_configuration 4 omp_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=3 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev" + oarsub -p "(gpu is null)" -n "$dataset base" -l /core=1,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=none --save_experiment_configuration 4 none_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=1 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev --overwrite" + #oarsub -p "(gpu is null)" -n "$dataset random" -l /core=$core_number,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=random --save_experiment_configuration 4 random_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=2 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev --overwrite" + #oarsub -p "(gpu is null)" -n "$dataset omp" -l /core=$core_number,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=omp --save_experiment_configuration 4 omp_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=3 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev --overwrite" done