Borrando ficheros ya no usados. Moviendo proyecto

Codes/runBase.sh

@@ -16,10 +16,10 @@ echo "MPICH"
 #module load mpich-3.4.1-noucx
 #export HYDRA_DEBUG=1
 
-aux=$(grep "\[resize0\]" -n $1 | cut -d ":" -f1)
+aux=$(grep "\[resize0\]" -n $configFile | cut -d ":" -f1)
 read -r ini fin <<<$(echo $aux)
 diff=$(( fin - ini ))
-numP=$(head -$fin $1 | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2)
+numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2)
 
 #mpirun -np 4 /home/martini/Instalaciones/valgrind-mpich-3.4.1-noucx/bin/valgrind --leak-check=full --show-leak-kinds=all --log-file=nc.vg.%p $dir$codeDir/a.out $configFile $outIndex $nodelist $nodes
 mpirun -np $numP $dir$codeDir/build/a.out $configFile $outIndex $nodelist $nodes

Codes/runTrace.sh

+#!/bin/bash
+
+#SBATCH -p P1
+#SBATCH -N 1
+#SBATCH --exclude=c01,c00,c02
+
+dir="/home/martini/malleability_benchmark"
+codeDir="/Codes/build"
+resultsDir="/Results"
+
+nodelist=$SLURM_JOB_NODELIST
+nodes=$SLURM_JOB_NUM_NODES
+configFile=$1
+outIndex=$2
+
+echo "MPICH"
+
+aux=$(grep "\[resize0\]" -n $configFile | cut -d ":" -f1)
+read -r ini fin <<<$(echo $aux)
+diff=$(( fin - ini ))
+numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2)
+
+name_res="Extrae_"$nodes"_Test_"$numP
+dir_name_res=$dir$resultsDir"/"$name_res
+
+#mpirun -np $numP $dir$codeDir/a.out $configFile $outIndex $nodelist $nodes
+srun -n$numP --mpi=pmi2 ./trace.sh $dir$codeDir/a.out $configFile $outIndex $nodelist $nodes
+
+echo "END RUN"
+sed -i 's/application called MPI_Abort(MPI_COMM_WORLD, -100) - process/shrink cleaning/g' slurm-$SLURM_JOB_ID.out
+rm hostfile.o$SLURM_JOB_ID
+
+echo "MOVING DATA"
+mkdir $dir_name_res
+mv a.out.* $dir_name_res
+mv TRACE* $dir_name_res
+mv set-0/ $dir_name_res
+mv R$outIndex* $dir_name_res
+echo "JOB ENDED"

Exec/arrayRun.sh

@@ -38,14 +38,18 @@ do
 
           i=$(($i + 1))
           cd $name_dir/Run$i
-          config_file="config$i.ini"
+          configFile="config$i.ini"
 
+          aux=$(grep "\[resize0\]" -n $configFile | cut -d ":" -f1)
+          read -r ini fin <<<$(echo $aux)
+          diff=$(( fin - ini ))
+          numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2)
           echo "EXEC $procs_parents -- $procs_sons -- $adr_perc -- $ibarrier_use -- $phy_dist -- $cst -- $css -- RUN $i"
 
           for index in 1 2 3 4 5 6 7 8 9 10
           do
-            numP=$(bash $dir$codeDir/recordMachinefile.sh $config_file) # Crea el fichero hostfile
-            mpirun -f hostfile.o$SLURM_JOB_ID $dir$codeDir/./bench.out $config_file $i $nodelist $nodes
+
+            mpirun -f hostfile.o$SLURM_JOB_ID $dir$codeDir/./bench.out $configFile $i $nodelist $nodes
             rm hostfile.o$SLURM_JOB_ID
           done