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

Merge conflicts

Browse source
This commit is contained in:
quemy 2012-11-20 22:16:37 +01:00
commit 3ae7dcc60c
12 changed files with 459 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
smp/src/CMakeLists.txt
View file

@ -21,11 +21,11 @@ set (SMP_FILE
scheduler.h scheduler.h
island.h island.h
topology/abstractTopology.h topology/abstractTopology.h
topology/booleanTopology.h topology/topology.h
topology/topologyBuilder.h topology/topologyBuilder.h
topology/completeTopologyBuilder.cpp topology/complete.cpp
topology/starTopologyBuilder.cpp topology/star.cpp
topology/ringTopologyBuilder.cpp topology/ring.cpp
) )
add_library(smp STATIC ${SMP_FILE}) add_library(smp STATIC ${SMP_FILE})

2
smp/src/topology/abstractTopology.h
View file

@ -38,7 +38,7 @@ namespace smp
class AbstractTopology class AbstractTopology
{ {
public : public :
virtual std::vector<unsigned> getIdNeighbours(unsigned idIsland) const =0; virtual std::vector<unsigned> getIdNeighbors(unsigned idIsland) const =0;
}; };
} }

41
smp/src/topology/complete.cpp Normal file
View file

@ -0,0 +1,41 @@
/*
<complete.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
*/
#include <topology/complete.h>
#include <vector>
void paradiseo::smp::Complete::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const
{
matrix.clear();
std::vector<bool> line;
line.assign(nbIsland,true);
matrix.assign(nbIsland, line);
for(int i=0;i<nbIsland;i++)
matrix[i][i]=false;
}

50
smp/src/topology/complete.h Normal file
View file

@ -0,0 +1,50 @@
/*
<completeTopologyBuilder.h>
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
*/
#ifndef COMPLETE_H_
#define COMPLETE_H_
#include <vector>
#include <topology/topologyBuilder.h>
namespace paradiseo
{
namespace smp
{
class Complete: public TopologyBuilder
{
public :
void operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const;
};
}
}
#endif

42
smp/src/topology/ring.cpp Normal file
View file

@ -0,0 +1,42 @@
/*
<ring.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
*/
#include <vector>
#include <topology/ring.h>
void paradiseo::smp::Ring::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const
{
matrix.clear();
std::vector<bool> line;
line.assign(nbIsland, false);
matrix.assign(nbIsland, line);
for(int i=0; i<nbIsland;i++)
matrix[i][(i+1)%nbIsland]=true;
}

51
smp/src/topology/ring.h Normal file
View file

@ -0,0 +1,51 @@
/*
<ring.h>
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
*/
#ifndef RING_H_
#define RING_H_
#include <vector>
#include <topology/topologyBuilder.h>
namespace paradiseo
{
namespace smp
{
class Ring : public TopologyBuilder
{
public :
void operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const;
};
}
}
#endif

45
smp/src/topology/star.cpp Normal file
View file

@ -0,0 +1,45 @@
/*
<star.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
*/
#include <vector>
#include <topology/star.h>
void paradiseo::smp::Star::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const
{
matrix.clear();
std::vector<bool> line (nbIsland,false);
line[0]=true;
matrix.assign(nbIsland-1,line);
line.clear();
line.assign(nbIsland, false);
std::vector<std::vector<bool>>::iterator it = matrix.begin();
matrix.insert(it, line);
}

51
smp/src/topology/star.h Normal file
View file

@ -0,0 +1,51 @@
/*
<star.h>
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
*/
#ifndef STAR_H_
#define STAR_H_
#include <vector>
#include <topology/topologyBuilder.h>
namespace paradiseo
{
namespace smp
{
class Star : public TopologyBuilder
{
public :
void operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const;
};
}
}
#endif

47
smp/src/topology/topology.cpp Normal file
View file

@ -0,0 +1,47 @@
/*
<topology.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
*/
#include <vector>
template <class TopologyType>
std::vector<unsigned> paradiseo::smp::Topology<TopologyType>::getIdNeighbors(unsigned idIsland) const
{
std::vector<unsigned> neighbors;
for(unsigned j=0; j<_matrix.size();j++)
if(_matrix[idIsland][j]) neighbors.push_back(j);
return neighbors;
}
template <class TopologyType>
void paradiseo::smp::Topology<TopologyType>::construct(unsigned nbIsland)
{
_builder(nbIsland, _matrix);
}

56
smp/src/topology/topology.h Normal file
View file

@ -0,0 +1,56 @@
/*
<topology.h>
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
*/
#include <vector>
#include <topology/abstractTopology.h>
namespace paradiseo
{
namespace smp
{
template<class TopologyType>
class Topology : public AbstractTopology
{
public :
Topology() = default;
std::vector<unsigned> getIdNeighbors(unsigned idIsland) const;
void construct(unsigned nbIsland);
private :
TopologyType _builder;
std::vector<std::vector<bool>> _matrix;
};
#include<topology/topology.cpp>
}
}

2
smp/test/CMakeLists.txt
View file

@ -17,7 +17,7 @@ set (TEST_LIST
t-smpMW_eoEasyPSO t-smpMW_eoEasyPSO
t-smpMW_eoSyncEasyPSO t-smpMW_eoSyncEasyPSO
t-smpIsland t-smpIsland
#t-smpTopo t-smpTopo
) )
###################################################################################### ######################################################################################

70
smp/test/t-smpTopo.cpp Normal file
View file

@ -0,0 +1,70 @@
#include <topology/topology.h>
#include <topology/complete.h>
#include <topology/star.h>
#include <topology/ring.h>
#include <iostream>
#include <vector>
using namespace paradiseo::smp;
int main()
{
//Test of Complete Topology
Topology<Complete> topo_comp;
topo_comp.construct(5);
std::cout << std::endl << "---------------" << std::endl << "Test of Complete Topology" << std::endl;
std::vector<unsigned> neighbors=topo_comp.getIdNeighbors(1);
std::cout << "neighbors of Island 1 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
neighbors=topo_comp.getIdNeighbors(2);
std::cout <<std::endl << "Neighbors of Island 2 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
//Test of Star Topology
Topology<Star> topo_star;
topo_star.construct(4);
std::cout << std::endl << "---------------" << std::endl << "Test of Star Topology" << std::endl;
neighbors=topo_star.getIdNeighbors(0);
std::cout <<std::endl << "Neighbors of Island 0 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
neighbors=topo_star.getIdNeighbors(1);
std::cout <<std::endl << "Neighbors of Island 1 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
//Test of Ring Topology
Topology<Ring> topo_ring;
topo_ring.construct(8);
std::cout << std::endl << "---------------" << std::endl << "Test of Ring Topology" << std::endl;
neighbors=topo_ring.getIdNeighbors(4);
std::cout <<std::endl << "Neighbors of Island 4 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
neighbors=topo_ring.getIdNeighbors(7);
std::cout <<std::endl << "Neighbors of Island 7 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
neighbors=topo_ring.getIdNeighbors(0);
std::cout <<std::endl << "Neighbors of Island 0 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
}