From bc8c3a91edf588fa2536529e3817377c02b08fab Mon Sep 17 00:00:00 2001
From: Pierre LOTTE <pierrelotte.dev@gmail.com>
Date: Wed, 25 Sep 2024 16:30:06 +0200
Subject: [PATCH] Update of the scripts

---
 scripts/smd_full_run.sh          | 16 ----------------
 scripts/smd_machine_1.sh         | 10 +++++-----
 scripts/smd_machine_2.sh         | 10 +++++-----
 scripts/smd_machine_3.sh         | 10 +++++-----
 scripts/swat_full_run.sh         |  9 ++++-----
 scripts/synthetiques_full_run.sh |  2 +-
 scripts/wadi_full_run.sh         |  9 ++++-----
 7 files changed, 24 insertions(+), 42 deletions(-)
 delete mode 100644 scripts/smd_full_run.sh

diff --git a/scripts/smd_full_run.sh b/scripts/smd_full_run.sh
deleted file mode 100644
index 5921c7b..0000000
--- a/scripts/smd_full_run.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Options SBATCH:
-#SBATCH --job-name=SMD_Full_run
-#SBATCH --ntasks=1
-#SBATCH --cpus-per-task=4
-
-#SBATCH --mail-type=END
-#SBATCH --mail-user=pierre.lotte@irit.fr
-#SBATCH --output=output/smd-%j.out
-#SBATCH --error=output/smd-%j.err
-
-#SBATCH --partition=GPUNodes
-#SBATCH --gres=gpu:1
-
-# Traitement
-srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /projects/sig/plotte/tsg_env/bin/python ./main.py -c output/SMD/* -a kmeans health_esn random_black_forest deepant -i SMD -s train
diff --git a/scripts/smd_machine_1.sh b/scripts/smd_machine_1.sh
index 3d8daa1..6ab2a80 100644
--- a/scripts/smd_machine_1.sh
+++ b/scripts/smd_machine_1.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 # Options SBATCH:
-#SBATCH --job-name=SMD_Full_run
-#SBATCH --cpus-per-task=4
-#SBATCH --array=1-8%4
+#SBATCH --job-name=SMD_Machine_1
+#SBATCH --cpus-per-task=8
+#SBATCH --array=1-8%3
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
-#SBATCH --output=output/smd-%j.out
-#SBATCH --error=output/smd-%j.err
+#SBATCH --output=output/smd-machine-1-%j.out
+#SBATCH --error=output/smd-machine-1-%j.err
 
 #SBATCH --partition=24CPUNodes
 
diff --git a/scripts/smd_machine_2.sh b/scripts/smd_machine_2.sh
index 3567cf8..266e6e3 100644
--- a/scripts/smd_machine_2.sh
+++ b/scripts/smd_machine_2.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 # Options SBATCH:
-#SBATCH --job-name=SMD_Full_run
-#SBATCH --cpus-per-task=4
-#SBATCH --array=1-8%4
+#SBATCH --job-name=SMD_Machine_2
+#SBATCH --cpus-per-task=8
+#SBATCH --array=1-8%3
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
-#SBATCH --output=output/smd-%j.out
-#SBATCH --error=output/smd-%j.err
+#SBATCH --output=output/smd-machine-2-%j.out
+#SBATCH --error=output/smd-machine-2-%j.err
 
 #SBATCH --partition=24CPUNodes
 
diff --git a/scripts/smd_machine_3.sh b/scripts/smd_machine_3.sh
index e30fe9a..a60b541 100644
--- a/scripts/smd_machine_3.sh
+++ b/scripts/smd_machine_3.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 # Options SBATCH:
-#SBATCH --job-name=SMD_Full_run
-#SBATCH --cpus-per-task=4
-#SBATCH --array=1-11%4
+#SBATCH --job-name=SMD_Machine_3
+#SBATCH --cpus-per-task=8
+#SBATCH --array=1-11%3
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
-#SBATCH --output=output/smd-%j.out
-#SBATCH --error=output/smd-%j.err
+#SBATCH --output=output/smd-machine-3-%j.out
+#SBATCH --error=output/smd-machine-3-%j.err
 
 #SBATCH --partition=24CPUNodes
 
diff --git a/scripts/swat_full_run.sh b/scripts/swat_full_run.sh
index b33b788..9c85061 100644
--- a/scripts/swat_full_run.sh
+++ b/scripts/swat_full_run.sh
@@ -1,16 +1,15 @@
 #!/bin/sh
 # Options SBATCH:
-#SBATCH --job-name=SWaT_Full_run
+#SBATCH --job-name=SWaT
 #SBATCH --ntasks=1
-#SBATCH --cpus-per-task=4
+#SBATCH --cpus-per-task=8
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
 #SBATCH --output=output/swat-%j.out
 #SBATCH --error=output/swat-%j.err
 
-#SBATCH --partition=GPUNodes
-#SBATCH --gres=gpu:1
+#SBATCH --partition=24CPUNodes
 
 # Traitement
-srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /projects/sig/plotte/tsg_env/bin/python ./main.py -c output/SWaT/default -a kmeans health_esn random_black_forest deepant -i SWaT -s train
+srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /projects/sig/plotte/tsg_env/bin/python ./main.py -c output/SWaT/default -a kmeans health_esn deepant lstm_ad iforest if_lof lof -i SWaT -s train
diff --git a/scripts/synthetiques_full_run.sh b/scripts/synthetiques_full_run.sh
index 355c7ec..67bd855 100644
--- a/scripts/synthetiques_full_run.sh
+++ b/scripts/synthetiques_full_run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Options SBATCH:
-#SBATCH --job-name=Synthetique_param_default
+#SBATCH --job-name=Synthetique
 #SBATCH --cpus-per-task=8
 #SBATCH --array=1-20%6
 
diff --git a/scripts/wadi_full_run.sh b/scripts/wadi_full_run.sh
index 5c4cb74..e4131d3 100644
--- a/scripts/wadi_full_run.sh
+++ b/scripts/wadi_full_run.sh
@@ -1,16 +1,15 @@
 #!/bin/sh
 # Options SBATCH:
-#SBATCH --job-name=WADI_Full_run
+#SBATCH --job-name=WADI
 #SBATCH --ntasks=1
-#SBATCH --cpus-per-task=4
+#SBATCH --cpus-per-task=8
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
 #SBATCH --output=output/wadi-%j.out
 #SBATCH --error=output/wadi-%j.err
 
-#SBATCH --partition=GPUNodes
-#SBATCH --gres=gpu:1
+#SBATCH --partition=24CPUNodes
 
 # Traitement
-srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /projects/sig/plotte/tsg_env/bin/python ./main.py -c output/WADI/default -a kmeans health_esn random_black_forest deepant -i WADI -s train
+srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /projects/sig/plotte/tsg_env/bin/python ./main.py -c output/WADI/default -a kmeans health_esn deepant lstm_ad iforest if_lof lof -i WADI -s train
-- 
GitLab