From ed67bb4519284747139e304e38a84cf30ea5327d Mon Sep 17 00:00:00 2001
From: Pat Alt <55311242+pat-alt@users.noreply.github.com>
Date: Mon, 18 Sep 2023 14:14:43 +0200
Subject: [PATCH] removed credit default
---
experiments/credit_default.jl | 35 -------------------
experiments/grid_search.jl | 1 +
.../jobscripts/generators/credit_default.sh | 6 ++--
experiments/jobscripts/generators/tabular.sh | 2 +-
.../jobscripts/models/credit_default.sh | 13 -------
.../jobscripts/models/innovation/tabular.sh | 2 +-
.../tuning/generators/california_housing.sh | 14 ++++++++
.../tuning/generators/innovation/tabular.sh | 2 +-
.../jobscripts/tuning/generators/tabular.sh | 2 +-
.../jobscripts/tuning/models/tabular.sh | 2 +-
10 files changed, 23 insertions(+), 56 deletions(-)
delete mode 100644 experiments/credit_default.jl
delete mode 100644 experiments/jobscripts/models/credit_default.sh
create mode 100644 experiments/jobscripts/tuning/generators/california_housing.sh
diff --git a/experiments/credit_default.jl b/experiments/credit_default.jl
deleted file mode 100644
index c74dcf4c..00000000
--- a/experiments/credit_default.jl
+++ /dev/null
@@ -1,35 +0,0 @@
-# Data:
-dataname = "Credit Default"
-counterfactual_data, test_data = train_test_split(load_credit_default(nothing); test_size=TEST_SIZE)
-
-# Model tuning:
-model_tuning_params = DEFAULT_MODEL_TUNING_LARGE
-
-# Tuning parameters:
-tuning_params = DEFAULT_GENERATOR_TUNING
-
-# Parameter choices:
-params = (
- n_hidden=32,
- activation=Flux.relu,
- builder=default_builder(n_hidden=32, n_layers=3, activation=Flux.relu),
- α=[1.0, 1.0, 1e-1],
- sampling_batch_size=10,
- sampling_steps=30,
- use_ensembling=true,
- opt=Flux.Optimise.Descent(0.05)
-)
-
-if !GRID_SEARCH
- run_experiment(
- counterfactual_data, test_data;
- dataname=dataname,
- params...
- )
-else
- grid_search(
- counterfactual_data, test_data;
- dataname=dataname,
- tuning_params=tuning_params
- )
-end
\ No newline at end of file
diff --git a/experiments/grid_search.jl b/experiments/grid_search.jl
index b717695a..07c56e8c 100644
--- a/experiments/grid_search.jl
+++ b/experiments/grid_search.jl
@@ -45,6 +45,7 @@ function grid_search(
# Save:
if !(is_multi_processed(PLZ) && MPI.Comm_rank(PLZ.comm) != 0)
+ Serialization.serialize(joinpath(grid_search_path, "$(replace(lowercase(dataname), " " => "_")).jls"), outcomes)
Serialization.serialize(joinpath(grid_search_path, "$(replace(lowercase(dataname), " " => "_"))_best.jls"), best_outcome(outcomes))
Serialization.serialise(joinpath(grid_search_path, "$(replace(lowercase(dataname), " " => "_"))_best_eccco.jls"), best_eccco(outcomes))
Serialization.serialise(joinpath(grid_search_path, "$(replace(lowercase(dataname), " " => "_"))_best_eccco_Δ.jls"), best_eccco_Δ(outcomes))
diff --git a/experiments/jobscripts/generators/credit_default.sh b/experiments/jobscripts/generators/credit_default.sh
index 93945bf1..e4d99b73 100644
--- a/experiments/jobscripts/generators/credit_default.sh
+++ b/experiments/jobscripts/generators/credit_default.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-#SBATCH --job-name="Credit Default (ECCCo)"
+#SBATCH --job-name="California Housing (ECCCo)"
#SBATCH --time=3:00:00
#SBATCH --ntasks=1000
#SBATCH --cpus-per-task=1
#SBATCH --partition=compute
-#SBATCH --mem-per-cpu=4GB
+#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.
module load 2023r1 openmpi
-srun julia --project=experiments experiments/run_experiments.jl -- data=credit_default output_path=results mpi > experiments/credit_default.log
+srun julia --project=experiments experiments/run_experiments.jl -- data=california_housing output_path=results mpi > experiments/california_housing.log
diff --git a/experiments/jobscripts/generators/tabular.sh b/experiments/jobscripts/generators/tabular.sh
index f7eae4ea..ca32edb2 100644
--- a/experiments/jobscripts/generators/tabular.sh
+++ b/experiments/jobscripts/generators/tabular.sh
@@ -11,4 +11,4 @@
module load 2023r1 openmpi
-srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,credit_default,california_housing output_path=results mpi > experiments/tabular.log
+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/jobscripts/models/credit_default.sh b/experiments/jobscripts/models/credit_default.sh
deleted file mode 100644
index 04e08ca4..00000000
--- a/experiments/jobscripts/models/credit_default.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-#SBATCH --job-name="Train Credit Default (ECCCo)"
-#SBATCH --time=01: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=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/innovation/tabular.sh b/experiments/jobscripts/models/innovation/tabular.sh
index d0461595..71355d1e 100644
--- a/experiments/jobscripts/models/innovation/tabular.sh
+++ b/experiments/jobscripts/models/innovation/tabular.sh
@@ -12,4 +12,4 @@
module load 2023r1 openmpi
-srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,credit_default,california_housing output_path=results only_models > experiments/train_tabular.log
+srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,california_housing output_path=results only_models > experiments/train_tabular.log
diff --git a/experiments/jobscripts/tuning/generators/california_housing.sh b/experiments/jobscripts/tuning/generators/california_housing.sh
new file mode 100644
index 00000000..81b01716
--- /dev/null
+++ b/experiments/jobscripts/tuning/generators/california_housing.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+#SBATCH --job-name="Grid-search California Housing (ECCCo)"
+#SBATCH --time=04:00:00
+#SBATCH --ntasks=1000
+#SBATCH --cpus-per-task=1
+#SBATCH --partition=compute
+#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.
+
+module load 2023r1 openmpi
+
+srun julia --project=experiments experiments/run_experiments.jl -- data=california_housing output_path=results mpi grid_search > experiments/grid_search_california_housing.log
\ No newline at end of file
diff --git a/experiments/jobscripts/tuning/generators/innovation/tabular.sh b/experiments/jobscripts/tuning/generators/innovation/tabular.sh
index a3cea74c..7811a30c 100644
--- a/experiments/jobscripts/tuning/generators/innovation/tabular.sh
+++ b/experiments/jobscripts/tuning/generators/innovation/tabular.sh
@@ -11,4 +11,4 @@
module load 2023r1 openmpi
-srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,credit_default,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,california_housing output_path=results mpi grid_search > experiments/grid_search_tabular.log
\ No newline at end of file
diff --git a/experiments/jobscripts/tuning/generators/tabular.sh b/experiments/jobscripts/tuning/generators/tabular.sh
index d33a49c1..e29c0b0a 100644
--- a/experiments/jobscripts/tuning/generators/tabular.sh
+++ b/experiments/jobscripts/tuning/generators/tabular.sh
@@ -11,4 +11,4 @@
module load 2023r1 openmpi
-srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,credit_default,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,california_housing output_path=results mpi grid_search > experiments/grid_search_tabular.log
\ No newline at end of file
diff --git a/experiments/jobscripts/tuning/models/tabular.sh b/experiments/jobscripts/tuning/models/tabular.sh
index 96bbf45b..c1de9323 100644
--- a/experiments/jobscripts/tuning/models/tabular.sh
+++ b/experiments/jobscripts/tuning/models/tabular.sh
@@ -10,4 +10,4 @@
#SBATCH --account=innovation
#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=gmsc,german_credit,credit_default,california_housing output_path=results tune_model
\ No newline at end of file
+srun julia --project=experiments experiments/run_experiments.jl -- data=gmsc,german_credit,california_housing output_path=results tune_model
\ No newline at end of file
--
GitLab