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

Add function to wrap model in order to create homogeneous model easily

Browse source
This commit is contained in:
quemy 2012-12-21 11:39:46 +01:00
commit fc2ea957a4
7 changed files with 39 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smp/src/CMakeLists.txt
View file

@ -29,6 +29,7 @@ set (SMP_FILE
topology/hypercubic.cpp topology/hypercubic.cpp
topology/mesh.cpp topology/mesh.cpp
notifier.cpp notifier.cpp
islandModelWrapper.h
) )
add_library(smp STATIC ${SMP_FILE}) add_library(smp STATIC ${SMP_FILE})
@ -39,7 +40,7 @@ install(TARGETS smp ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
### 3) Look for headers ### 3) Look for headers
###################################################################################### ######################################################################################
file(GLOB HDRS smp *.h) file(GLOB HDRS smp *.h *.cpp)
install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/smp COMPONENT headers) install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/smp COMPONENT headers)
###################################################################################### ######################################################################################
@ -50,4 +51,5 @@ install(DIRECTORY MWAlgo topology
DESTINATION include${INSTALL_SUB_DIR}/smp DESTINATION include${INSTALL_SUB_DIR}/smp
COMPONENT headers COMPONENT headers
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
PATTERN "*.cpp"
) )

58
smp/src/homogeneousModel.cpp
View file

@ -1,58 +0,0 @@
/*
<homogeneousModel.cpp>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Alexandre Quemy, Thibault Lasnier - INSA Rouen
This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can ue,
modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info".
In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software,
that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or
data to be ensured and, more generally, to use and operate it in the
same conditions as regards security.
The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms.
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr
*/
template<template <class> class EOAlgo, class EOT>
template<class... IslandInit>
paradiseo::smp::HomogeneousIslandModel<EOAlgo, EOT>::HomogeneousIslandModel(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit<EOT> &_chromInit, IslandInit... args) :
model(_topo)
{
pops.resize(_islandNumber);
islands.resize(_islandNumber);
for(unsigned i = 0; i < _islandNumber; i++)
{
pops[i] = eoPop<EOT>(_popSize, _chromInit);
islands[i] = new Island<EOAlgo, EOT>(pops[i], args...);
model.add(*islands[i]);
}
model();
}
template<template <class> class EOAlgo, class EOT>
paradiseo::smp::HomogeneousIslandModel<EOAlgo, EOT>::~HomogeneousIslandModel()
{
for(auto& island : islands)
delete island;
}
template<template <class> class EOAlgo, class EOT>
std::vector<eoPop<EOT>>& paradiseo::smp::HomogeneousIslandModel<EOAlgo, EOT>::getPop()
{
return pops;
}

1
smp/src/island.cpp
View file

@ -156,4 +156,3 @@ void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::update(eoPop<bEOT> _data)
std::lock_guard<std::mutex> lock(this->m); std::lock_guard<std::mutex> lock(this->m);
listImigrants.push(_data); listImigrants.push(_data);
} }

2
smp/src/island.h
View file

@ -125,6 +125,8 @@ public:
*/ */
virtual void receive(void); virtual void receive(void);
AIsland<bEOT> clone() const;
protected: protected:
/** /**

63
smp/src/homogeneousModel.h → smp/src/islandModelWrapper.h
View file

@ -1,5 +1,5 @@
/* /*
<homogeneousModel.h> <islandModelWrapper.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Alexandre Quemy, Thibault Lasnier - INSA Rouen Alexandre Quemy, Thibault Lasnier - INSA Rouen
@ -34,6 +34,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
#include <thread> #include <thread>
#include <tuple>
#include <vector>
#include <bimap.h> #include <bimap.h>
#include <abstractIsland.h> #include <abstractIsland.h>
@ -45,42 +47,41 @@ namespace paradiseo
namespace smp namespace smp
{ {
/** HomogeneousIslandModel: Wrapper to create homogeneous model easily /** IslandModelWrapper: Wrapper to create homogeneous model easily
IslandModelWrapper is a function that creates an homogeneous model with the number
of specified islands, built with same parameters.
@see smp::IslandModel @see smp::IslandModel
*/ */
template<template <class> class EOAlgo, class EOT> template<template <class> class EOAlgo, class EOT, class... IslandInit>
class HomogeneousIslandModel std::vector<eoPop<EOT>> IslandModelWrapper(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit<EOT> &_chromInit, IslandInit... args)
{ {
public: // Model creation
/** IslandModel<EOT> model(_topo);
* Constructor
* @param _islandNumber number of islands to create
* @param _topo Topology
* @param args... list of parameters according to the constructor of the island
*/
template<class... IslandInit>
HomogeneousIslandModel(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit<EOT> &_chromInit, IslandInit... args);
/** // Island and pop containers
* Destructor std::vector<Island<EOAlgo,EOT>*> islands(_islandNumber);
*/ std::vector<eoPop<EOT>> pops(_islandNumber);
~HomogeneousIslandModel();
// Generate islands and put them in the model
/** for(unsigned i = 0; i < _islandNumber; i++)
* Get populations {
* @return Populations pops[i] = eoPop<EOT>(_popSize, _chromInit);
*/ islands[i] = new Island<EOAlgo, EOT>(pops[i], args...);
std::vector<eoPop<EOT>>& getPop(); model.add(*islands[i]);
}
protected:
IslandModel<EOT> model; // Start the model
std::vector<Island<EOAlgo,EOT>*> islands; model();
std::vector<eoPop<EOT>> pops;
}; // Delete islands
for(auto& island : islands)
#include <homogeneousModel.cpp> delete island;
return pops;
}
} }

2
smp/src/smp.h
View file

@ -33,7 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <MWModel.h> #include <MWModel.h>
#include <scheduler.h> #include <scheduler.h>
#include <islandModel.h> #include <islandModel.h>
#include <homogeneousModel.h> #include <islandModelWrapper.h>
#include <island.h> #include <island.h>
#include <abstractIsland.h> #include <abstractIsland.h>
#include <migPolicy.h> #include <migPolicy.h>

1
smp/test/CMakeLists.txt
View file

@ -19,6 +19,7 @@ set (TEST_LIST
t-smpTopo t-smpTopo
t-smpMI_Homogeneous t-smpMI_Homogeneous
t-smpMI_Heterogeneous t-smpMI_Heterogeneous
t-smpMI_Wrapper
) )
###################################################################################### ######################################################################################