Feature/autonomous local masters

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.5.1)
 project(msparsm)
 
 # Require MPI for this project:
@@ -7,7 +7,6 @@ find_package(MPI REQUIRED)
 include_directories(${MPI_INCLUDE_PATH})
 
 set(MPI_COMPILE_FLAGS "-O3 -std=gnu99 -I.")
-set(MPI_LINK_FLAGS "-lm")
 set(SOURCE_FILES
         ms.c
         ms.h
@@ -17,7 +16,7 @@ set(SOURCE_FILES
         streec.c)
 
 add_executable(msparsm ${SOURCE_FILES})
-target_link_libraries(msparsm ${MPI_LIBRARIES})
+target_link_libraries(msparsm ${MPI_LIBRARIES} -lm)
 
 if(MPI_COMPILE_FLAGS)
     set_target_properties(msparsm PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")

Makefile

@@ -0,0 +1,54 @@
+#
+#
+# 'make'            make executable file 'mspar'
+# 'make clean'      removes all .o and executable files
+#
+
+# Compiler
+CC=mpicc
+
+# Compilation flags
+CFLAGS?=-O3 -std=gnu99 -I.
+
+# define any libraries to link into executable:
+LIBS?=-lm
+
+# Dependencies
+DEPS=ms.h mspar.h
+
+# Folder to put the generated binaries
+BIN?=./bin
+
+# Object files
+OBJ=$(BIN)/mspar.o $(BIN)/ms.o $(BIN)/streec.o
+
+# Random functions using drand48()
+RND_48=rand1.c
+
+# Random functions using rand()
+RND=rand2.c
+
+.PHONY: clean
+
+$(BIN)/%.o: %.c $(DEPS)
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+default: $(BIN)/mspar
+
+# download: packages
+#	wget http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.2.tar.gz
+#	tar -xf openmpi-1.8.2.tar.gz -C $(CURDIR)/packages
+
+#packages:
+#	mkdir packages
+
+clean:
+	rm -f $(BIN)/*
+	@echo ""
+	@echo "*** All resources were cleaned-up ***"
+	@echo ""
+
+$(BIN)/mspar: $(OBJ)
+	$(CC) $(CFLAGS) -o $@ $^ $(RND_48) $(LIBS)
+	@echo ""
+	@echo "*** make complete: generated executable 'mspar' ***"

ms.c

@@ -122,7 +122,6 @@ int main(int argc, char *argv[]){
 	char **tbsparamstrs ;
 	double probss, tmrca, ttot ;
 	struct params pars ;
-	void seedit( const char * ) ;
 	struct params getpars( int argc, char *argv[], int *howmany, int ntbs, int count )  ;
 
 	int samples;
@@ -139,14 +138,7 @@ int main(int argc, char *argv[]){
 	pars = getpars(argc, argv, &howmany, ntbs, count);
 
 	// Master-Worker
-	int myRank = masterWorkerSetup(argc, argv, howmany, pars, SITESINC);
-
-	if(myRank <= howmany && myRank > 0)
-	{
-		while(workerProcess(pars, SITESINC));
-	}
-
-	masterWorkerTeardown();
+	masterWorker(argc, argv, howmany, pars, SITESINC);
 }
 
 struct gensam_result
@@ -206,7 +198,7 @@ gensam( char **list, double *pprobss, double *ptmrca, double *pttot, struct para
 				free(seglst[seg].ptree) ;
 		}
 		result.tree = treeOutput;
-		printf(treeOutput);
+		printf("%s", treeOutput);
 	}
 
 	if( pars.mp.timeflag ) {