Commit b3b56c2a authored by iker_martin's avatar iker_martin
Browse files

Exec scripts refactor and hotfixes. WIP.

parent 1ce6e4dd
...@@ -33,3 +33,6 @@ mpirun -np $numP $dir$codeDir/build/a.out $configFile $outIndex $nodelist $nodes ...@@ -33,3 +33,6 @@ mpirun -np $numP $dir$codeDir/build/a.out $configFile $outIndex $nodelist $nodes
echo "END RUN" echo "END RUN"
sed -i 's/application called MPI_Abort(MPI_COMM_WORLD, -100) - process/shrink cleaning/g' slurm-$SLURM_JOB_ID.out sed -i 's/application called MPI_Abort(MPI_COMM_WORLD, -100) - process/shrink cleaning/g' slurm-$SLURM_JOB_ID.out
sed -i 's/Abort(-100)/shrink cleaning/g' slurm-$SLURM_JOB_ID.out
...@@ -71,11 +71,15 @@ def process_line(line, data): ...@@ -71,11 +71,15 @@ def process_line(line, data):
for i in range(len(value)): for i in range(len(value)):
try: try:
value[i] = float(value[i]) value[i] = float(value[i])
if value[i] == int(value[i]):
value[i] = int(value[i])
except ValueError: except ValueError:
print("Unable to convert to float - Not a fatal error") print("Unable to convert to float - Not a fatal error")
else: else:
try: try:
value = float(value) value = float(value)
if value == int(value):
value = int(value)
except ValueError: except ValueError:
print("Unable to convert to float - Not a fatal error") print("Unable to convert to float - Not a fatal error")
......
...@@ -11,6 +11,7 @@ echo "START TEST" ...@@ -11,6 +11,7 @@ echo "START TEST"
#$2 == configFile #$2 == configFile
#$3 == use_extrae #$3 == use_extrae
#$4 == outFileIndex #$4 == outFileIndex
#$5 == qty
echo $@ echo $@
if [ $# -lt 3 ] if [ $# -lt 3 ]
...@@ -23,6 +24,11 @@ dir=$1 ...@@ -23,6 +24,11 @@ dir=$1
configFile=$2 configFile=$2
use_extrae=$3 use_extrae=$3
outFileIndex=$4 outFileIndex=$4
qty=1
if [ $# -ge 5 ]
then
qty=$5
fi
aux=$(grep "\[resize0\]" -n $configFile | cut -d ":" -f1) aux=$(grep "\[resize0\]" -n $configFile | cut -d ":" -f1)
read -r ini fin <<<$(echo $aux) read -r ini fin <<<$(echo $aux)
...@@ -32,9 +38,15 @@ numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut ...@@ -32,9 +38,15 @@ numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut
echo "Nodes=$SLURM_JOB_NODELIST" echo "Nodes=$SLURM_JOB_NODELIST"
if [ $use_extrae -ne 1 ] if [ $use_extrae -ne 1 ]
then then
mpirun -np $numP $dir$codeDir/a.out $configFile $outFileIndex $SLURM_JOB_NODELIST $SLURM_JOB_NUM_NODES for ((i=0; i<qty; i++))
do
mpirun -np $numP $dir$codeDir/a.out $configFile $outFileIndex $SLURM_JOB_NODELIST $SLURM_JOB_NUM_NODES
done
else else
for ((i=0; i<qty; i++))
do
srun -n$numP --mpi=pmi2 ./trace.sh $dir$codeDir/a.out $configFile $outFileIndex $SLURM_JOB_NODELIST $SLURM_JOB_NUM_NODES srun -n$numP --mpi=pmi2 ./trace.sh $dir$codeDir/a.out $configFile $outFileIndex $SLURM_JOB_NODELIST $SLURM_JOB_NUM_NODES
done
fi fi
......
...@@ -5,8 +5,8 @@ codeDir="Codes/" ...@@ -5,8 +5,8 @@ codeDir="Codes/"
execDir="Exec/" execDir="Exec/"
ResultsDir="Results/" ResultsDir="Results/"
$comples_file=$1 complex_file=$1
$output_name=$2 output_name=$2
python3 $dir$execDir/PythonCodes/read_multiple.py $complex_file $output_name python3 $dir$execDir/PythonCodes/read_multiple.py $complex_file $output_name
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment