Arreglado funcionamiento de Regresion Lineal. Refactorizado codigo de...

Arreglado funcionamiento de Regresion Lineal. Refactorizado codigo de Process_stage.c. Protegidos los archivos .h. En el tiempo final se tiene en cuenta el tiempo desperdiciado

Codes/malleability/malleabilityStates.h

+#ifndef MALLEABILITY_STATES_H
+#define MALLEABILITY_STATES_H
+
+#include <stdio.h>
+#include <stdlib.h>
+
 //States
 #define MAL_UNRESERVED -1
 #define MAL_DENIED -2
@@ -6,11 +12,17 @@
 #define MAL_SPAWN_PENDING 1
 #define MAL_SPAWN_SINGLE_START 2
 #define MAL_SPAWN_SINGLE_PENDING 3
-#define MAL_SPAWN_COMPLETED 4
-#define MAL_DIST_PENDING 5
-#define MAL_DIST_COMPLETED 6
-#define MAL_DIST_ADAPTED 7
-
+#define MAL_SPAWN_ADAPT_POSTPONE 4
+#define MAL_SPAWN_COMPLETED 5
+#define MAL_DIST_PENDING 6
+#define MAL_DIST_COMPLETED 7
+#define MAL_DIST_ADAPTED 8
+
+//enum mall_states{MALL_UNRESERVED, MALL_NOT_STARTED, MALL_ZOMBIE, MALL_SPAWN_PENDING, 
+//	MALL_SPAWN_SINGLE_PENDING, MALL_SPAWN_SINGLE_COMPLETED, MALL_SPAWN_ADAPT_POSTPONE, 
+//	MALL_SPAWN_COMPLETED, MALL_DIST_PENDING, MALL_DIST_COMPLETED, MALL_DIST_ADAPTED};
+//enum mall_spawn_methods{MALL_SPAWN_BASELINE, MALL_SPAWN_MERGE};
+//enum mall_spawn_strategies{MALL_SPAWN_SERIAL, MALL_SPAWN_PTHREAD, MALL_SPAWN_MULTIPLE, MALL_SPAWN_SINGLE};
 
 #define MAL_APP_EXECUTING 0
 #define MAL_APP_ENDED 1
@@ -29,8 +41,8 @@
 //SPAWN STRATEGIES
 #define COMM_SPAWN_MULTIPLE 0
 #define COMM_SPAWN_SINGLE 1
-//#define COMM_SPAWN_SERIAL 0
-//#define COMM_SPAWN_PTHREAD 1
+//#define COMM_SPAWN_PTHREAD 2
+//#define COMM_SPAWN_SINGLE 3
 
 #define MAL_USE_NORMAL 0
 #define MAL_USE_IBARRIER 1
@@ -43,3 +55,5 @@
 
 #define MALLEABILITY_CHILDREN 1
 #define MALLEABILITY_NOT_CHILDREN 0
+
+#endif

Codes/malleability/malleabilityTypes.h

+#ifndef MALLEABILITY_TYPES_H
+#define MALLEABILITY_TYPES_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <mpi.h>
@@ -24,3 +27,5 @@ typedef struct {
 void add_data(void *data, int total_qty, int type, int request_qty, malleability_data_t *data_struct);
 void comm_data_info(malleability_data_t *data_struct_rep, malleability_data_t *data_struct_dist, int is_children_group, int myId, int root, MPI_Comm intercomm);
 void free_malleability_data_struct(malleability_data_t *data_struct);
+
+#endif

Codes/malleability/malleabilityZombies.h

+#ifndef MALLEABILITY_ZOMBIES_H
+#define MALLEABILITY_ZOMBIES_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,3 +14,5 @@ void zombies_collect_suspended(MPI_Comm comm, int myId, int numP, int numC, int
 void zombies_service_init();
 void zombies_service_free();
 void zombies_awake();
+
+#endif

Codes/runBase.sh

@@ -18,8 +18,7 @@ echo "MPICH"
 
 numP=$(bash recordMachinefile.sh $configFile)
 
-#mpirun -print-all-exitcodes -f hostfile.o$SLURM_JOB_ID $dir$codeDir/a.out $configFile $outIndex $nodelist $nodes
-#mpirun -np 2 /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 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/a.out $configFile $outIndex $nodelist $nodes
 rm hostfile.o$SLURM_JOB_ID