nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed all remaining warnings at compilation

Browse source
This commit is contained in:
Benjamin Bouvier 2012-07-27 15:22:23 +02:00
commit b31c520eba
5 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
eo/src/mpi/eoMultiStart.h
View file

@ -53,10 +53,14 @@ namespace eo
{
typedef eoUF< eoPop<EOT>&, void> ResetAlgo;
MultiStartData( bmpi::communicator& _comm, eoAlgo<EOT>& _algo, int _masterRank, ResetAlgo & _resetAlgo )
MultiStartData(
bmpi::communicator& _comm,
eoAlgo<EOT>& _algo,
int _masterRank,
ResetAlgo & _resetAlgo )
:
runs( 0 ), pop(), bests(),
comm( _comm ), algo( _algo ), masterRank( _masterRank ), resetAlgo( _resetAlgo )
runs( 0 ), bests(), pop(),
comm( _comm ), algo( _algo ), resetAlgo( _resetAlgo ), masterRank( _masterRank )
{
// empty
}
@ -245,20 +249,20 @@ namespace eo
{
_data.runs = runs;
int nbWorkers = workers.size();
unsigned nbWorkers = workers.size();
std::vector< int > seeds = _getSeeds( nbWorkers );
if( eo::mpi::Node::comm().rank() == _masterRank )
{
if( seeds.size() < nbWorkers )
{
// Random seeds
for( int i = seeds.size(); i < nbWorkers; ++i )
for( unsigned i = seeds.size(); i < nbWorkers; ++i )
{
seeds.push_back( eo::rng.rand() );
}
}
for( int i = 0 ; i < nbWorkers ; ++i )
for( unsigned i = 0 ; i < nbWorkers ; ++i )
{
int wrkRank = workers[i];
eo::mpi::Node::comm().send( wrkRank, 1, seeds[ i ] );

2
eo/src/utils/eoParallel.h
View file

@ -68,9 +68,9 @@ private:
eoValueParam<bool> _isDynamic;
eoValueParam<std::string> _prefix;
eoValueParam<unsigned int> _nthreads;
eoValueParam<unsigned int> _packetSize;
eoValueParam<bool> _enableResults;
eoValueParam<bool> _doMeasure;
eoValueParam<unsigned int> _packetSize;
double _t_start;
};

4
eo/test/mpi/t-mpi-multipleRoles.cpp
View file

@ -118,7 +118,7 @@ struct Work: public eoUF< SerializableVector< SerializableBase<int> >&, void >
{
cout << "Work phase..." << endl;
subtask( v, Node::comm().rank() );
for( int i = 0; i < v.size(); ++i )
for( unsigned i = 0; i < v.size(); ++i )
{
v[i] *= 2;
}
@ -168,7 +168,7 @@ int main(int argc, char** argv)
EmptyJob stop( algo, 0 );
v = metaV[0];
cout << "Results : " << endl;
for(int i = 0; i < v.size(); ++i)
for(unsigned i = 0; i < v.size(); ++i)
{
cout << v[i] << ' ';
}

2
eo/test/mpi/t-mpi-parallelApply.cpp
View file

@ -198,7 +198,7 @@ int main(int argc, char** argv)
// job.
EmptyJob stop( *(tests[i].assign), eo::mpi::DEFAULT_MASTER );
++offset;
for(int i = 0; i < v.size(); ++i)
for(unsigned i = 0; i < v.size(); ++i)
{
cout << v[i] << ' ';
if( originalV[i] + offset != v[i] )

2
eo/test/mpi/t-mpi-wrapper.cpp
View file

@ -116,7 +116,7 @@ int main(int argc, char** argv)
if( job.isMaster() )
{
++offset;
for(int i = 0; i < v.size(); ++i)
for(unsigned i = 0; i < v.size(); ++i)
{
cout << v[i] << ' ';
if( originalV[i] + offset != v[i] )