diff --git a/experiments/daic/testing/lin_sep.sh b/experiments/daic/testing/lin_sep.sh new file mode 100644 index 0000000000000000000000000000000000000000..ff674ad2519fcf268fd73cea929c68d2c7eb9140 --- /dev/null +++ b/experiments/daic/testing/lin_sep.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +#SBATCH --job-name="Grid-search Linearly Separable (ECCCo)" +#SBATCH --time=01:00:00 +#SBATCH --ntasks=100 +#SBATCH --cpus-per-task=1 +#SBATCH --partition=general +#SBATCH --mem-per-cpu=4GB +#SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. + +module use /opt/insy/modulefiles # Use DAIC INSY software collection +module load openmpi + +srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable output_path=results mpi grid_search n_individuals=10 > experiments/grid_search_linearly_separable.log diff --git a/experiments/daic/testing/lin_sep_4each.sh b/experiments/daic/testing/lin_sep_4each.sh new file mode 100644 index 0000000000000000000000000000000000000000..b5891999d6cf399a241f6f782dcfd894feaa07cc --- /dev/null +++ b/experiments/daic/testing/lin_sep_4each.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +#SBATCH --job-name="Grid-search Linearly Separable (ECCCo)" +#SBATCH --time=01:00:00 +#SBATCH --ntasks=100 +#SBATCH --cpus-per-task=1 +#SBATCH --partition=general +#SBATCH --mem-per-cpu=4GB +#SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. + +module use /opt/insy/modulefiles # Use DAIC INSY software collection +module load openmpi + +srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable output_path=results mpi grid_search n_individuals=10 n_each=4 > experiments/grid_search_linearly_separable.log diff --git a/experiments/daic/testing/lin_sep_threaded.sh b/experiments/daic/testing/lin_sep_threaded.sh new file mode 100644 index 0000000000000000000000000000000000000000..b07c5e8048ff0cb9e5c527315da8e22fb95807c7 --- /dev/null +++ b/experiments/daic/testing/lin_sep_threaded.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +#SBATCH --job-name="Grid-search Linearly Separable (ECCCo)" +#SBATCH --time=01:00:00 +#SBATCH --ntasks=10 +#SBATCH --cpus-per-task=10 +#SBATCH --partition=general +#SBATCH --mem-per-cpu=4GB +#SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. + +module use /opt/insy/modulefiles # Use DAIC INSY software collection +module load openmpi + +srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable output_path=results mpi grid_search n_individuals=10 threaded > experiments/grid_search_linearly_separable.log diff --git a/experiments/daic/tuning/generators/linearly_separable.sh b/experiments/daic/tuning/generators/linearly_separable.sh new file mode 100644 index 0000000000000000000000000000000000000000..20d2d855f4a959b31034d78f936187718fd0058a --- /dev/null +++ b/experiments/daic/tuning/generators/linearly_separable.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +#SBATCH --job-name="Grid-search Linearly Separable (ECCCo)" +#SBATCH --time=02:00:00 +#SBATCH --ntasks=1000 +#SBATCH --cpus-per-task=1 +#SBATCH --partition=general +#SBATCH --mem-per-cpu=4GB +#SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. + +module use /opt/insy/modulefiles # Use DAIC INSY software collection +module load openmpi + +srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable output_path=results mpi grid_search > experiments/grid_search_linearly_separable.log diff --git a/experiments/experiment.jl b/experiments/experiment.jl index b1a68c738ba71d7cbac4ba96aa0e3d8143356f8c..a375158e1f71fd22004357cbfd5400a85e40151b 100644 --- a/experiments/experiment.jl +++ b/experiments/experiment.jl @@ -139,7 +139,7 @@ function run_experiment( joinpath(exper.output_path, "$(exper.save_name)_bmk.jls"), outcome.bmk, ) - meta(outcome; save_output = true) + all_meta(outcome; save_output = true) end # Final barrier: diff --git a/experiments/post_processing/meta_data.jl b/experiments/post_processing/meta_data.jl index b50ce9785240e5ff8556139a6b88dc56e87626fc..ab4c982a14ff886e16a5cf7ad59edd86db945700 100644 --- a/experiments/post_processing/meta_data.jl +++ b/experiments/post_processing/meta_data.jl @@ -1,9 +1,9 @@ """ - meta(exper::Experiment) + all_meta(exper::Experiment) Extract and save meta data about the experiment. """ -function meta( +function all_meta( outcome::ExperimentOutcome; save_output::Bool = false, params_path::Union{Nothing,String} = nothing, diff --git a/experiments/save_best.jl b/experiments/save_best.jl index a97c0d4ee4c9ac988c77edfe33ab9a8c010d95c2..977e8720b22e3f9ba9276375d472ad5c8b18f7f5 100644 --- a/experiments/save_best.jl +++ b/experiments/save_best.jl @@ -23,7 +23,7 @@ function save_best(outcomes_file_path::String) joinpath(output_path, "$(exper.save_name)_models.jls"), outcome.model_dict, ) - meta(outcome; save_output = true, params_path = params_path) + all_meta(outcome; save_output = true, params_path = params_path) end function bmk2csv(dataname::String) diff --git a/experiments/setup_env.jl b/experiments/setup_env.jl index a7b2108a8c89bd313c5bae222778cb9c76c6bd55..1f92ef116aa53eef8ffe439a7304e34a49ba5c0f 100644 --- a/experiments/setup_env.jl +++ b/experiments/setup_env.jl @@ -182,12 +182,13 @@ const GRID_SEARCH = "grid_search" ∈ ARGS "Generator tuning parameters." DEFAULT_GENERATOR_TUNING = ( - Λ = [[0.1, 0.1, 0.05], [0.1, 0.1, 0.1], [0.1, 0.1, 0.5], [0.1, 0.1, 1.0]], - reg_strength = [0.0, 0.1, 0.25, 0.5, 1.0], + Λ=[[0.1, 0.1, 0.1], [0.1, 0.1, 0.5],], + reg_strength = [0.0, 0.1, 1.0], opt = [ Descent(0.01), Descent(0.05), - Descent(0.1), + Optimiser(ClipValue(0.01), Descent(0.01)), + Optimiser(ClipValue(0.05), Descent(0.05)), ], decay = [(0.0, 1), (0.01, 1), (0.1, 1)], )