OpenMP improvements

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1479 331e1502-861f-0410-8da2-ba01fb791d7f

contribution/branches/PhyloMOEA/PhyloMOEA/likelihoodcalculator.cpp

@@ -21,7 +21,7 @@
 #include "treeIterator.h"
 #include <gsl/gsl_randist.h>
 #include <gsl/gsl_cdf.h>
-
+#include "utils.h"
 
 
 
@@ -185,6 +185,21 @@ void LikelihoodCalculator::set_tree( phylotreeIND &ind )
 			i++;
 		}
 	}
+
+	graph::edge_iterator ite = tree_ptr->TREE.edges_begin();
+	graph::edge_iterator ite2 = tree_ptr->TREE.edges_end();
+
+	for(int i=0; ite!=ite2; i++)
+	{
+		for(int j=0; j < nrates; j++)
+		{
+			double len =  tree_ptr->get_branch_length(*ite) * rates_prob[j];
+			len = (len < BL_MIN ? BL_MIN : len);
+			(part_memory_probmatrix_ptr+i*nrates)[j] = &( (*probmatrixs)[len] );
+			edgeprobmatrix[*ite] = part_memory_probmatrix_ptr+i*nrates;
+		}
+		++ite;
+	}
 }
 
 double LikelihoodCalculator::calculate_likelihood_exp(edge focus)
@@ -345,11 +360,29 @@ double LikelihoodCalculator::calculate_likelihood()
 	for(int i=0; i<2; i++)
 		pthread_join(threads[i],NULL);*/
 	//cout << "calculando partials..." << endl;
+	struct timeval tempo1, tempo2, result;
+	gettimeofday(&tempo1, NULL);
 	calculate_partials( a, &b);
 	calculate_partials( b, &a);
 	//cout << "somando..." << endl;
 	// sum all partials
 	lik = sum_site_liks();
+	gettimeofday(&tempo2, NULL);
+	timeval_subtract(&result,&tempo2,&tempo1);	
+	long remainder = result.tv_sec % 3600;
+	long hours = (result.tv_sec - remainder)/3600;
+	long seconds = remainder % 60;
+	long minutes = (remainder - seconds) / 60;
+	cout << "Execution time :  ";
+	cout.width(3);
+	cout.fill(' ');
+	cout << hours << ":";
+	cout.width(2);
+	cout.fill('0');
+	cout << minutes << ":";
+	cout.width(2);
+	cout.fill('0');
+	cout << seconds << "." << result.tv_usec << "(" << result.tv_sec << ")" << endl;
 	return lik;
 }
 
@@ -363,16 +396,18 @@ double LikelihoodCalculator::sum_site_liks(  )
 	
 	for(int i=0; i< nrates; i++)
 	{
-		len = tree_ptr->get_branch_length(bfocus)*rates_prob[i];
-		len = len < BL_MIN ? BL_MIN : len;
-		ProbMatrix &p = (*probmatrixs)[ len];
-		prob[i] = p.p;
+		//len = tree_ptr->get_branch_length(bfocus)*rates_prob[i];
+		//len = len < BL_MIN ? BL_MIN : len;
+		ProbMatrix *p = edgeprobmatrix[bfocus][i]; //(*probmatrixs)[ len];
+		prob[i] = p->p;
 	}
 
+	//#pragma omp parallel for private(factor_correct) schedule(dynamic) num_threads(2) reduction(+:lik)
 	for(int i=0; i < seqlen; i++)
 	{
 		factor_correct = Factors[a][i] + Factors[b][i] ;
 		site_liks[i] = sum_partials(i);
+		//#pragma omp critical
 		lik += ( log(site_liks[i]) + factor_correct)* SeqData->pattern_count(i);
 	}
 	return lik;
