Merge branch 'structure_modification' into dev

restructuration

test_scripts/frioul/hybrid.sh → test_scripts/frioul/hybrid/cache.sh

@@ -5,7 +5,7 @@
 #SBATCH --ntasks-per-node=4
 #SBATCH --cpus-per-task=17
 #SBATCH --time=0:40:00
-#SBATCH -C quad,cache|quad,flat 
+#SBATCH -C quad,cache
 #SBATCH --exclusive
 #SBATCH --mem=50GB
 #SBATCH --output hybrid.output.slurm 
@@ -26,5 +26,5 @@ ulimit -s unlimited
 
 rm -f *.out
 
-srun ../../bin/hello_hybrid
+srun ../../../bin/hello_hybrid
 

test_scripts/frioul/hybrid/flat.sh

+#!/bin/bash
+#SBATCH -J hybrid
+#SBATCH --nodes=7
+#SBATCH --ntasks=28
+#SBATCH --ntasks-per-node=4
+#SBATCH --cpus-per-task=17
+#SBATCH --time=0:40:00
+#SBATCH -C quad,flat 
+#SBATCH --exclusive
+#SBATCH --mem=50GB
+#SBATCH --output hybrid.output.slurm 
+
+set -e
+
+export I_MPI_DOMAIN=auto
+export I_MPI_PIN_RESPECT_CPUSET=0
+
+#Make sure that OMP_NUM_THREADS = cpus-per-task * KMP_HW_SUBSET
+export KMP_HW_SUBSET=1T
+export OMP_NUM_THREADS=17
+export KMP_AFFINITY=compact,1,0,granularity=fine
+
+module load intel intelmpi
+
+ulimit -s unlimited
+
+rm -f *.out
+
+srun ../../../bin/hello_hybrid
+

test_scripts/frioul/mpi/cache.sh

+#!/bin/bash
+#SBATCH -J mpi
+#SBATCH --nodes=7
+#SBATCH --ntasks=476
+#SBATCH --ntasks-per-node=68
+#SBATCH --cpus-per-task=1
+#SBATCH --time=0:40:00
+#SBATCH -C quad,cache
+#SBATCH --exclusive
+#SBATCH --mem=50GB
+#SBATCH --output mpi.output.slurm 
+
+set -e
+
+export I_MPI_DOMAIN=auto
+export I_MPI_PIN_RESPECT_CPUSET=0
+
+
+module load intel intelmpi
+
+ulimit -s unlimited
+
+srun ../../../bin/hello_mpi
+
+

test_scripts/frioul/mpi.sh → test_scripts/frioul/mpi/flat.sh

@@ -20,6 +20,6 @@ module load intel intelmpi
 
 ulimit -s unlimited
 
-srun ../../bin/hello_mpi
+srun ../../../bin/hello_mpi
 
 

test_scripts/frioul/mpi_mixed.sh → test_scripts/frioul/mpi/flat_and_cache.sh

@@ -9,13 +9,6 @@
 #EXPLICIT AND
 #SBATCH -C [quad,flat*4&quad,cache*3]
 
-#EXCLUSIVE OR
-#SBATCH --constraint=[flat|cache]
-
-#OR  
-#SBATCH -C flat|cache
-
-
 #SBATCH --exclusive
 #SBATCH --mem=50GB
 #SBATCH --output mpi.output.slurm 
@@ -30,6 +23,6 @@ module load intel intelmpi
 
 ulimit -s unlimited
 
-srun ../../bin/hello_mpi
+srun ../../../bin/hello_mpi
 
 

test_scripts/frioul/mpi/flat_or_cache.sh

+#!/bin/bash
+#SBATCH -J mpi
+#SBATCH --nodes=7
+#SBATCH --ntasks=476
+#SBATCH --ntasks-per-node=68
+#SBATCH --cpus-per-task=1
+#SBATCH --time=0:40:00
+
+#OR  
+#SBATCH -C flat|cache
+
+#SBATCH --exclusive
+#SBATCH --mem=50GB
+#SBATCH --output mpi.output.slurm 
+
+set -e
+
+export I_MPI_DOMAIN=auto
+export I_MPI_PIN_RESPECT_CPUSET=0
+
+
+module load intel intelmpi
+
+ulimit -s unlimited
+
+srun ../../../bin/hello_mpi
+
+

test_scripts/frioul/mpi/flat_xor_cache.sh

+#!/bin/bash
+#SBATCH -J mpi
+#SBATCH --nodes=7
+#SBATCH --ntasks=476
+#SBATCH --ntasks-per-node=68
+#SBATCH --cpus-per-task=1
+#SBATCH --time=0:40:00
+
+#EXCLUSIVE OR
+#SBATCH --constraint=[flat|cache]
+
+#SBATCH --exclusive
+#SBATCH --mem=50GB
+#SBATCH --output mpi.output.slurm 
+
+set -e
+
+export I_MPI_DOMAIN=auto
+export I_MPI_PIN_RESPECT_CPUSET=0
+
+
+module load intel intelmpi
+
+ulimit -s unlimited
+
+srun ../../../bin/hello_mpi
+
+

test_scripts/frioul/omp.sh → test_scripts/frioul/omp/cache.sh

@@ -5,7 +5,7 @@
 #SBATCH --ntasks-per-node=1
 #SBATCH --cpus-per-task=68
 #SBATCH --time=0:40:00
-#SBATCH -C quad,cache|quad,flat 
+#SBATCH -C quad,cache
 #SBATCH --exclusive
 #SBATCH --mem=50GB
 #SBATCH --output omp.output.slurm 
@@ -23,6 +23,6 @@ ulimit -s unlimited
 
 rm -f *.out
 
-srun ../../bin/hello_omp
+srun ../../../bin/hello_omp
 
 

test_scripts/frioul/omp/flat.sh

+#!/bin/bash
+#SBATCH -J omp 
+#SBATCH --nodes=1
+#SBATCH --ntasks=1
+#SBATCH --ntasks-per-node=1
+#SBATCH --cpus-per-task=68
+#SBATCH --time=0:40:00
+#SBATCH -C quad,flat 
+#SBATCH --exclusive
+#SBATCH --mem=50GB
+#SBATCH --output omp.output.slurm 
+
+set -e
+
+#Make sure that OMP_NUM_THREADS = cpus-per-task * KMP_HW_SUBSET
+export KMP_HW_SUBSET=1T
+export OMP_NUM_THREADS=68
+export KMP_AFFINITY=compact,1,0,granularity=fine
+
+module load intel 
+
+ulimit -s unlimited
+
+rm -f *.out
+
+srun ../../../bin/hello_omp
+
+