From 6edbb422b84225df6e4eb0917dbb475119b6562a Mon Sep 17 00:00:00 2001
From: Pierre LOTTE <pierrelotte.dev@gmail.com>
Date: Wed, 9 Oct 2024 18:53:52 +0200
Subject: [PATCH] Change scripts

---
 scripts/gen_config.sh    | 28 ++++++++++++++--------------
 scripts/smd_machine_1.sh |  6 +++---
 scripts/smd_machine_2.sh |  6 +++---
 scripts/smd_machine_3.sh |  4 ++--
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/scripts/gen_config.sh b/scripts/gen_config.sh
index 29872c6..d2f0285 100755
--- a/scripts/gen_config.sh
+++ b/scripts/gen_config.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 
-mkdir paradise/config
+mkdir paradise/config-max
 
-poetry run paradise/config_maker/config_maker.py -d 2 -l 20000 -c 0.1 1 5 10 -s 1 2 -o config
-poetry run paradise/config_maker/config_maker.py -d 4 -l 20000 -c 0.1 1 5 10 -s 1 2 4 -o config
-poetry run paradise/config_maker/config_maker.py -d 6 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 -o config
-poetry run paradise/config_maker/config_maker.py -d 8 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 -o config
-poetry run paradise/config_maker/config_maker.py -d 10 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 -o config
-poetry run paradise/config_maker/config_maker.py -d 15 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 -o config
-poetry run paradise/config_maker/config_maker.py -d 20 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 -o config
-poetry run paradise/config_maker/config_maker.py -d 25 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 -o config
-poetry run paradise/config_maker/config_maker.py -d 30 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 15 -o config
-poetry run paradise/config_maker/config_maker.py -d 35 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 15 -o config
-poetry run paradise/config_maker/config_maker.py -d 40 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 15 20 -o config
-poetry run paradise/config_maker/config_maker.py -d 45 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 15 20 -o config
-poetry run paradise/config_maker/config_maker.py -d 50 -l 20000 -c 0.1 1 5 10 -s 1 2 4 6 8 10 15 20 -o config
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 2 -l 20000 -c 0.1 1 5 10 -s 1 2 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 4 -l 20000 -c 0.1 1 5 10 -s 1 2 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 6 -l 20000 -c 0.1 1 5 10 -s 1 2 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 8 -l 20000 -c 0.1 1 5 10 -s 1 2 4 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 10 -l 20000 -c 0.1 1 5 10 -s 1 4 6 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 15 -l 20000 -c 0.1 1 5 10 -s 1 4 8 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 20 -l 20000 -c 0.1 1 5 10 -s 1 4 8 10 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 25 -l 20000 -c 0.1 1 5 10 -s 1 4 8 10 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 30 -l 20000 -c 0.1 1 5 10 -s 1 4 8 10 15 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 35 -l 20000 -c 0.1 1 5 10 -s 1 4 8 10 15 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 40 -l 20000 -c 0.1 1 5 10 -s 1 4 8 10 20 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 45 -l 20000 -c 0.1 1 5 10 -s 1 4 8 10 20 -o config-max
+~/.local/bin/poetry run python paradise/config_maker/config_maker.py -d 50 -l 20000 -c 0.1 1 5 10 -s 1 4 8 10 20 -o config-max
diff --git a/scripts/smd_machine_1.sh b/scripts/smd_machine_1.sh
index c87b204..a88ffee 100644
--- a/scripts/smd_machine_1.sh
+++ b/scripts/smd_machine_1.sh
@@ -2,14 +2,14 @@
 # Options SBATCH:
 #SBATCH --job-name=SMD_Machine_1
 #SBATCH --cpus-per-task=12
-#SBATCH --array=1-8%2
+#SBATCH --array=1-8%4
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
 #SBATCH --output=output/smd-machine-1-%j.out
 #SBATCH --error=output/smd-machine-1-%j.err
 
-#SBATCH --partition=24CPUNodes
+#SBATCH --partition=48CPUNodes
 
 # Traitement
-srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /home/plotte/.local/bin/poetry run python paradise/main.py -c output/SMD/machine-1-$SLURM_ARRAY_TASK_ID -a kmeans health_esn deepant iforest lof if_lof -i SMD -s train
+srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /home/plotte/.local/bin/poetry run python paradise/main.py -c output/SMD-no-merge-kmeans/machine-1-$SLURM_ARRAY_TASK_ID -a kmeans health_esn deepant iforest lof if_lof -i SMD-no-merge-kmeans -m kmeans -s train
diff --git a/scripts/smd_machine_2.sh b/scripts/smd_machine_2.sh
index 412c973..836ffcc 100644
--- a/scripts/smd_machine_2.sh
+++ b/scripts/smd_machine_2.sh
@@ -2,14 +2,14 @@
 # Options SBATCH:
 #SBATCH --job-name=SMD_Machine_2
 #SBATCH --cpus-per-task=12
-#SBATCH --array=1-9%2
+#SBATCH --array=1-9%4
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
 #SBATCH --output=output/smd-machine-2-%j.out
 #SBATCH --error=output/smd-machine-2-%j.err
 
-#SBATCH --partition=24CPUNodes
+#SBATCH --partition=48CPUNodes
 
 # Traitement
-srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /home/plotte/.local/bin/poetry run python paradise/main.py -c output/SMD/machine-2-$SLURM_ARRAY_TASK_ID -a kmeans health_esn deepant iforest lof if_lof -i SMD -s train
+srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /home/plotte/.local/bin/poetry run python paradise/main.py -c output/SMD-no-merge-kmeans/machine-2-$SLURM_ARRAY_TASK_ID -a kmeans health_esn deepant iforest lof if_lof -i SMD-no-merge-kmeans -m kmeans -s train
diff --git a/scripts/smd_machine_3.sh b/scripts/smd_machine_3.sh
index f1a8c31..e1ad848 100644
--- a/scripts/smd_machine_3.sh
+++ b/scripts/smd_machine_3.sh
@@ -2,7 +2,7 @@
 # Options SBATCH:
 #SBATCH --job-name=SMD_Machine_3
 #SBATCH --cpus-per-task=12
-#SBATCH --array=1-11%3
+#SBATCH --array=1-11%4
 
 #SBATCH --mail-type=END
 #SBATCH --mail-user=pierre.lotte@irit.fr
@@ -12,4 +12,4 @@
 #SBATCH --partition=48CPUNodes
 
 # Traitement
-srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /home/plotte/.local/bin/poetry run python paradise/main.py -c output/SMD/machine-3-$SLURM_ARRAY_TASK_ID -a kmeans health_esn deepant iforest lof if_lof -i SMD -s train
+srun singularity exec /apps/containerCollections/CUDA12/pytorch2-NGC-24-02.sif /home/plotte/.local/bin/poetry run python paradise/main.py -c output/SMD-no-merge-kmeans/machine-3-$SLURM_ARRAY_TASK_ID -a kmeans health_esn deepant iforest lof if_lof -i SMD-no-merge-kmeans -m kmeans -s train
-- 
GitLab