diff --git a/experiments/daic/generators/california_housing.sh b/experiments/daic/generators/california_housing.sh index a6676447269ac328b575d5a020bf8d952b4c27ef..0cef54fb0f98a5f00379dba2c709d1f4d8aef0fa 100644 --- a/experiments/daic/generators/california_housing.sh +++ b/experiments/daic/generators/california_housing.sh @@ -1,14 +1,16 @@ #!/bin/bash #SBATCH --job-name="California Housing (ECCCo)" -#SBATCH --time=3:00:00 -#SBATCH --ntasks=1000 -#SBATCH --cpus-per-task=1 +#SBATCH --time=01:40:00 +#SBATCH --ntasks=30 +#SBATCH --cpus-per-task=10 #SBATCH --partition=general -#SBATCH --mem-per-cpu=8GB +#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=california_housing output_path=results mpi > experiments/california_housing.log +source experiments/slurm_header.sh + +srun julia --project=experiments --threads $SLURM_CPUS_PER_TASK experiments/run_experiments.jl -- data=california_housing output_path=results mpi threaded n_individuals=100 n_runs=50 > experiments/logs/california_housing.log diff --git a/experiments/daic/generators/circles.sh b/experiments/daic/generators/circles.sh new file mode 100644 index 0000000000000000000000000000000000000000..c11c2dd7999e5d0154e1c3e062755d42455947e6 --- /dev/null +++ b/experiments/daic/generators/circles.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --job-name="Circles (ECCCo)" +#SBATCH --time=00:45:00 +#SBATCH --ntasks=30 +#SBATCH --cpus-per-task=10 +#SBATCH --partition=general +#SBATCH --mem-per-cpu=2GB +#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 + +source experiments/slurm_header.sh + +srun julia --project=experiments --threads $SLURM_CPUS_PER_TASK experiments/run_experiments.jl -- data=circles output_path=results mpi threaded n_individuals=100 n_runs=50 > experiments/logs/circles.log diff --git a/experiments/daic/generators/credit_default.sh b/experiments/daic/generators/credit_default.sh deleted file mode 100644 index a6676447269ac328b575d5a020bf8d952b4c27ef..0000000000000000000000000000000000000000 --- a/experiments/daic/generators/credit_default.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -#SBATCH --job-name="California Housing (ECCCo)" -#SBATCH --time=3:00:00 -#SBATCH --ntasks=1000 -#SBATCH --cpus-per-task=1 -#SBATCH --partition=general -#SBATCH --mem-per-cpu=8GB -#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=california_housing output_path=results mpi > experiments/california_housing.log diff --git a/experiments/daic/generators/german_credit.sh b/experiments/daic/generators/german_credit.sh index 5ddba96e4f5795780731152de45cba25b803fc8c..3e6adb86b66a74282c744b38284f3ab5e5e7231f 100644 --- a/experiments/daic/generators/german_credit.sh +++ b/experiments/daic/generators/german_credit.sh @@ -1,9 +1,9 @@ #!/bin/bash #SBATCH --job-name="German Credit (ECCCo)" -#SBATCH --time=3:00:00 -#SBATCH --ntasks=1000 -#SBATCH --cpus-per-task=1 +#SBATCH --time=01:40:00 +#SBATCH --ntasks=30 +#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. @@ -11,4 +11,6 @@ module use /opt/insy/modulefiles # Use DAIC INSY software collection module load openmpi -srun julia --project=experiments experiments/run_experiments.jl -- data=german_credit output_path=results mpi > experiments/german_credit.log +source experiments/slurm_header.sh + +srun julia --project=experiments --threads $SLURM_CPUS_PER_TASK experiments/run_experiments.jl -- data=german_credit output_path=results mpi threaded n_individuals=100 n_runs=50 > experiments/logs/german_credit.log diff --git a/experiments/daic/generators/gmsc.sh b/experiments/daic/generators/gmsc.sh index a5fc350c429310207271cc14466a451237f13830..829d537cc6bb011726131ea805be29a99aa19888 100644 --- a/experiments/daic/generators/gmsc.sh +++ b/experiments/daic/generators/gmsc.sh @@ -1,9 +1,9 @@ #!/bin/bash #SBATCH --job-name="GMSC (ECCCo)" -#SBATCH --time=3:00:00 -#SBATCH --ntasks=1000 -#SBATCH --cpus-per-task=1 +#SBATCH --time=01:40:00 +#SBATCH --ntasks=30 +#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. @@ -11,4 +11,6 @@ module use /opt/insy/modulefiles # Use DAIC INSY software collection module load openmpi -srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc output_path=results mpi > experiments/gmsc.log +source experiments/slurm_header.sh + +srun julia --project=experiments --threads $SLURM_CPUS_PER_TASK experiments/run_experiments.jl -- data=gmsc output_path=results mpi threaded n_individuals=100 n_runs=50 > experiments/logs/gmsc.log diff --git a/experiments/daic/generators/linearly_separable.sh b/experiments/daic/generators/linearly_separable.sh new file mode 100644 index 0000000000000000000000000000000000000000..b4a4c93db5d4b6cd85b21a838c06861c2fc7193c --- /dev/null +++ b/experiments/daic/generators/linearly_separable.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --job-name="Linearly Separable (ECCCo)" +#SBATCH --time=00:45:00 +#SBATCH --ntasks=30 +#SBATCH --cpus-per-task=10 +#SBATCH --partition=general +#SBATCH --mem-per-cpu=2GB +#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 + +source experiments/slurm_header.sh + +srun julia --project=experiments --threads $SLURM_CPUS_PER_TASK experiments/run_experiments.jl -- data=linearly_separable output_path=results mpi threaded n_individuals=100 n_runs=50 > experiments/logs/linearly_separable.log diff --git a/experiments/daic/generators/mnist_memory.sh b/experiments/daic/generators/mnist_memory.sh deleted file mode 100644 index 0e164fdbf513ecb4e43d5e708716ac4fb33b1923..0000000000000000000000000000000000000000 --- a/experiments/daic/generators/mnist_memory.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -#SBATCH --job-name="MNIST (ECCCo)" -#SBATCH --time=10:00:00 -#SBATCH --ntasks=150 -#SBATCH --cpus-per-task=1 -#SBATCH --partition=memory -#SBATCH --mem-per-cpu=64GB -#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=mnist output_path=results mpi > experiments/mnist.log diff --git a/experiments/daic/generators/moons.sh b/experiments/daic/generators/moons.sh new file mode 100644 index 0000000000000000000000000000000000000000..9e57f1154c152a955403dd9897e05bfa24c17ff1 --- /dev/null +++ b/experiments/daic/generators/moons.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --job-name="Moons (ECCCo)" +#SBATCH --time=00:45:00 +#SBATCH --ntasks=30 +#SBATCH --cpus-per-task=10 +#SBATCH --partition=general +#SBATCH --mem-per-cpu=2GB +#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 + +source experiments/slurm_header.sh + +srun julia --project=experiments --threads $SLURM_CPUS_PER_TASK experiments/run_experiments.jl -- data=moons output_path=results mpi threaded n_individuals=100 n_runs=50 > experiments/logs/moons.log diff --git a/experiments/daic/generators/synthetic.sh b/experiments/daic/generators/synthetic.sh deleted file mode 100644 index d5fa69ffdd56bd870b13acd52d5a7859960e7610..0000000000000000000000000000000000000000 --- a/experiments/daic/generators/synthetic.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -#SBATCH --job-name="Synthetic (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,moons,circles output_path=results mpi > experiments/synthetic.log diff --git a/experiments/daic/generators/tabular.sh b/experiments/daic/generators/tabular.sh deleted file mode 100644 index da39834638777f158d1311544a87aeac9fe3b33d..0000000000000000000000000000000000000000 --- a/experiments/daic/generators/tabular.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -#SBATCH --job-name="Tabular (ECCCo)" -#SBATCH --time=12:00:00 -#SBATCH --ntasks=1000 -#SBATCH --cpus-per-task=1 -#SBATCH --partition=general -#SBATCH --mem-per-cpu=8GB -#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=gmsc,german_credit,california_housing output_path=results mpi > experiments/tabular.log diff --git a/experiments/grid_search.jl b/experiments/grid_search.jl index 29ee1982ed25f64eb66e8521f1cdf466187c61fc..967cc8a8b5961725c7e3be1059fbf8c372880b0e 100644 --- a/experiments/grid_search.jl +++ b/experiments/grid_search.jl @@ -90,31 +90,11 @@ function grid_search( end outcomes = Dict(:df_params => vcat(df_params...), :df_outcomes => vcat(df_outcomes...)) + # Save: Serialization.serialize( joinpath(grid_search_path, "$(replace(lowercase(dataname), " " => "_")).jls"), outcomes, ) - Serialization.serialize( - joinpath( - grid_search_path, - "$(replace(lowercase(dataname), " " => "_"))_best.jls", - ), - best_absolute_outcome(outcomes), - ) - Serialization.serialize( - joinpath( - grid_search_path, - "$(replace(lowercase(dataname), " " => "_"))_best_eccco.jls", - ), - best_absolute_outcome_eccco(outcomes), - ) - Serialization.serialize( - joinpath( - grid_search_path, - "$(replace(lowercase(dataname), " " => "_"))_best_eccco_delta.jls", - ), - best_absolute_outcome_eccco_Δ(outcomes), - ) end end diff --git a/experiments/jobscripts/generators/california_housing.sh b/experiments/jobscripts/generators/california_housing.sh index 229560c4d03533b6093a4ed77090770a78fdfb37..81fdebbc9e722c69a957a89c500ce50593bdcee7 100644 --- a/experiments/jobscripts/generators/california_housing.sh +++ b/experiments/jobscripts/generators/california_housing.sh @@ -1,7 +1,7 @@ #!/bin/bash #SBATCH --job-name="California Housing (ECCCo)" -#SBATCH --time=01:30:00 +#SBATCH --time=01:40:00 #SBATCH --ntasks=30 #SBATCH --cpus-per-task=10 #SBATCH --partition=compute