diff --git a/experiments/jobscripts/counterfactuals/california_housing.sh b/experiments/jobscripts/counterfactuals/california_housing.sh index 4160927bd1096d32175534e1f1ff57542d81aaa5..b0364af240ca728ebba95acc11e956ca990b1e12 100644 --- a/experiments/jobscripts/counterfactuals/california_housing.sh +++ b/experiments/jobscripts/counterfactuals/california_housing.sh @@ -2,11 +2,11 @@ #SBATCH --job-name="California Housing (ECCCo)" #SBATCH --time=3:00:00 -#SBATCH --ntasks=48 +#SBATCH --ntasks=1000 #SBATCH --cpus-per-task=1 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/counterfactuals/credit_default.sh b/experiments/jobscripts/counterfactuals/credit_default.sh index eddd787b66ad915964ce78db930931030de1aa0a..93945bf1108f0a6109c61c6579a9ef1609972bf2 100644 --- a/experiments/jobscripts/counterfactuals/credit_default.sh +++ b/experiments/jobscripts/counterfactuals/credit_default.sh @@ -2,11 +2,11 @@ #SBATCH --job-name="Credit Default (ECCCo)" #SBATCH --time=3:00:00 -#SBATCH --ntasks=48 +#SBATCH --ntasks=1000 #SBATCH --cpus-per-task=1 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/counterfactuals/fmnist.sh b/experiments/jobscripts/counterfactuals/fmnist.sh index 9f9eef024fdd9de0185768ab80200af4848a7ea9..c9a2035fa154a9599a11e7bbdfdce5b5c47a5d91 100644 --- a/experiments/jobscripts/counterfactuals/fmnist.sh +++ b/experiments/jobscripts/counterfactuals/fmnist.sh @@ -6,7 +6,7 @@ #SBATCH --cpus-per-task=4 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/counterfactuals/german_credit.sh b/experiments/jobscripts/counterfactuals/german_credit.sh index c6ea1aaf091a0f22a198a13c7166794777f98498..07bc4df73cb137d8262c99c69025520086a7a606 100644 --- a/experiments/jobscripts/counterfactuals/german_credit.sh +++ b/experiments/jobscripts/counterfactuals/german_credit.sh @@ -2,11 +2,11 @@ #SBATCH --job-name="German Credit (ECCCo)" #SBATCH --time=3:00:00 -#SBATCH --ntasks=48 +#SBATCH --ntasks=1000 #SBATCH --cpus-per-task=1 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/counterfactuals/gmsc.sh b/experiments/jobscripts/counterfactuals/gmsc.sh index 6ec22639896b2c78bd33e403e6aa9e9e90144732..d6c9223d7e3a2ab948ebf282bb5e1ef8403e937e 100644 --- a/experiments/jobscripts/counterfactuals/gmsc.sh +++ b/experiments/jobscripts/counterfactuals/gmsc.sh @@ -2,11 +2,11 @@ #SBATCH --job-name="GMSC (ECCCo)" #SBATCH --time=3:00:00 -#SBATCH --ntasks=48 +#SBATCH --ntasks=1000 #SBATCH --cpus-per-task=1 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/counterfactuals/mnist.sh b/experiments/jobscripts/counterfactuals/mnist.sh index 8823002ac8addd0a41b6f90d0b7d20dfb903aa25..7f16991bd9e4076d46612b71dc2583f80cac7dcb 100644 --- a/experiments/jobscripts/counterfactuals/mnist.sh +++ b/experiments/jobscripts/counterfactuals/mnist.sh @@ -2,11 +2,11 @@ #SBATCH --job-name="MNIST (ECCCo)" #SBATCH --time=24:00:00 -#SBATCH --ntasks=48 +#SBATCH --ntasks=1000 #SBATCH --cpus-per-task=1 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/counterfactuals/synthetic.sh b/experiments/jobscripts/counterfactuals/synthetic.sh index 8d026eb88e794288d4bec3815ebd52ad2e609c1a..15e4f31079940c008852c050648d9af775568558 100644 --- a/experiments/jobscripts/counterfactuals/synthetic.sh +++ b/experiments/jobscripts/counterfactuals/synthetic.sh @@ -2,11 +2,11 @@ #SBATCH --job-name="Synthetic (ECCCo)" #SBATCH --time=02:00:00 -#SBATCH --ntasks=48 +#SBATCH --ntasks=1000 #SBATCH --cpus-per-task=1 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/counterfactuals/tabular.sh b/experiments/jobscripts/counterfactuals/tabular.sh index 41f7f1d8f45c4cffa9d4b22f3d2d6a1d50210645..f7eae4eafcb1f4f110bdb22a2c3eb9717ec61c40 100644 --- a/experiments/jobscripts/counterfactuals/tabular.sh +++ b/experiments/jobscripts/counterfactuals/tabular.sh @@ -2,11 +2,11 @@ #SBATCH --job-name="Tabular (ECCCo)" #SBATCH --time=05:00:00 -#SBATCH --ntasks=48 +#SBATCH --ntasks=1000 #SBATCH --cpus-per-task=1 #SBATCH --partition=compute #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. module load 2023r1 openmpi diff --git a/experiments/jobscripts/models/california_housing.sh b/experiments/jobscripts/models/california_housing.sh index feb9bf8b4035e48da508d66b7c0eec8adda73785..105a3ca9acf368e80cedf150bb11dad21f371ab4 100644 --- a/experiments/jobscripts/models/california_housing.sh +++ b/experiments/jobscripts/models/california_housing.sh @@ -7,7 +7,7 @@ #SBATCH --cpus-per-task=1 #SBATCH --partition=gpu #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. srun julia --project=experiments experiments/run_experiments.jl -- data=california_housing output_path=results only_models > experiments/train_california_housing.log \ No newline at end of file diff --git a/experiments/jobscripts/models/credit_default.sh b/experiments/jobscripts/models/credit_default.sh index 875519b427005d81d2e4206dabcaf0603b38b801..04e08ca43104e0bb90ad6310b071c650e9d3154e 100644 --- a/experiments/jobscripts/models/credit_default.sh +++ b/experiments/jobscripts/models/credit_default.sh @@ -7,7 +7,7 @@ #SBATCH --cpus-per-task=1 #SBATCH --partition=gpu #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. srun julia --project=experiments experiments/run_experiments.jl -- data=credit_default output_path=results only_models > experiments/train_credit_default.log \ No newline at end of file diff --git a/experiments/jobscripts/models/german_credit.sh b/experiments/jobscripts/models/german_credit.sh index f1c8d7ca6f56832be12ce7b19332758ae80863ad..678a810814d039d203cf89bd27e277394b6786d4 100644 --- a/experiments/jobscripts/models/german_credit.sh +++ b/experiments/jobscripts/models/german_credit.sh @@ -7,7 +7,7 @@ #SBATCH --cpus-per-task=1 #SBATCH --partition=gpu #SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. srun julia --project=experiments experiments/run_experiments.jl -- data=german_credit output_path=results only_models > experiments/train_german_credit.log \ No newline at end of file diff --git a/experiments/jobscripts/models/mnist.sh b/experiments/jobscripts/models/mnist.sh index 56bcf58a30076374a78a85744b570ef7a85152a5..1b7e34789ba9af8e0e561bed2c813f5c232b08f1 100644 --- a/experiments/jobscripts/models/mnist.sh +++ b/experiments/jobscripts/models/mnist.sh @@ -1,13 +1,13 @@ #!/bin/bash #SBATCH --job-name="Train MNIST (ECCCo)" -#SBATCH --time=01:00:00 +#SBATCH --time=03:00:00 #SBATCH --ntasks=1 #SBATCH --gpus-per-task=1 #SBATCH --cpus-per-task=1 #SBATCH --partition=gpu -#SBATCH --mem-per-cpu=4GB -#SBATCH --account=innovation +#SBATCH --mem-per-cpu=8GB +#SBATCH --account=research-eemcs-insy #SBATCH --mail-type=END # Set mail type to 'END' to receive a mail when the job finishes. srun julia --project=experiments experiments/run_experiments.jl -- data=mnist output_path=results only_models > experiments/train_mnist.log \ No newline at end of file diff --git a/experiments/mnist.jl b/experiments/mnist.jl index bfa851f099b3bb769d433627fbce4f81cb78a0a0..a72e25dbd0e33b01a1114c3133395ae86f6ddc7f 100644 --- a/experiments/mnist.jl +++ b/experiments/mnist.jl @@ -14,6 +14,7 @@ test_data = load_mnist_test() # Additional models: add_models = Dict( "LeNet-5" => lenet5, + "ResNet-18" => resnet18(;epochs=10), ) # Default builder: diff --git a/experiments/models/models.jl b/experiments/models/models.jl index 9aa6306929898ddd546e082ab636dd8ce4c0466b..20f8ee179e1336ef5babcf801fc5be80142025e1 100644 --- a/experiments/models/models.jl +++ b/experiments/models/models.jl @@ -35,12 +35,16 @@ function prepare_models(exper::Experiment) @info "Using additional models." add_models = Dict{Any,Any}() for (k, mod) in exper.additional_models - add_models[k] = mod(; - batch_size=batch_size(exper), - finaliser=exper.finaliser, - loss=exper.loss, - epochs=exper.epochs, - ) + if isa(mod, Function) + add_models[k] = mod(; + batch_size=batch_size(exper), + finaliser=exper.finaliser, + loss=exper.loss, + epochs=exper.epochs, + ) + else + add_models[k] = mod + end end models = merge(models, add_models) end