From 72a5675b1e9c5d38ebb6d506f02edddb6938f03f Mon Sep 17 00:00:00 2001
From: pat-alt <altmeyerpat@gmail.com>
Date: Thu, 19 Oct 2023 11:29:37 +0200
Subject: [PATCH] daic final runs

---
 .../daic/generators/california_housing.sh     | 12 +++++-----
 experiments/daic/generators/circles.sh        | 16 ++++++++++++++
 experiments/daic/generators/credit_default.sh | 14 ------------
 experiments/daic/generators/german_credit.sh  | 10 +++++----
 experiments/daic/generators/gmsc.sh           | 10 +++++----
 .../daic/generators/linearly_separable.sh     | 16 ++++++++++++++
 experiments/daic/generators/mnist_memory.sh   | 14 ------------
 experiments/daic/generators/moons.sh          | 16 ++++++++++++++
 experiments/daic/generators/synthetic.sh      | 14 ------------
 experiments/daic/generators/tabular.sh        | 14 ------------
 experiments/grid_search.jl                    | 22 +------------------
 .../generators/california_housing.sh          |  2 +-
 12 files changed, 69 insertions(+), 91 deletions(-)
 create mode 100644 experiments/daic/generators/circles.sh
 delete mode 100644 experiments/daic/generators/credit_default.sh
 create mode 100644 experiments/daic/generators/linearly_separable.sh
 delete mode 100644 experiments/daic/generators/mnist_memory.sh
 create mode 100644 experiments/daic/generators/moons.sh
 delete mode 100644 experiments/daic/generators/synthetic.sh
 delete mode 100644 experiments/daic/generators/tabular.sh

diff --git a/experiments/daic/generators/california_housing.sh b/experiments/daic/generators/california_housing.sh
index a6676447..0cef54fb 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 00000000..c11c2dd7
--- /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 a6676447..00000000
--- 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 5ddba96e..3e6adb86 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 a5fc350c..829d537c 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 00000000..b4a4c93d
--- /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 0e164fdb..00000000
--- 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 00000000..9e57f115
--- /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 d5fa69ff..00000000
--- 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 da398346..00000000
--- 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 29ee1982..967cc8a8 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 229560c4..81fdebbc 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
-- 
GitLab