From 115a8d80b57e17fc7fbdf3966bebde69103662bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Harl=C3=A9?= <antoh@cedar5.cedar.computecanada.ca>
Date: Tue, 23 Jun 2020 08:13:40 -0700
Subject: [PATCH] Cleaner setup

---
 jobs/benchmark.sh | 29 +++++++++++++++++++++++++++++
 jobs/setup_env.sh |  6 ++++--
 jobs/test.sh      |  8 ++++----
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 jobs/benchmark.sh

diff --git a/jobs/benchmark.sh b/jobs/benchmark.sh
new file mode 100644
index 0000000..f3172da
--- /dev/null
+++ b/jobs/benchmark.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#SBATCH --gres=gpu:1 #v100l:1    # https://docs.computecanada.ca/wiki/Using_GPUs_with_Slurm
+#SBATCH --cpus-per-task=6 #6  # Cores proportional to GPUs: 6 on Cedar, 16 on Graham.
+#SBATCH --mem=32000M  #32000M       # Memory proportional to CPUs: 32000 Cedar, 64000 Graham.
+#SBATCH --account=def-mpederso
+#SBATCH --time=10:00:00
+#SBATCH --job-name=Benchmark-MyLeNetMatNormalNoceil
+#SBATCH --output=log/%x-%j.out
+#SBATCH --mail-user=harle.collette.antoine@gmail.com
+#SBATCH --mail-type=END
+#SBATCH --mail-type=FAIL
+#SBATCH --array=1-3
+
+
+
+# Setup
+source ~/virtual_env/stoch_pool/bin/activate
+
+#Execute
+cd ../
+
+time python main.py \
+    -n MyLeNetMatNormalNoceil \
+    -ep 100 \
+    -sc cosine \
+    -lr 5e-2 \
+    -rf '../res/benchmark_NoCeil/' \
+    -k 1 \
+    -pf __k1_$SLURM_ARRAY_TASK_ID
\ No newline at end of file
diff --git a/jobs/setup_env.sh b/jobs/setup_env.sh
index 29c6aa1..3d2364c 100644
--- a/jobs/setup_env.sh
+++ b/jobs/setup_env.sh
@@ -9,9 +9,11 @@
 
 # Setup
 #sudo rm -rf ~/dataug/
+cd ~
+mkdir virtual_env
 module load python/3.7.4
-virtualenv --no-download ~/stoch_pool
-source ~/stoch_pool/bin/activate
+virtualenv --no-download ~/virtual_env/stoch_pool
+source ~/virtual_env/stoch_pool/bin/activate
 pip install --no-index --upgrade pip
 
 pip install --no-index torch torchvision #torchviz
diff --git a/jobs/test.sh b/jobs/test.sh
index 99eed79..fa22adc 100644
--- a/jobs/test.sh
+++ b/jobs/test.sh
@@ -4,7 +4,7 @@
 #SBATCH --mem=32000M  #32000M       # Memory proportional to CPUs: 32000 Cedar, 64000 Graham.
 #SBATCH --account=def-mpederso
 #SBATCH --time=1:00:00
-#SBATCH --job-name=MyLeNetMatNormalNoceil
+#SBATCH --job-name=MyLeNetMatStochBUNoceil
 #SBATCH --output=log/%x-%j.out
 #SBATCH --mail-user=harle.collette.antoine@gmail.com
 #SBATCH --mail-type=END
@@ -12,15 +12,15 @@
 
 
 # Setup
-source ~/stoch_pool/bin/activate
+source ~/virtual_env/stoch_pool/bin/activate
 
 #Execute
 # echo $(pwd) = /home/antoh/projects/def-mpederso/antoh/stoch/jobs
 cd ../
 
 time python main.py \
-    -n MyLeNetMatNormalNoceil \
+    -n MyLeNetMatStochBUNoceil \
     -ep 10 \
     -sc cosine \
     -lr 5e-2 \
-    -pf _noCrop
\ No newline at end of file
+    -pf _noCrop_k3
\ No newline at end of file