diff --git a/experiments/experiment.jl b/experiments/experiment.jl index 9ee91331d820632af36d44e77303757831f9c33c..69db290c616bdf8d6183afdee62d82aba34078b6 100644 --- a/experiments/experiment.jl +++ b/experiments/experiment.jl @@ -54,11 +54,11 @@ end Train the models specified by `exper` and store them in `outcome`. """ -function train_models!(outcome::ExperimentOutcome, exper::Experiment) +function train_models!(outcome::ExperimentOutcome, exper::Experiment; save_meta::Bool=false) model_dict = prepare_models(exper) outcome.model_dict = model_dict if !(is_multi_processed(exper) && MPI.Comm_rank(exper.parallelizer.comm) != 0) - meta_model_performance(outcome) + meta_model_performance(outcome; save_output=save_meta) end end @@ -96,9 +96,12 @@ function run_experiment(exper::Experiment; save_output::Bool=true, only_models:: end # Model training: - train_models!(outcome, exper) - # Return if only models are needed: - !only_models || return outcome + if only_models + train_models!(outcome, exper; save_meta=true) + return outcome + else + train_models!(outcome, exper) + end # Benchmark: benchmark!(outcome, exper) diff --git a/experiments/jobscripts/tuning/generators/innovation/synthetic.sh b/experiments/jobscripts/tuning/generators/innovation/synthetic.sh new file mode 100644 index 0000000000000000000000000000000000000000..00326abff6a10082f973a368e20e8d3d5c52384b --- /dev/null +++ b/experiments/jobscripts/tuning/generators/innovation/synthetic.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +#SBATCH --job-name="Grid-search Synthetic (ECCCo)" +#SBATCH --time=06:00:00 +#SBATCH --ntasks=48 +#SBATCH --cpus-per-task=1 +#SBATCH --partition=compute +#SBATCH --mem-per-cpu=4GB +#SBATCH --account=innovation +#SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. + +module load 2023r1 openmpi + +srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable,moons,circles output_path=results mpi grid_search > experiments/grid_search_synthetic.log diff --git a/experiments/jobscripts/tuning/generators/innovation/tabular.sh b/experiments/jobscripts/tuning/generators/innovation/tabular.sh new file mode 100644 index 0000000000000000000000000000000000000000..a3cea74ce46bf07ed9f77d82f9f4f55680e05da3 --- /dev/null +++ b/experiments/jobscripts/tuning/generators/innovation/tabular.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +#SBATCH --job-name="Grid-search Tabular (ECCCo)" +#SBATCH --time=16:00:00 +#SBATCH --ntasks=48 +#SBATCH --cpus-per-task=1 +#SBATCH --partition=compute +#SBATCH --mem-per-cpu=4GB +#SBATCH --account=innovation +#SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. + +module load 2023r1 openmpi + +srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,credit_default,california_housing output_path=results mpi grid_search > experiments/grid_search_tabular.log \ No newline at end of file diff --git a/experiments/jobscripts/tuning/generators/synthetic.sh b/experiments/jobscripts/tuning/generators/synthetic.sh index 10246f049e008da2eb5ac2c30208c567e2f22cd7..578bcf08415364bf8d25df93a42eb71de764e304 100644 --- a/experiments/jobscripts/tuning/generators/synthetic.sh +++ b/experiments/jobscripts/tuning/generators/synthetic.sh @@ -11,4 +11,4 @@ module load 2023r1 openmpi -srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable,moons,circles output_path=results mpi grid_search > experiments/synthetic.log +srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable,moons,circles output_path=results mpi grid_search > experiments/grid_search_synthetic.log diff --git a/experiments/jobscripts/tuning/generators/tabular.sh b/experiments/jobscripts/tuning/generators/tabular.sh index 1aa26ced1280b314dbaef56b7195c9666fc59570..8cf5e9666b41cdcb0091109a2bcf5f14a18970c2 100644 --- a/experiments/jobscripts/tuning/generators/tabular.sh +++ b/experiments/jobscripts/tuning/generators/tabular.sh @@ -11,4 +11,4 @@ module load 2023r1 openmpi -srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,credit_default,california_housing output_path=results mpi grid_search > experiments/synthetic.log \ No newline at end of file +srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,credit_default,california_housing output_path=results mpi grid_search > experiments/grid_search_tabular.log \ No newline at end of file