Commit 4d19711d authored by iker_martin's avatar iker_martin
Browse files

Improvements in run scripts. Bandwidth and Latency usage is being deprecated

parent be6f55ae
...@@ -50,8 +50,8 @@ int main(int argc, char *argv[]) { ...@@ -50,8 +50,8 @@ int main(int argc, char *argv[]) {
} }
MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &req); MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &req);
MPI_Comm_size(MPI_COMM_WORLD, &numP);
MPI_Comm_rank(MPI_COMM_WORLD, &myId); MPI_Comm_rank(MPI_COMM_WORLD, &myId);
MPI_Comm_size(MPI_COMM_WORLD, &numP);
comm = MPI_COMM_WORLD; comm = MPI_COMM_WORLD;
if(req != MPI_THREAD_MULTIPLE) { if(req != MPI_THREAD_MULTIPLE) {
...@@ -435,8 +435,8 @@ void init_application() { ...@@ -435,8 +435,8 @@ void init_application() {
} }
int message_tam = 100000000; int message_tam = 100000000;
config_file->latency_m = latency(group->myId, group->numP, comm); //config_file->latency_m = latency(group->myId, group->numP, comm);
config_file->bw_m = bandwidth(group->myId, group->numP, comm, config_file->latency_m, message_tam); //config_file->bw_m = bandwidth(group->myId, group->numP, comm, config_file->latency_m, message_tam);
obtain_op_times(1); obtain_op_times(1);
} }
......
...@@ -141,9 +141,8 @@ void free_config(configuration *user_config) { ...@@ -141,9 +141,8 @@ void free_config(configuration *user_config) {
void print_config(configuration *user_config) { void print_config(configuration *user_config) {
if(user_config != NULL) { if(user_config != NULL) {
size_t i; size_t i;
printf("Config loaded: R=%zu, S=%zu, granularity=%d, SDR=%d, ADR=%d, latency=%2.8f, bw=%lf\n", printf("Config loaded: R=%zu, S=%zu, granularity=%d, SDR=%d, ADR=%d\n",
user_config->n_resizes, user_config->n_stages, user_config->granularity, user_config->sdr, user_config->adr, user_config->n_resizes, user_config->n_stages, user_config->granularity, user_config->sdr, user_config->adr);
user_config->latency_m, user_config->bw_m);
for(i=0; i<user_config->n_stages; i++) { for(i=0; i<user_config->n_stages; i++) {
printf("Stage %zu: PT=%d, T_stage=%lf, bytes=%d\n", printf("Stage %zu: PT=%d, T_stage=%lf, bytes=%d\n",
i, user_config->stages[i].pt, user_config->stages[i].t_stage, user_config->stages[i].real_bytes); i, user_config->stages[i].pt, user_config->stages[i].t_stage, user_config->stages[i].real_bytes);
...@@ -174,8 +173,8 @@ void print_config_group(configuration *user_config, size_t grp) { ...@@ -174,8 +173,8 @@ void print_config_group(configuration *user_config, size_t grp) {
sons = user_config->groups[grp+1].procs; sons = user_config->groups[grp+1].procs;
} }
printf("Config: granularity=%d, SDR=%d, ADR=%d, latency=%2.8f, bw=%lf\n", printf("Config: granularity=%d, SDR=%d, ADR=%d\n",
user_config->granularity, user_config->sdr, user_config->adr, user_config->latency_m, user_config->bw_m); user_config->granularity, user_config->sdr, user_config->adr);
for(i=0; i<user_config->n_stages; i++) { for(i=0; i<user_config->n_stages; i++) {
printf("Stage %zu: PT=%d, T_stage=%lf, bytes=%d\n", printf("Stage %zu: PT=%d, T_stage=%lf, bytes=%d\n",
i, user_config->stages[i].pt, user_config->stages[i].t_stage, user_config->stages[i].real_bytes); i, user_config->stages[i].pt, user_config->stages[i].t_stage, user_config->stages[i].real_bytes);
......
...@@ -21,6 +21,9 @@ read -r ini fin <<<$(echo $aux) ...@@ -21,6 +21,9 @@ read -r ini fin <<<$(echo $aux)
diff=$(( fin - ini )) diff=$(( fin - ini ))
numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2) numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2)
ls /home/martini/malleability_benchmark/Codes/build/a.out
echo "Test PreRUN $numP"
mpirun -np $numP $dir$codeDir/build/a.out $configFile $outIndex $nodelist $nodes mpirun -np $numP $dir$codeDir/build/a.out $configFile $outIndex $nodelist $nodes
echo "END RUN" echo "END RUN"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#SBATCH -N 1 #SBATCH -N 1
#SBATCH --exclude=c01,c00,c02 #SBATCH --exclude=c01,c00,c02
dir="/home/usuario/Documentos/malleability_benchmark" dir="/home/martini/malleability_benchmark"
codeDir="/Codes" codeDir="/Codes"
nodelist=$SLURM_JOB_NODELIST nodelist=$SLURM_JOB_NODELIST
...@@ -22,7 +22,6 @@ diff=$(( fin - ini )) ...@@ -22,7 +22,6 @@ diff=$(( fin - ini ))
numP=$(head -$fin $1 | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2) numP=$(head -$fin $1 | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2)
mpirun -np $numP valgrind --leak-check=full --show-leak-kinds=all --log-file=nc.vg.%p $dir$codeDir/build/a.out $configFile $outIndex $nodelist $nodes mpirun -np $numP valgrind --leak-check=full --show-leak-kinds=all --log-file=nc.vg.%p $dir$codeDir/build/a.out $configFile $outIndex $nodelist $nodes
rm hostfile.o$SLURM_JOB_ID
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
...@@ -41,6 +41,7 @@ read -r ini fin <<<$(echo $aux) ...@@ -41,6 +41,7 @@ read -r ini fin <<<$(echo $aux)
diff=$(( fin - ini )) diff=$(( fin - ini ))
numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2) numP=$(head -$fin $configFile | tail -$diff | cut -d ';' -f1 | grep Procs | cut -d '=' -f2)
echo "Nodes=$SLURM_JOB_NODELIST"
for ((i=0; i<qty; i++)) for ((i=0; i<qty; i++))
do do
echo "Iter $i -- numP=$numP" echo "Iter $i -- numP=$numP"
......
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