From 201fdc2c12d6fb15a0d65032d896e295499d491a Mon Sep 17 00:00:00 2001 From: Lasnier Date: Sat, 17 Nov 2012 17:08:24 +0100 Subject: [PATCH] Add abstract ad boolean topologies --- smp/src/CMakeLists.txt | 6 ++- smp/src/topology/abstractTopology.h | 46 +++++++++++++++++++++++ smp/src/topology/booleanTopology.cpp | 47 ++++++++++++++++++++++++ smp/src/topology/booleanTopology.h | 55 ++++++++++++++++++++++++++++ smp/src/topology/topologyBuilder.h | 50 +++++++++++++++++++++++++ 5 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 smp/src/topology/abstractTopology.h create mode 100644 smp/src/topology/booleanTopology.cpp create mode 100644 smp/src/topology/booleanTopology.h create mode 100644 smp/src/topology/topologyBuilder.h diff --git a/smp/src/CMakeLists.txt b/smp/src/CMakeLists.txt index 8292d3586..bd32afd05 100644 --- a/smp/src/CMakeLists.txt +++ b/smp/src/CMakeLists.txt @@ -19,7 +19,11 @@ set (SMP_FILE thread.cpp MWModel.h scheduler.h - island.h) + island.h + topology/abstractTopology.h + topology/booleanTopology.h + topology/topologyBuilder.h + ) add_library(smp STATIC ${SMP_FILE}) diff --git a/smp/src/topology/abstractTopology.h b/smp/src/topology/abstractTopology.h new file mode 100644 index 000000000..61717bcd7 --- /dev/null +++ b/smp/src/topology/abstractTopology.h @@ -0,0 +1,46 @@ +/* + +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 + +namespace paradiseo +{ +namespace smp +{ + +class AbstractTopology +{ +public : + virtual std::vector getIdNeighbours(unsigned idIsland) const =0; +}; + +} + +} diff --git a/smp/src/topology/booleanTopology.cpp b/smp/src/topology/booleanTopology.cpp new file mode 100644 index 000000000..45b933f15 --- /dev/null +++ b/smp/src/topology/booleanTopology.cpp @@ -0,0 +1,47 @@ +/* + +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 + +template +paradiseo::smp::BooleanTopology::BooleanTopology(unsigned nbIsland) +{ + TopologyType builder; + builder(nbIsland, _matrix); +} +template +std::vector paradiseo::smp::BooleanTopology::getIdNeighbours(unsigned idIsland) const +{ + std::vector neighbours; + for(unsigned j=0; j<_matrix.size();j++) + if(_matrix[idIsland][j]) neighbours.push_back(j); + + return neighbours; +} diff --git a/smp/src/topology/booleanTopology.h b/smp/src/topology/booleanTopology.h new file mode 100644 index 000000000..9536a04c6 --- /dev/null +++ b/smp/src/topology/booleanTopology.h @@ -0,0 +1,55 @@ +/* + +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 +#include + +namespace paradiseo +{ +namespace smp +{ + +template +class BooleanTopology : public AbstractTopology +{ + +public : + BooleanTopology(unsigned nbIsland); + + std::vector getIdNeighbours(unsigned idIsland) const; + +private : + std::vector> _matrix; +}; + +#include + +} + +} diff --git a/smp/src/topology/topologyBuilder.h b/smp/src/topology/topologyBuilder.h new file mode 100644 index 000000000..427d969bd --- /dev/null +++ b/smp/src/topology/topologyBuilder.h @@ -0,0 +1,50 @@ +/* + +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 TOPO_BUILDER_H_ +#define TOPO_BUILDER_H_ + +#include + +namespace paradiseo +{ +namespace smp +{ + +class TopologyBuilder +{ +public : + virtual void operator()(unsigned _nbIsland, std::vector>& _matrix) const = 0; +}; + +} + +} + +#endif