From aff23f2a6eab4b0e719c8090aa38cbedfa96fe4b Mon Sep 17 00:00:00 2001 From: boufaras Date: Tue, 24 Jan 2012 01:31:23 +0000 Subject: [PATCH] Update for new version git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2667 331e1502-861f-0410-8da2-ba01fb791d7f --- .../neighborhood/moGPUMappingNeighborhood.h | 22 +++++++++---------- .../moGPUMappingNeighborhoodByCpy.h | 2 +- .../moGPUMappingNeighborhoodByModif.h | 2 +- .../neighborhood/moGPUNeighborhoodSizeUtils.h | 8 +++---- .../moGPUOrderNeighborhoodByCpy.h | 2 +- .../moGPUOrderNeighborhoodByModif.h | 4 ++-- .../moGPURndWithReplNeighborhoodByCpy.h | 6 ++--- .../moGPURndWithReplNeighborhoodByModif.h | 6 ++--- .../moGPURndWithoutReplNeighborhoodByCpy.h | 8 ++++--- .../moGPURndWithoutReplNeighborhoodByModif.h | 6 ++--- 10 files changed, 34 insertions(+), 32 deletions(-) diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhood.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhood.h index 08a94d31b..4b2270851 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhood.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhood.h @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van LUONG @@ -30,11 +30,11 @@ #ifndef __moGPUMappingNeighborhood_h #define __moGPUMappingNeighborhood_h -#include +#include #include template -class moGPUMappingNeighborhood: public moMappingNeighborhood { +class moGPUMappingNeighborhood: public moGPUMapping { public: @@ -45,12 +45,12 @@ public: typedef N Neighbor; typedef typename Neighbor::EOT EOT; - using moMappingNeighborhood::neighborhoodSize; - using moMappingNeighborhood::currentIndex; - using moMappingNeighborhood::indices; - using moMappingNeighborhood::mapping; - using moMappingNeighborhood::xChange; - using moMappingNeighborhood::mutex; + using moGPUMapping::neighborhoodSize; + using moGPUMapping::currentIndex; + using moGPUMapping::indices; + using moGPUMapping::mapping; + using moGPUMapping::xChange; + using moGPUMapping::mutex; /** * Constructor @@ -60,7 +60,7 @@ public: moGPUMappingNeighborhood(unsigned int _neighborhoodSize, unsigned int _xChange) : - moMappingNeighborhood (_neighborhoodSize, _xChange) { + moGPUMapping (_neighborhoodSize, _xChange) { sendMapping = false; cudaMalloc((void**) &device_Mapping, sizeof(unsigned int) * neighborhoodSize * _xChange); @@ -84,7 +84,7 @@ public: virtual void init(EOT& _solution, Neighbor& _current) { - moMappingNeighborhood::init(_solution, _current); + moGPUMapping::init(_solution, _current); if (!sendMapping) { cudaMemcpy(device_Mapping, mapping,xChange * neighborhoodSize * sizeof(unsigned int), cudaMemcpyHostToDevice); diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByCpy.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByCpy.h index 68031f6bf..3aa50d2cc 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByCpy.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByCpy.h @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Boufaras Karima, Thé Van Luong diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByModif.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByModif.h index c1bab360e..79e06fa3e 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByModif.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUMappingNeighborhoodByModif.h @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van Luong diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUNeighborhoodSizeUtils.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUNeighborhoodSizeUtils.h index 5a17d475b..f122b1fee 100755 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUNeighborhoodSizeUtils.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUNeighborhoodSizeUtils.h @@ -1,6 +1,6 @@ /* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van LUONG @@ -32,8 +32,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef _moNeighborhoodSizeUtils_h -#define _moNeighborhoodSizeUtils_h +#ifndef _moGPUNeighborhoodSizeUtils_h +#define _moGPUNeighborhoodSizeUtils_h /** * @return the factorial of an integer diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByCpy.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByCpy.h index bce7abfb0..95b8e4850 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByCpy.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByCpy.h @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van LUONG diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByModif.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByModif.h index 7c997a901..7b67f29b3 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByModif.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUOrderNeighborhoodByModif.h @@ -1,8 +1,8 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - Jerémie Humeau, Thé Van LUONG, Karima Boufaras + Karima Boufaras, Thé Van LUONG This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByCpy.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByCpy.h index 8c99c82b3..7efd4a7c3 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByCpy.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByCpy.h @@ -1,8 +1,8 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - Jerémie Humeau, Karima Boufaras, Thé Van LUONG + Karima Boufaras, Thé Van LUONG This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, @@ -70,7 +70,7 @@ class moGPURndWithReplNeighborhoodByCpy: public moRndWithReplNeighborhood::init(_solution, _neighbor); //Compute all neighbors fitness at one time - eval.neighborhoodEval(_solution,0,1); + eval.neighborhoodEval(_solution,0,0); } diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByModif.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByModif.h index fc64d3288..516003afb 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByModif.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithReplNeighborhoodByModif.h @@ -1,8 +1,8 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - Jerémie Humeau, Karima Boufaras, Thé Van LUONG + Karima Boufaras, Thé Van LUONG This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, @@ -69,7 +69,7 @@ class moGPURndWithReplNeighborhoodByModif: public moRndWithReplNeighborhood::init(_solution, _neighbor); //Compute all neighbors fitness at one time - eval.neighborhoodEval(_solution,0,1); + eval.neighborhoodEval(_solution,0,0); } diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByCpy.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByCpy.h index 69108b8d2..b6c77714b 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByCpy.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByCpy.h @@ -1,8 +1,8 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - Jerémie Humeau, Boufaras Karima, Thé Van LUONG + Karima Boufaras, Thé Van LUONG This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the CeCILL @@ -52,11 +52,13 @@ class moGPURndWithoutReplNeighborhood: public moRndWithoutReplNeighborhood::neighborhoodSize; using moRndWithoutReplNeighborhood::maxIndex; using moRndWithoutReplNeighborhood::indexVector; + /** * Constructor * @param _neighborhoodSize the size of the neighborhood * @param _eval show how to evaluate neighborhood of a solution at one time */ + moGPURndWithoutReplNeighborhood(unsigned int _neighborhoodSize,moGPUEval< Neighbor>& _eval) : moRndWithoutReplNeighborhood (_neighborhoodSize),eval(_eval) { @@ -72,7 +74,7 @@ class moGPURndWithoutReplNeighborhood: public moRndWithoutReplNeighborhood::init(_solution, _neighbor); //Compute all neighbors fitness at one time - eval.neighborhoodEval(_solution,0,1); + eval.neighborhoodEval(_solution,0,0); } /** diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByModif.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByModif.h index f1b4ff1cb..a68445789 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByModif.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPURndWithoutReplNeighborhoodByModif.h @@ -1,8 +1,8 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - Jerémie Humeau, Boufaras Karima, Thé Van LUONG + Karima Boufaras, Thé Van LUONG This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the CeCILL @@ -72,7 +72,7 @@ class moGPURndWithoutReplNeighborhood: public moRndWithoutReplNeighborhood::init(_solution, _neighbor); //Compute all neighbors fitness at one time - eval.neighborhoodEval(_solution,0,1); + eval.neighborhoodEval(_solution,0,0); } /**