Commit c46809e1 authored by Alvarez, Gonzalo's avatar Alvarez, Gonzalo
Browse files

Parallelizer2: naming

parent 6732fbf1

drivers/testParallelizer2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ int main(int argc, char** argv) 


	PsimagLite::Vector<double>::Type v(n);



	PsimagLite::Parallizer2<> parallelizer(threads);

	PsimagLite::Parallelizer2<> parallelizer(threads);



	std::cout<<"Testing Parallelizer2 with "<<parallelizer.name();

	std::cout<<" and "<<parallelizer.numberOfThreads()<<" threads.\n";

src/Parallelizer2.h

+1 −0
Original line number Diff line number Diff line 
#ifndef PARALLELIZER2_H

#define PARALLELIZER2_H

#include "Vector.h"

#include "Concurrency.h"



#ifdef USE_PTHREADS

#include "Parallelizer2Pthread.h"

src/Parallelizer2OpenMP.h

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
namespace PsimagLite {



template<typename = int>

class Parallizer2 {

class Parallelizer2 {



public:



	Parallizer2(SizeType threads) : threads_(threads)

	Parallelizer2(SizeType threads) : threads_(threads)

	{

		omp_set_num_threads(threads);

	}

src/Parallelizer2Pthread.h

+10 −10
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
template<typename SomeLambdaType,

         typename LoadBalancerType=PsimagLite::LoadBalancerDefault

         >

struct PthreadFunctionStruct {

	PthreadFunctionStruct()

struct PthreadFunctionStruct2 {

	PthreadFunctionStruct2()

	    : pfh(0),loadBalancer(0),threadNum(0),nthreads(0),start(0),end(0),cpu(0)

	{}
@@ -41,10 +41,10 @@ struct PthreadFunctionStruct { 
};



template<typename SomeLambdaType, typename SomeLoadBalancer>

void *thread_function_wrapper(void *dummyPtr)

void *thread_function_wrapper2(void *dummyPtr)

{

	PthreadFunctionStruct<SomeLambdaType, SomeLoadBalancer> *pfs =

	        static_cast<PthreadFunctionStruct<SomeLambdaType, SomeLoadBalancer> *>(dummyPtr);

	PthreadFunctionStruct2<SomeLambdaType, SomeLoadBalancer> *pfs =

	        static_cast<PthreadFunctionStruct2<SomeLambdaType, SomeLoadBalancer> *>(dummyPtr);



	const SomeLambdaType* pfh = pfs->pfh;
@@ -68,13 +68,13 @@ void *thread_function_wrapper(void *dummyPtr) 
namespace PsimagLite {



template<typename LoadBalancerType=LoadBalancerDefault>

class Parallizer2 {

class Parallelizer2 {



public:



	typedef LoadBalancerDefault::VectorSizeType VectorSizeType;



	Parallizer2(SizeType nthreads)

	Parallelizer2(SizeType nthreads)

	    : nthreads_(nthreads) {}



	SizeType numberOfThreads() const { return nthreads_; }
@@ -111,8 +111,8 @@ public: 
	                 const SomeLambdaType& lambda,

	                 const LoadBalancerType& loadBalancer)

	{

		PthreadFunctionStruct<SomeLambdaType, LoadBalancerType>* pfs =

		new PthreadFunctionStruct<SomeLambdaType, LoadBalancerType>[nthreads_];

		PthreadFunctionStruct2<SomeLambdaType, LoadBalancerType>* pfs =

		new PthreadFunctionStruct2<SomeLambdaType, LoadBalancerType>[nthreads_];

		pthread_t* thread_id = new pthread_t[nthreads_];

		pthread_attr_t** attr = new pthread_attr_t*[nthreads_];
@@ -131,7 +131,7 @@ public: 


			ret = pthread_create(&thread_id[j],

			                     attr[j],

			                     thread_function_wrapper<SomeLambdaType, LoadBalancerType>,

			                     thread_function_wrapper2<SomeLambdaType, LoadBalancerType>,

			                     &pfs[j]);

			checkForError(ret);

		}

src/Parallelizer2Serial.h

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
namespace PsimagLite {



template<typename = int>

class Parallizer2 {

class Parallelizer2 {



public:



	Parallizer2(SizeType threads)

	Parallelizer2(SizeType threads)

	{

		if (threads != 1)

			throw RuntimeError("Please compile with -DUSE_PTHREADS\n");