@@ -394,7 +429,7 @@ double LikelihoodCalculator::sum_partials_a_to_taxon( int pos)
 {
 	double sum = 0;
 	unsigned char *meaning;
-	char char_state_b = SeqData->pattern_pos( pos, tree_ptr->taxon_id( b) );
+	char char_state_b = SeqData->pattern_pos( pos, tree_ptr->taxon_id (b) );
 	for(int i=0; i<nrates; i++)
 	{
 		int index = pos*nrates*4 + i*4;
@@ -451,9 +486,8 @@ void LikelihoodCalculator::calculate_node_partial( node father, node son, edge e
 	register double sum;
 	int r,i,j;
 	//unsigned char l;
-	ProbMatrix *p;
 	register int seqlen = tree_ptr->number_of_positions();
- 	#pragma omp parallel for private(p) schedule(dynamic) num_threads(2)
+ 	#pragma omp parallel for 
 	for(int k=0; k<seqlen;k++)
 	{
 		long index = k*nrates*4;
@@ -463,11 +497,9 @@ void LikelihoodCalculator::calculate_node_partial( node father, node son, edge e
 
 		for(int r=0; r<nrates; r++)
 		{
-			double len =  tree_ptr->get_branch_length(edgeaux) * rates_prob[r];
-			len = (len < BL_MIN ? BL_MIN : len);
 			double sum = 0;
-			#pragma omp critical
-			p = &((*probmatrixs)[ len ]);
+			//#pragma omp critical
+			ProbMatrix *p = edgeprobmatrix[edgeaux][r];
 
 			for(int i=0; i < 4; i++)
 			{
@@ -528,7 +560,6 @@ void LikelihoodCalculator::init_partials()
 	// init internal nodes
 	for(long i=0; i< size_part_memory_internal; i++)
 				part_memory_internal[i] = 1.0;
-
 }
 
 // calculate the values de C_j for all nodes
@@ -544,3 +575,145 @@ void LikelihoodCalculator::calculate_partials(node n, node *antecessor)
 }
 
 
+
+// omp code
+
+double LikelihoodCalculator::calculate_likelihood_omp()
+{
+
+	double lik=0;
+
+
+	// select an internal node as root
+	bfocus =  *(tree_ptr->TREE.edges_begin());
+	
+
+	a = tree_ptr->istaxon(bfocus.target()) ? bfocus.source() : bfocus.target();
+	b = bfocus.opposite(a);
+
+	
+	init_partials();
+
+	struct timeval tempo1, tempo2, result;
+	
+
+	int seqlen = tree_ptr->number_of_positions();
+
+	for(int i=0; i< nrates; i++)
+	{
+		//len = tree_ptr->get_branch_length(bfocus)*rates_prob[i];
+		//len = len < BL_MIN ? BL_MIN : len;
+		ProbMatrix *p = edgeprobmatrix[bfocus][i]; //(*probmatrixs)[ len];
+		prob[i] = p->p;
+	}
+
+
+	gettimeofday(&tempo1, NULL);
+	
+	#pragma omp parallel for reduction(+:lik)
+	for(int i=0; i< seqlen; i++)
+	{
+		calculate_partials_omp( a, &b,i);
+		calculate_partials_omp( b, &a,i);
+		//cout << "somando..." << endl;
+		// sum all partials
+		lik += sum_site_liks_omp(i);
+	}
+	gettimeofday(&tempo2, NULL);
+	timeval_subtract(&result,&tempo2,&tempo1);	
+	long remainder = result.tv_sec % 3600;
+	long hours = (result.tv_sec - remainder)/3600;
+	long seconds = remainder % 60;
+	long minutes = (remainder - seconds) / 60;
+	cout << "Execution time :  ";
+	cout.width(3);
+	cout.fill(' ');
+	cout << hours << ":";
+	cout.width(2);
+	cout.fill('0');
+	cout << minutes << ":";
+	cout.width(2);
+	cout.fill('0');
+	cout << seconds << "." << result.tv_usec << "(" << result.tv_sec << ")" << endl;
+	return lik;
+	
+}
+
+
+double LikelihoodCalculator::sum_site_liks_omp( int pos  )
+{
+	register double lik = 0;
+	register double factor_correct;
+	
+	//#pragma omp parallel for private(factor_correct) schedule(dynamic) num_threads(2) reduction(+:lik)
+	factor_correct = Factors[a][pos] + Factors[b][pos] ;
+	site_liks[pos] = sum_partials(pos);
+	lik = ( log(site_liks[pos]) + factor_correct)* SeqData->pattern_count(pos);
+	return lik;
+}
+
+
+void LikelihoodCalculator::calculate_partials_omp(node n, node *antecessor, int pos)
+{
+	postorder_Iterator it = tree_ptr->postorder_begin( n, *antecessor);
+
+	while(*it!=n)
+	{
+		calculate_node_partial_omp( it.ancestor(), *it, it.branch(),pos);
+		++it;
+	}
+}
+
+void LikelihoodCalculator::calculate_node_partial_omp( node father, node son, edge edgeaux, int pos)
+{
+	register double sum;
+	//unsigned char l;
+ 	//#pragma omp parallel for 
+	long index = pos*nrates*4;
+		// accumulatre
+	Factors[father][pos]+=Factors[son][pos];
+	double corr_factor =   MDBL_MIN;
+
+	for(int r=0; r<nrates; r++)
+	{
+		double sum = 0;
+		//#pragma omp critical
+		ProbMatrix *p = edgeprobmatrix[edgeaux][r];
+
+		for(int i=0; i < 4; i++)
+		{
+			sum = 0;
+			if(tree_ptr->istaxon( son))
+			{
+				unsigned char l=SeqData->pattern_pos( pos, tree_ptr->taxon_id( son));
+				if(SeqData->is_defined( l) ) sum = p->p_ij_t( i, l );
+				else if(SeqData->is_ambiguous( l))
+				{
+					unsigned char *meaning = SeqData->ambiguos_meaning( l);
+					for(int j=0; j < 4; j++)
+						sum +=meaning[j]* p->p_ij_t( i, j );	
+						//sum +=Partials[son][k*4+j]* p.p_ij_t( i, j );
+				}
+				else sum = 1;
+			}
+			else{
+				for(int j=0; j < 4; j++)
+				{
+						sum +=Partials[son][index+ r*4 +j]* p->p_ij_t( i, j );
+						
+				}
+			}
+			Partials[father][index + r*4 +i] *= sum;
+			corr_factor = ( sum > corr_factor ? sum : corr_factor); 
+		}
+	}
+
+	if( corr_factor < UMBRAL || corr_factor > (1./LIM_SCALE_VAL))
+	{
+			//cout << "escalado ..." << endl;
+		for(int r=0; r< nrates; r++)
+			for(int i=0; i<4; i++)
+				Partials[father][index + r*4+ i] /= corr_factor;
+		Factors[father][pos] += log(corr_factor);
+	} 
+}

contribution/branches/PhyloMOEA/PhyloMOEA/likelihoodcalculator.h

@@ -46,12 +46,14 @@ private:
 	double *part_memory_internal, // conditional likelihood of internal nodes 
 		*part_memory_taxons,  // conditional likelihood of internal nodes, no longer used
 		*part_memory_factors; // correction factors for nodes
+	ProbMatrix **part_memory_probmatrix_ptr;
 	
 	double *site_liks; // site likelihoods
 
 	// maps nodes to the continous memory	
 	node_map< double *> Partials; // maps nodes to the corresponding conditional likelihood 
 	node_map<double *> Factors;   // maps node to the corresponding correct factors
+	edge_map<ProbMatrix **> edgeprobmatrix; // maps the edge to the corresponding probability matrixs
 
 	// external data	
 	phylotreeIND *tree_ptr; // point to the tree
@@ -67,9 +69,11 @@ private:
 	
 	// prepare the post-order tree iterator
 	void calculate_partials(node n, node *);
+	void calculate_partials_omp(node n, node *, int pos);
 	// calculate conditional likelihood for the node father, from the son conditionals
 	void calculate_node_partial( node father, node son, edge edgeaux);
 
+	void calculate_node_partial_omp( node father, node son, edge edgeaux, int pos);
 	// likelihood sum of partial for the focus branch
 	double sum_partials( int pos);
 	double sum_partials_a_to_taxon( int pos );
@@ -77,20 +81,25 @@ private:
 
 	// sum the site likelihoods 
 	double sum_site_liks();
+	double sum_site_liks_omp(int pos);
 
 	// allocate partial memory
 	void allocate_partials()
 	{
 		long total_pos = SeqData->pattern_count();
 		int ntaxons = SeqData->num_seqs();
+		//int nedges = tree_ptr->TREE.number_of_edges();
 		part_memory_internal = new double[ (ntaxons-2) * nrates * total_pos * 4 ];
 		part_memory_factors = new double [ (2*ntaxons-2)  * total_pos];
+		part_memory_probmatrix_ptr = new ProbMatrix* [ (2*ntaxons-3) * nrates ] ;
 		site_liks = new double[total_pos];
+		cout << "allocating done..." << endl;
 	}
 
 	// destroy partial memory
 	void deallocate_partials()
 	{
+		delete [] part_memory_probmatrix_ptr;
 		delete [] part_memory_internal;
 		delete [] part_memory_factors;
 		delete [] site_liks;
@@ -109,6 +118,7 @@ public:
 
 	// main functions, prepare the object to calculate likelihood
 	double calculate_likelihood();
+	double calculate_likelihood_omp();
 	double get_site_lik(int i) { return site_liks[i]; }
 	double calculate_likelihood_exp(edge focus);
 	double calculate_all_likelihoods();

contribution/branches/PhyloMOEA/PhyloMOEA/probmatrixcontainer.h

@@ -43,7 +43,8 @@ public:
 		}
 		else
 		{
-			ProbMatrix *new_prob_matrix = new ProbMatrix(model, branchlength);
+			ProbMatrix *new_prob_matrix;
+			new_prob_matrix = new ProbMatrix(model, branchlength);
 			new_prob_matrix->init();
 			container[branchlength] = new_prob_matrix;
 			return *new_prob_matrix;

contribution/branches/PhyloMOEA/PhyloMOEA/testomp.cpp

@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 {
 	// measures execution time
 	struct timeval tempo1, tempo2, result;
-	gettimeofday(&tempo1, NULL);
+
 
 	cout << "\n\nReading Sequence Datafile...";
 	Sequences seq("/home/wcancino/experimentos/PhyloMOEA_0.2/500/500_ZILLA.plain");
@@ -80,26 +80,28 @@ int main(int argc, char *argv[])
 
 	for(int i=0; i < population.size(); i++)
 	{
+	
 			lik_calc.set_tree(population[i].get_tree());
+//			gettimeofday(&tempo1, NULL);
 			cout << lik_calc.calculate_likelihood() << endl;
+/*			gettimeofday(&tempo2, NULL);
+			timeval_subtract(&result,&tempo2,&tempo1);	
+			long remainder = result.tv_sec % 3600;
+			long hours = (result.tv_sec - remainder)/3600;
+			long seconds = remainder % 60;
+			long minutes = (remainder - seconds) / 60;
+			cout << "Execution time :  ";
+			cout.width(3);
+			cout.fill(' ');
+			cout << hours << ":";
+			cout.width(2);
+			cout.fill('0');
+			cout << minutes << ":";
+			cout.width(2);
+			cout.fill('0');
+			cout << seconds << "." << result.tv_usec << "(" << result.tv_sec << ")" << endl;*/
 	}
 
-	gettimeofday(&tempo2, NULL);
-	timeval_subtract(&result,&tempo2,&tempo1);	
-	long remainder = result.tv_sec % 3600;
-	long hours = (result.tv_sec - remainder)/3600;
-	long seconds = remainder % 60;
-	long minutes = (remainder - seconds) / 60;
-	cout << "Execution time :  ";
-	cout.width(3);
-	cout.fill(' ');
-	cout << hours << ":";
-	cout.width(2);
-	cout.fill('0');
-	cout << minutes << ":";
-	cout.width(2);
-	cout.fill('0');
-	cout << seconds << "." << result.tv_usec << "(" << result.tv_sec << ")" << endl;
 	gsl_rng_free(rn2);
 	//	delete probmatrixs;
 	delete rn;