From a5ae59878c7d686421775cd6afd2e2c0aa8bb702 Mon Sep 17 00:00:00 2001
From: pat-alt <altmeyerpat@gmail.com>
Date: Mon, 16 Oct 2023 16:29:07 +0200
Subject: [PATCH] added slurm-header

---
 experiments/daic/testing/cali_100_8.sh         |  2 ++
 experiments/daic/testing/cali_50_8.sh          |  2 ++
 experiments/daic/testing/lin_sep.sh            |  3 +--
 experiments/daic/testing/lin_sep_200cpu.sh     | 14 --------------
 experiments/daic/testing/lin_sep_32each.sh     | 14 --------------
 experiments/daic/testing/lin_sep_4each.sh      | 14 --------------
 experiments/daic/testing/lin_sep_no_threads.sh |  2 +-
 7 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 experiments/daic/testing/lin_sep_200cpu.sh
 delete mode 100644 experiments/daic/testing/lin_sep_32each.sh
 delete mode 100644 experiments/daic/testing/lin_sep_4each.sh

diff --git a/experiments/daic/testing/cali_100_8.sh b/experiments/daic/testing/cali_100_8.sh
index 2435ed38..51efed93 100644
--- a/experiments/daic/testing/cali_100_8.sh
+++ b/experiments/daic/testing/cali_100_8.sh
@@ -11,5 +11,7 @@
 module use /opt/insy/modulefiles          # Use DAIC INSY software collection
 module load openmpi
 
+source experiments/slurm_header.sh
+
 srun julia --project=experiments experiments/run_experiments.jl -- data=california_housing output_path=results mpi grid_search n_individuals=10 > experiments/grid_search_california_housing.log
 
diff --git a/experiments/daic/testing/cali_50_8.sh b/experiments/daic/testing/cali_50_8.sh
index 177e8215..aa671662 100644
--- a/experiments/daic/testing/cali_50_8.sh
+++ b/experiments/daic/testing/cali_50_8.sh
@@ -11,5 +11,7 @@
 module use /opt/insy/modulefiles          # Use DAIC INSY software collection
 module load openmpi
 
+source experiments/slurm_header.sh
+
 srun julia --project=experiments experiments/run_experiments.jl -- data=california_housing output_path=results mpi grid_search n_individuals=10 n_each=16 > experiments/grid_search_california_housing.log
 
diff --git a/experiments/daic/testing/lin_sep.sh b/experiments/daic/testing/lin_sep.sh
index 765609ad..80fee770 100644
--- a/experiments/daic/testing/lin_sep.sh
+++ b/experiments/daic/testing/lin_sep.sh
@@ -11,7 +11,6 @@
 module use /opt/insy/modulefiles          # Use DAIC INSY software collection
 module load openmpi
 
-set -x
-export SRUN_CPUS_PER_TASK="$SLURM_CPUS_PER_TASK"
+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 grid_search n_individuals=10 threaded > experiments/grid_search_linearly_separable.log
diff --git a/experiments/daic/testing/lin_sep_200cpu.sh b/experiments/daic/testing/lin_sep_200cpu.sh
deleted file mode 100644
index 173f6469..00000000
--- a/experiments/daic/testing/lin_sep_200cpu.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-#SBATCH --job-name="Grid-search Linearly Separable (ECCCo)"
-#SBATCH --time=00:30:00
-#SBATCH --ntasks=200
-#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 output_path=results mpi grid_search n_individuals=10 > experiments/grid_search_linearly_separable.log
diff --git a/experiments/daic/testing/lin_sep_32each.sh b/experiments/daic/testing/lin_sep_32each.sh
deleted file mode 100644
index ff674ad2..00000000
--- a/experiments/daic/testing/lin_sep_32each.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-#SBATCH --job-name="Grid-search Linearly Separable (ECCCo)"
-#SBATCH --time=01:00:00
-#SBATCH --ntasks=100
-#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 output_path=results mpi grid_search n_individuals=10 > experiments/grid_search_linearly_separable.log
diff --git a/experiments/daic/testing/lin_sep_4each.sh b/experiments/daic/testing/lin_sep_4each.sh
deleted file mode 100644
index b5891999..00000000
--- a/experiments/daic/testing/lin_sep_4each.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-#SBATCH --job-name="Grid-search Linearly Separable (ECCCo)"
-#SBATCH --time=01:00:00
-#SBATCH --ntasks=100
-#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 output_path=results mpi grid_search n_individuals=10 n_each=4 > experiments/grid_search_linearly_separable.log
diff --git a/experiments/daic/testing/lin_sep_no_threads.sh b/experiments/daic/testing/lin_sep_no_threads.sh
index 0b84c07b..d69ea69a 100644
--- a/experiments/daic/testing/lin_sep_no_threads.sh
+++ b/experiments/daic/testing/lin_sep_no_threads.sh
@@ -11,6 +11,6 @@
 module use /opt/insy/modulefiles          # Use DAIC INSY software collection
 module load openmpi
 
-export SRUN_CPUS_PER_TASK="$SLURM_CPUS_PER_TASK"
+source experiments/slurm_header.sh
 
 srun julia --project=experiments experiments/run_experiments.jl -- data=linearly_separable output_path=results mpi grid_search n_individuals=10 > experiments/grid_search_linearly_separable.log
-- 
GitLab