From e3bfed0c48c6d0685f910e631418df24cb5803ec Mon Sep 17 00:00:00 2001
From: Pat Alt <55311242+pat-alt@users.noreply.github.com>
Date: Tue, 19 Sep 2023 08:44:55 +0200
Subject: [PATCH] time increased for tabular and cali

---
 experiments/jobscripts/generators/tabular.sh                  | 2 +-
 .../jobscripts/tuning/generators/california_housing.sh        | 2 +-
 experiments/jobscripts/tuning/generators/tabular.sh           | 4 ++--
 experiments/mnist.jl                                          | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/experiments/jobscripts/generators/tabular.sh b/experiments/jobscripts/generators/tabular.sh
index 6e2ce646..43b43b6f 100644
--- a/experiments/jobscripts/generators/tabular.sh
+++ b/experiments/jobscripts/generators/tabular.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #SBATCH --job-name="Tabular (ECCCo)"
-#SBATCH --time=05:00:00
+#SBATCH --time=12:00:00
 #SBATCH --ntasks=1000
 #SBATCH --cpus-per-task=1
 #SBATCH --partition=compute
diff --git a/experiments/jobscripts/tuning/generators/california_housing.sh b/experiments/jobscripts/tuning/generators/california_housing.sh
index ca0bc737..c6d29b36 100644
--- a/experiments/jobscripts/tuning/generators/california_housing.sh
+++ b/experiments/jobscripts/tuning/generators/california_housing.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #SBATCH --job-name="Grid-search California Housing (ECCCo)"
-#SBATCH --time=05:00:00
+#SBATCH --time=12:00:00
 #SBATCH --ntasks=1000
 #SBATCH --cpus-per-task=1
 #SBATCH --partition=compute
diff --git a/experiments/jobscripts/tuning/generators/tabular.sh b/experiments/jobscripts/tuning/generators/tabular.sh
index e29c0b0a..b8380d76 100644
--- a/experiments/jobscripts/tuning/generators/tabular.sh
+++ b/experiments/jobscripts/tuning/generators/tabular.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #SBATCH --job-name="Grid-search Tabular (ECCCo)"
-#SBATCH --time=10:00:00
+#SBATCH --time=16:00:00
 #SBATCH --ntasks=1000
 #SBATCH --cpus-per-task=1
 #SBATCH --partition=compute
@@ -11,4 +11,4 @@
 
 module load 2023r1 openmpi
 
-srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,california_housing output_path=results mpi grid_search > experiments/grid_search_tabular.log
\ No newline at end of file
+srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit output_path=results mpi grid_search > experiments/grid_search_tabular.log
\ No newline at end of file
diff --git a/experiments/mnist.jl b/experiments/mnist.jl
index 34aae4c3..e23e52e4 100644
--- a/experiments/mnist.jl
+++ b/experiments/mnist.jl
@@ -41,7 +41,8 @@ params = (
     niter_eccco=500,
     Λ=[0.1, 0.25, 0.25],
     Λ_Δ=[0.1, 0.1, 2.5],
-    opt=Flux.Optimise.Adam(0.1)
+    opt=Flux.Optimise.Descent(0.1),
+    reg_strength = 0
 )
 
 if !GRID_SEARCH
-- 
GitLab